From: Joel Brobecker Date: Fri, 29 Jun 2018 22:42:27 +0000 (-0400) Subject: fix GDB build failure for various amd64 targets X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=41206e32fb909ebacf6db009fc1f177bde74a652;p=binutils-gdb.git fix GDB build failure for various amd64 targets The following patch caused some amd64-*-tdep files to fail to compile: | commit de52b9607d2623f18b7a7dbee3e1123d8d63f5da | Date: Tue Jun 26 16:33:27 2018 +0100 | Subject: x86_64-windows GDB crash due to fs_base/gs_base registers This is because we added one additional "segments" argument to function amd64_target_description and forgot to update all the callers. This patch fixes the omissions. gdb/ChangeLog: * amd64-darwin-tdep.c (x86_darwin_init_abi_64): Add missing parameter in call to amd64_target_description. * amd64-dicos-tdep.c (amd64_dicos_init_abi): Likewise. * amd64-fbsd-tdep.c (amd64fbsd_core_read_description) (amd64fbsd_init_abi): Likewise. * amd64-nbsd-tdep.c (amd64nbsd_init_abi): Likewise. * amd64-obsd-tdep.c (amd64obsd_init_abi): Likewise. * amd64-sol2-tdep.c (amd64_sol2_init_abi): Likewise. * amd64-fbsd-nat.c (amd64_fbsd_nat_target): Likewise. The change to amd64-fbsd-nat.c was done "blind" (no access to system), but is reasonably straightforward. The changes to the -tdep.c files were verify by rebuilding GDB on x86_64-linux when configured with --enable-targets=all. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c47c111466d..e3267853d37 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2018-06-29 Joel Brobecker + + * amd64-darwin-tdep.c (x86_darwin_init_abi_64): Add missing + parameter in call to amd64_target_description. + * amd64-dicos-tdep.c (amd64_dicos_init_abi): Likewise. + * amd64-fbsd-tdep.c (amd64fbsd_core_read_description) + (amd64fbsd_init_abi): Likewise. + * amd64-nbsd-tdep.c (amd64nbsd_init_abi): Likewise. + * amd64-obsd-tdep.c (amd64obsd_init_abi): Likewise. + * amd64-sol2-tdep.c (amd64_sol2_init_abi): Likewise. + * amd64-fbsd-nat.c (amd64_fbsd_nat_target): Likewise. + 2018-06-29 Pedro Alves * gdb/amd64-tdep.h (amd64_create_target_description): Add diff --git a/gdb/amd64-darwin-tdep.c b/gdb/amd64-darwin-tdep.c index fe8bfab721e..24d21b9f4a1 100644 --- a/gdb/amd64-darwin-tdep.c +++ b/gdb/amd64-darwin-tdep.c @@ -100,7 +100,7 @@ x86_darwin_init_abi_64 (struct gdbarch_info info, struct gdbarch *gdbarch) struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); amd64_init_abi (info, gdbarch, - amd64_target_description (X86_XSTATE_SSE_MASK)); + amd64_target_description (X86_XSTATE_SSE_MASK, true)); tdep->struct_return = reg_struct_return; diff --git a/gdb/amd64-dicos-tdep.c b/gdb/amd64-dicos-tdep.c index 85861ec86e5..a9af7a04612 100644 --- a/gdb/amd64-dicos-tdep.c +++ b/gdb/amd64-dicos-tdep.c @@ -27,7 +27,7 @@ static void amd64_dicos_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { amd64_init_abi (info, gdbarch, - amd64_target_description (X86_XSTATE_SSE_MASK)); + amd64_target_description (X86_XSTATE_SSE_MASK, true)); dicos_init_abi (gdbarch); } diff --git a/gdb/amd64-fbsd-nat.c b/gdb/amd64-fbsd-nat.c index 6b0367b5d65..f9b1bcae2e6 100644 --- a/gdb/amd64-fbsd-nat.c +++ b/gdb/amd64-fbsd-nat.c @@ -188,13 +188,13 @@ amd64_fbsd_nat_target::read_description () if (x86bsd_xsave_len != 0) { if (is64) - return amd64_target_description (xcr0); + return amd64_target_description (xcr0, true); else return i386_target_description (xcr0); } #endif if (is64) - return amd64_target_description (X86_XSTATE_SSE_MASK); + return amd64_target_description (X86_XSTATE_SSE_MASK, true); else return i386_target_description (X86_XSTATE_SSE_MASK); } diff --git a/gdb/amd64-fbsd-tdep.c b/gdb/amd64-fbsd-tdep.c index 9b2ee136530..f5bf1985b67 100644 --- a/gdb/amd64-fbsd-tdep.c +++ b/gdb/amd64-fbsd-tdep.c @@ -156,7 +156,7 @@ amd64fbsd_core_read_description (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd) { - return amd64_target_description (i386fbsd_core_read_xcr0 (abfd)); + return amd64_target_description (i386fbsd_core_read_xcr0 (abfd), true); } /* Similar to amd64_supply_fpregset, but use XSAVE extended state. */ @@ -218,7 +218,7 @@ amd64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->sizeof_gregset = 22 * 8; amd64_init_abi (info, gdbarch, - amd64_target_description (X86_XSTATE_SSE_MASK)); + amd64_target_description (X86_XSTATE_SSE_MASK, true)); tdep->sigtramp_p = amd64fbsd_sigtramp_p; tdep->sigtramp_start = amd64fbsd_sigtramp_start_addr; diff --git a/gdb/amd64-nbsd-tdep.c b/gdb/amd64-nbsd-tdep.c index f740bb4a82a..d100beacd19 100644 --- a/gdb/amd64-nbsd-tdep.c +++ b/gdb/amd64-nbsd-tdep.c @@ -105,7 +105,7 @@ amd64nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->sizeof_gregset = 26 * 8; amd64_init_abi (info, gdbarch, - amd64_target_description (X86_XSTATE_SSE_MASK)); + amd64_target_description (X86_XSTATE_SSE_MASK, true)); tdep->jb_pc_offset = 7 * 8; diff --git a/gdb/amd64-obsd-tdep.c b/gdb/amd64-obsd-tdep.c index 1e078b14f8b..da4739c9729 100644 --- a/gdb/amd64-obsd-tdep.c +++ b/gdb/amd64-obsd-tdep.c @@ -421,7 +421,7 @@ amd64obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); amd64_init_abi (info, gdbarch, - amd64_target_description (X86_XSTATE_SSE_MASK)); + amd64_target_description (X86_XSTATE_SSE_MASK, true)); obsd_init_abi (info, gdbarch); /* Initialize general-purpose register set details. */ diff --git a/gdb/amd64-sol2-tdep.c b/gdb/amd64-sol2-tdep.c index 78d3d361cb4..9504f190d72 100644 --- a/gdb/amd64-sol2-tdep.c +++ b/gdb/amd64-sol2-tdep.c @@ -101,7 +101,7 @@ amd64_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->sizeof_gregset = 28 * 8; amd64_init_abi (info, gdbarch, - amd64_target_description (X86_XSTATE_SSE_MASK)); + amd64_target_description (X86_XSTATE_SSE_MASK, true)); tdep->sigtramp_p = amd64_sol2_sigtramp_p; tdep->sigcontext_addr = amd64_sol2_mcontext_addr;