--- gdb/ia64-linux-nat.c.ORIG	2008-01-01 23:53:11.000000000 +0100
+++ gdb/ia64-linux-nat.c	2013-01-29 11:27:52.193698445 +0100
@@ -637,7 +637,7 @@
 ia64_linux_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p)
 {
   CORE_ADDR psr;
-  struct siginfo *siginfo_p;
+  siginfo_t *siginfo_p;
   struct regcache *regcache = get_current_regcache ();
 
   siginfo_p = linux_nat_get_siginfo (inferior_ptid);
--- gdb/linux-nat.c.ORIG	2013-01-29 11:14:02.193774376 +0100
+++ gdb/linux-nat.c	2013-01-29 11:26:06.397708124 +0100
@@ -3307,7 +3307,7 @@
 }
 
 /* Return the saved siginfo associated with PTID.  */
-struct siginfo *
+siginfo_t *
 linux_nat_get_siginfo (ptid_t ptid)
 {
   struct lwp_info *lp = find_lwp_pid (ptid);
--- gdb/linux-nat.h.ORIG	2008-01-23 12:26:28.000000000 +0100
+++ gdb/linux-nat.h	2013-01-29 11:23:12.835724002 +0100
@@ -60,7 +60,7 @@
 
   /* Non-zero si_signo if this LWP stopped with a trap.  si_addr may
      be the address of a hardware watchpoint.  */
-  struct siginfo siginfo;
+  siginfo_t siginfo;
 
   /* If WAITSTATUS->KIND != TARGET_WAITKIND_SPURIOUS, the waitstatus
      for this LWP's last event.  This may correspond to STATUS above,
@@ -123,4 +123,4 @@
 void linux_nat_switch_fork (ptid_t new_ptid);
 
 /* Return the saved siginfo associated with PTID.  */
-struct siginfo *linux_nat_get_siginfo (ptid_t ptid);
+siginfo_t *linux_nat_get_siginfo (ptid_t ptid);
--- gdb/ppc-linux-nat.c.ORIG	2008-01-16 05:48:55.000000000 +0100
+++ gdb/ppc-linux-nat.c	2013-01-29 11:27:08.838702412 +0100
@@ -870,7 +870,7 @@
 static int
 ppc_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
 {
-  struct siginfo *siginfo_p;
+  siginfo_t *siginfo_p;
 
   siginfo_p = linux_nat_get_siginfo (inferior_ptid);
 
--- gdb/procfs.c.ORIG	2008-03-12 21:03:12.000000000 +0100
+++ gdb/procfs.c	2013-01-29 11:29:18.252690572 +0100
@@ -246,7 +246,7 @@
 #ifdef HAVE_PR_SIGINFO64_T
 typedef pr_siginfo64_t gdb_siginfo_t;
 #else
-typedef struct siginfo gdb_siginfo_t;
+typedef siginfo_t gdb_siginfo_t;
 #endif
 
 /* gdb_premptysysset */