From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32182 invoked by alias); 18 Mar 2002 19:33:01 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 32074 invoked from network); 18 Mar 2002 19:32:49 -0000 Received: from unknown (HELO cygnus.com) (205.180.230.5) by sources.redhat.com with SMTP; 18 Mar 2002 19:32:49 -0000 Received: from redhat.com (cse.cygnus.com [205.180.230.236]) by runyon.cygnus.com (8.8.7-cygnus/8.8.7) with ESMTP id LAA03994; Mon, 18 Mar 2002 11:32:47 -0800 (PST) Message-ID: <3C964E94.87B514CF@redhat.com> Date: Mon, 18 Mar 2002 11:33:00 -0000 From: Tom Rix X-Mailer: Mozilla 4.75 [en] (X11; U; Linux 2.2.16-22 i686) X-Accept-Language: en MIME-Version: 1.0 To: gdb-patches@sources.redhat.com CC: kevinb@redhat.com Subject: patch, Aix 5.1 ptrace64 build failure Content-Type: multipart/mixed; boundary="------------8C5DA08590FB4C86F9BEB5FC" X-SW-Source: 2002-03/txt/msg00318.txt.bz2 This is a multi-part message in MIME format. --------------8C5DA08590FB4C86F9BEB5FC Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-length: 251 Gdb fails to build on AIX 5.1 because the system has already defined ptrace64. This patch prefixes the rs6000-nat.c ptrace32 and ptrace64 functions with gdb_rs6000_ to fix this problem. Ok to commit? Tom -- Tom Rix GCC Engineer trix@redhat.com --------------8C5DA08590FB4C86F9BEB5FC Content-Type: text/plain; charset=us-ascii; name="gdb-ptrace-001fa.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="gdb-ptrace-001fa.patch" Content-length: 5227 2002-03-18 Tom Rix * rs6000-nat.c: Replace ptrace[32|64] with gdb_rs6000_ptrace[32|64]. diff -rup src-old/gdb/rs6000-nat.c src/gdb/rs6000-nat.c --- src-old/gdb/rs6000-nat.c Mon Mar 18 14:07:34 2002 +++ src/gdb/rs6000-nat.c Mon Mar 18 14:15:13 2002 @@ -160,11 +160,11 @@ static int special_regs[] = /* Call ptrace(REQ, ID, ADDR, DATA, BUF). */ static int -ptrace32 (int req, int id, int *addr, int data, int *buf) +gdb_rs6000_ptrace32 (int req, int id, int *addr, int data, int *buf) { int ret = ptrace (req, id, (int *)addr, data, buf); #if 0 - printf ("ptrace32 (%d, %d, 0x%x, %08x, 0x%x) = 0x%x\n", + printf ("gdb_rs6000_ptrace32 (%d, %d, 0x%x, %08x, 0x%x) = 0x%x\n", req, id, (unsigned int)addr, data, (unsigned int)buf, ret); #endif return ret; @@ -173,7 +173,7 @@ ptrace32 (int req, int id, int *addr, in /* Call ptracex(REQ, ID, ADDR, DATA, BUF). */ static int -ptrace64 (int req, int id, long long addr, int data, int *buf) +gdb_rs6000_ptrace64 (int req, int id, long long addr, int data, int *buf) { #ifdef ARCH3264 int ret = ptracex (req, id, addr, data, buf); @@ -181,7 +181,7 @@ ptrace64 (int req, int id, long long add int ret = 0; #endif #if 0 - printf ("ptrace64 (%d, %d, 0x%llx, %08x, 0x%x) = 0x%x\n", + printf ("gdb_rs6000_ptrace64 (%d, %d, 0x%llx, %08x, 0x%x) = 0x%x\n", req, id, addr, data, (unsigned int)buf, ret); #endif return ret; @@ -202,7 +202,7 @@ fetch_register (int regno) if (regno >= FP0_REGNUM && regno <= FPLAST_REGNUM) { nr = regno - FP0_REGNUM + FPR0; - ptrace32 (PT_READ_FPR, PIDGET (inferior_ptid), addr, nr, 0); + gdb_rs6000_ptrace32 (PT_READ_FPR, PIDGET (inferior_ptid), addr, nr, 0); } /* Bogus register number. */ @@ -223,13 +223,13 @@ fetch_register (int regno) nr = regno; if (!ARCH64 ()) - *addr = ptrace32 (PT_READ_GPR, PIDGET (inferior_ptid), (int *)nr, 0, 0); + *addr = gdb_rs6000_ptrace32 (PT_READ_GPR, PIDGET (inferior_ptid), (int *)nr, 0, 0); else { /* PT_READ_GPR requires the buffer parameter to point to long long, even if the register is really only 32 bits. */ long long buf; - ptrace64 (PT_READ_GPR, PIDGET (inferior_ptid), nr, 0, (int *)&buf); + gdb_rs6000_ptrace64 (PT_READ_GPR, PIDGET (inferior_ptid), nr, 0, (int *)&buf); if (REGISTER_RAW_SIZE (regno) == 8) memcpy (addr, &buf, 8); else @@ -264,7 +264,7 @@ store_register (int regno) if (regno >= FP0_REGNUM && regno <= FPLAST_REGNUM) { nr = regno - FP0_REGNUM + FPR0; - ptrace32 (PT_WRITE_FPR, PIDGET (inferior_ptid), addr, nr, 0); + gdb_rs6000_ptrace32 (PT_WRITE_FPR, PIDGET (inferior_ptid), addr, nr, 0); } /* Bogus register number. */ @@ -293,7 +293,7 @@ store_register (int regno) nr = regno; if (!ARCH64 ()) - ptrace32 (PT_WRITE_GPR, PIDGET (inferior_ptid), (int *)nr, *addr, 0); + gdb_rs6000_ptrace32 (PT_WRITE_GPR, PIDGET (inferior_ptid), (int *)nr, *addr, 0); else { /* PT_WRITE_GPR requires the buffer parameter to point to an 8-byte @@ -303,7 +303,7 @@ store_register (int regno) memcpy (&buf, addr, 8); else buf = *addr; - ptrace64 (PT_WRITE_GPR, PIDGET (inferior_ptid), nr, 0, (int *)&buf); + gdb_rs6000_ptrace64 (PT_WRITE_GPR, PIDGET (inferior_ptid), nr, 0, (int *)&buf); } } @@ -377,9 +377,9 @@ read_word (CORE_ADDR from, int *to, int errno = 0; if (arch64) - *to = ptrace64 (PT_READ_I, PIDGET (inferior_ptid), from, 0, NULL); + *to = gdb_rs6000_ptrace64 (PT_READ_I, PIDGET (inferior_ptid), from, 0, NULL); else - *to = ptrace32 (PT_READ_I, PIDGET (inferior_ptid), (int *)(long) from, + *to = gdb_rs6000_ptrace32 (PT_READ_I, PIDGET (inferior_ptid), (int *)(long) from, 0, NULL); return !errno; @@ -449,9 +449,9 @@ child_xfer_memory (CORE_ADDR memaddr, ch for (i = 0, errno = 0; i < count; i++, addr += sizeof (int)) { if (arch64) - ptrace64 (PT_WRITE_D, PIDGET (inferior_ptid), addr, buf[i], NULL); + gdb_rs6000_ptrace64 (PT_WRITE_D, PIDGET (inferior_ptid), addr, buf[i], NULL); else - ptrace32 (PT_WRITE_D, PIDGET (inferior_ptid), (int *)(long) addr, + gdb_rs6000_ptrace32 (PT_WRITE_D, PIDGET (inferior_ptid), (int *)(long) addr, buf[i], NULL); if (errno) @@ -490,9 +490,9 @@ exec_one_dummy_insn (void) prev_pc = read_pc (); write_pc (DUMMY_INSN_ADDR); if (ARCH64 ()) - ret = ptrace64 (PT_CONTINUE, PIDGET (inferior_ptid), 1, 0, NULL); + ret = gdb_rs6000_ptrace64 (PT_CONTINUE, PIDGET (inferior_ptid), 1, 0, NULL); else - ret = ptrace32 (PT_CONTINUE, PIDGET (inferior_ptid), (int *)1, 0, NULL); + ret = gdb_rs6000_ptrace32 (PT_CONTINUE, PIDGET (inferior_ptid), (int *)1, 0, NULL); if (ret != 0) perror ("pt_continue"); @@ -987,9 +987,9 @@ xcoff_relocate_symtab (unsigned int pid) #endif if (arch64) - rc = ptrace64 (PT_LDINFO, pid, (unsigned long) ldi, size, NULL); + rc = gdb_rs6000_ptrace64 (PT_LDINFO, pid, (unsigned long) ldi, size, NULL); else - rc = ptrace32 (PT_LDINFO, pid, (int *) ldi, size, NULL); + rc = gdb_rs6000_ptrace32 (PT_LDINFO, pid, (int *) ldi, size, NULL); if (rc == -1) { --------------8C5DA08590FB4C86F9BEB5FC--