* amd64-linux-nat.c (si_timerid,si_overrun): Provide definition for

	glibc 2.3.2 and earlier.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fc4ba6958f52e235471a6dfb49f0408a77efe725..ce50ba2eb3a3df7f1b3115f3b7396f7aaba9400a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-17  Doug Evans  <dje@google.com>
+
+       * amd64-linux-nat.c (si_timerid,si_overrun): Provide definition for
+       glibc 2.3.2 and earlier.
+
 2009-03-17  Joel Brobecker  <brobecker@adacore.com>
 
        * frame.c (get_prev_frame_1): Do not perform the inner_frame

diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
index e46bd039781411b2c64b39e4b81f44c35ae5bae9..2a1b690b2d538b980c66c20a19224c51bb1700b1 100644 (file)
--- a/gdb/amd64-linux-nat.c
+++ b/gdb/amd64-linux-nat.c
@@ -501,6 +501,15 @@ typedef struct compat_siginfo
 #define cpt_si_band _sifields._sigpoll._band
 #define cpt_si_fd _sifields._sigpoll._fd
 
+/* glibc at least up to 2.3.2 doesn't have si_timerid, si_overrun.
+   In their place is si_timer1,si_timer2.  */
+#ifndef si_timerid
+#define si_timerid si_timer1
+#endif
+#ifndef si_overrun
+#define si_overrun si_timer2
+#endif
+
 static void
 compat_siginfo_from_siginfo (compat_siginfo_t *to, siginfo_t *from)
 {