* ia64-linux-nat.c: Update copyright year.

(fetch_debug_register, store_debug_register)
(ia64_linux_stopped_by_watchpoint): Replace PTRACE_ARG3_TYPE with
PTRACE_TYPE_ARG3.
* config/ia64/nm-linux.h: Update copyright year.
 (PTRACE_ARG3_TYPE, PTRACE_XFER_TYPE): Remove defines.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7f2cf883e0d3ed2ae6cd59c8cabf416ef5057eba..9dd207ca2e4d8882560078d445bfab3c031bb87b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
 2004-08-22  Mark Kettenis  <kettenis@gnu.org>
 
+       * ia64-linux-nat.c: Update copyright year.
+       (fetch_debug_register, store_debug_register)
+       (ia64_linux_stopped_by_watchpoint): Replace PTRACE_ARG3_TYPE with
+       PTRACE_TYPE_ARG3.
+       * config/ia64/nm-linux.h: Update copyright year.
+        (PTRACE_ARG3_TYPE, PTRACE_XFER_TYPE): Remove defines.
+
        * amd64-linux-tdep.c (amd64_linux_sigtramp_start): Change argument
        from CORE_ADDR to struct frame_info *.  Use
        safe_frame_unwind_memory instead of deprecated_read_memory_nobpt.

diff --git a/gdb/config/ia64/nm-linux.h b/gdb/config/ia64/nm-linux.h
index 20229a016f3d57a5f345ede1cc7fd28af5d0c5ac..7e9172657eab21ac28d09b50b2fffff6307a668c 100644 (file)
--- a/gdb/config/ia64/nm-linux.h
+++ b/gdb/config/ia64/nm-linux.h
@@ -1,5 +1,6 @@
 /* Native support for GNU/Linux, for GDB, the GNU debugger.
-   Copyright 1999, 2000, 2001
+
+   Copyright 1999, 2000, 2001, 2004
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -42,9 +43,6 @@ extern int ia64_cannot_store_register (int regno);
 
 #define U_REGS_OFFSET 0
 
-#define PTRACE_ARG3_TYPE long
-#define PTRACE_XFER_TYPE long
-
 /* Hardware watchpoints */
 
 #define TARGET_HAS_HARDWARE_WATCHPOINTS

diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c
index 3ae88acbc05d0e09bcd38982bf1d4c68d6c7b9d4..09daf246c15cde53ae2895367c8b2e63cb6d3805 100644 (file)
--- a/gdb/ia64-linux-nat.c
+++ b/gdb/ia64-linux-nat.c
@@ -1,8 +1,8 @@
 /* Functions specific to running gdb native on IA-64 running
    GNU/Linux.
 
-   Copyright 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
-   Inc.
+   Copyright 1999, 2000, 2001, 2002, 2003, 2004
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -517,7 +517,7 @@ fetch_debug_register (ptid_t ptid, int idx)
   if (tid == 0)
     tid = PIDGET (ptid);
 
-  val = ptrace (PT_READ_U, tid, (PTRACE_ARG3_TYPE) (PT_DBR + 8 * idx), 0);
+  val = ptrace (PT_READ_U, tid, (PTRACE_TYPE_ARG3) (PT_DBR + 8 * idx), 0);
 
   return val;
 }
@@ -531,7 +531,7 @@ store_debug_register (ptid_t ptid, int idx, long val)
   if (tid == 0)
     tid = PIDGET (ptid);
 
-  (void) ptrace (PT_WRITE_U, tid, (PTRACE_ARG3_TYPE) (PT_DBR + 8 * idx), val);
+  (void) ptrace (PT_WRITE_U, tid, (PTRACE_TYPE_ARG3) (PT_DBR + 8 * idx), val);
 }
 
 static void
@@ -648,7 +648,7 @@ ia64_linux_stopped_by_watchpoint (ptid_t ptid)
     tid = PIDGET (ptid);
   
   errno = 0;
-  ptrace (PTRACE_GETSIGINFO, tid, (PTRACE_ARG3_TYPE) 0, &siginfo);
+  ptrace (PTRACE_GETSIGINFO, tid, (PTRACE_TYPE_ARG3) 0, &siginfo);
 
   if (errno != 0 || siginfo.si_signo != SIGTRAP || 
       (siginfo.si_code & 0xffff) != 0x0004 /* TRAP_HWBKPT */)