From c57eb1a26982fd55f4fa991ede68576d91634f33 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 4 Jun 2021 14:50:15 +0100 Subject: nat/amd64-linux-siginfo.c: Remove typedefs Since GDB is written in C++ now, we don't need struct/union typedefs any more. Remove them from nat/amd64-linux-siginfo.c. gdb/ChangeLog: yyyy-mm-dd Pedro Alves * nat/amd64-linux-siginfo.c (union nat_sigval): Rename to ... (nat_sigval_t): ... this and remove typedef of same name. (struct nat_siginfo): Rename to ... (nat_siginfo_t): ... this and remove typedef of same name. (struct compat_sigval): Rename to ... (compat_sigval_t): ... this and remove typedef of same name. (struct compat_siginfo): Rename to ... (compat_siginfo_t): ... this and remove typedef of same name. (struct compat_x32_siginfo): Rename to ... (compat_x32_siginfo_t): ... this and remove typedef of same name. (amd64_linux_siginfo_fixup_common): Adjust. --- gdb/ChangeLog | 14 ++++++++++++++ gdb/nat/amd64-linux-siginfo.c | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 14 deletions(-) (limited to 'gdb') diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4859531..f0afa4e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,19 @@ 2021-06-07 Pedro Alves + * nat/amd64-linux-siginfo.c (union nat_sigval): Rename to ... + (nat_sigval_t): ... this and remove typedef of same name. + (struct nat_siginfo): Rename to ... + (nat_siginfo_t): ... this and remove typedef of same name. + (struct compat_sigval): Rename to ... + (compat_sigval_t): ... this and remove typedef of same name. + (struct compat_siginfo): Rename to ... + (compat_siginfo_t): ... this and remove typedef of same name. + (struct compat_x32_siginfo): Rename to ... + (compat_x32_siginfo_t): ... this and remove typedef of same name. + (amd64_linux_siginfo_fixup_common): Adjust. + +2021-06-07 Pedro Alves + * nat/amd64-linux-siginfo.c (compat_x32_siginfo_t): Move __attribute__ __aligned__ from the typedef to the struct. diff --git a/gdb/nat/amd64-linux-siginfo.c b/gdb/nat/amd64-linux-siginfo.c index 9ff9361..342840e 100644 --- a/gdb/nat/amd64-linux-siginfo.c +++ b/gdb/nat/amd64-linux-siginfo.c @@ -45,13 +45,13 @@ typedef int nat_timer_t; /* For native 64-bit, clock_t in _sigchld is 64-bit. */ typedef long nat_clock_t; -typedef union nat_sigval +union nat_sigval_t { nat_int_t sival_int; nat_uptr_t sival_ptr; -} nat_sigval_t; +}; -typedef struct nat_siginfo +struct nat_siginfo_t { int si_signo; int si_errno; @@ -112,7 +112,7 @@ typedef struct nat_siginfo int _fd; } _sigpoll; } _sifields; -} nat_siginfo_t; +}; #endif /* __ILP32__ */ @@ -133,13 +133,13 @@ struct compat_timeval int tv_usec; }; -typedef union compat_sigval +union compat_sigval_t { compat_int_t sival_int; compat_uptr_t sival_ptr; -} compat_sigval_t; +}; -typedef struct compat_siginfo +struct compat_siginfo_t { int si_signo; int si_errno; @@ -201,12 +201,12 @@ typedef struct compat_siginfo int _fd; } _sigpoll; } _sifields; -} compat_siginfo_t; +}; /* For x32, clock_t in _sigchld is 64bit aligned at 4 bytes. */ typedef long __attribute__ ((__aligned__ (4))) compat_x32_clock_t; -typedef struct __attribute__ ((__aligned__ (8))) compat_x32_siginfo +struct __attribute__ ((__aligned__ (8))) compat_x32_siginfo_t { int si_signo; int si_errno; @@ -263,7 +263,7 @@ typedef struct __attribute__ ((__aligned__ (8))) compat_x32_siginfo int _fd; } _sigpoll; } _sifields; -} compat_x32_siginfo_t; +}; /* To simplify usage of siginfo fields. */ @@ -578,20 +578,20 @@ amd64_linux_siginfo_fixup_common (siginfo_t *ptrace, gdb_byte *inf, if (mode == FIXUP_32) { if (direction == 0) - compat_siginfo_from_siginfo ((struct compat_siginfo *) inf, ptrace); + compat_siginfo_from_siginfo ((compat_siginfo_t *) inf, ptrace); else - siginfo_from_compat_siginfo (ptrace, (struct compat_siginfo *) inf); + siginfo_from_compat_siginfo (ptrace, (compat_siginfo_t *) inf); return 1; } else if (mode == FIXUP_X32) { if (direction == 0) - compat_x32_siginfo_from_siginfo ((struct compat_x32_siginfo *) inf, + compat_x32_siginfo_from_siginfo ((compat_x32_siginfo_t *) inf, ptrace); else siginfo_from_compat_x32_siginfo (ptrace, - (struct compat_x32_siginfo *) inf); + (compat_x32_siginfo_t *) inf); return 1; } -- cgit v1.1