From 14064aa202f80cd07434295c44268f44944859aa Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Tue, 17 Mar 2009 18:39:08 +0000 Subject: [PATCH] * amd64-linux-nat.c (si_timerid,si_overrun): Provide definition for glibc 2.3.2 and earlier. --- gdb/ChangeLog | 5 +++++ gdb/amd64-linux-nat.c | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fc4ba6958f5..ce50ba2eb3a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2009-03-17 Doug Evans + + * amd64-linux-nat.c (si_timerid,si_overrun): Provide definition for + glibc 2.3.2 and earlier. + 2009-03-17 Joel Brobecker * 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 e46bd039781..2a1b690b2d5 100644 --- 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) { -- 2.30.2