From 8d20070632b608587f372cf2d36ead339487e49c Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 15 Sep 2017 13:05:39 +0100 Subject: [PATCH] Fix x86 build failures Christophe Lyon told me that GDB build failed on i386-linux with --enable-64-bit-bfd=yes, so I audit the gdb/configure.tgt again. I find that i386-darwin has the same issue too. Additionally, GDB for solaris target fails to build too. This patch fixes all of them. gdb: 2017-09-15 Yao Qi * configure.tgt (i[34567]86-*-darwin*): Append amd64.o to gdb_target_obs. (i[34567]86-*-solaris2.1[0-9]* | x86_64-*-solaris2.1[0-9]*): Likewise. (i[34567]86-*-linux*): Likewise. --- gdb/ChangeLog | 8 ++++++++ gdb/configure.tgt | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c562f7b7207..7cbd16188fb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2017-09-15 Yao Qi + + * configure.tgt (i[34567]86-*-darwin*): Append amd64.o to + gdb_target_obs. + (i[34567]86-*-solaris2.1[0-9]* | x86_64-*-solaris2.1[0-9]*): + Likewise. + (i[34567]86-*-linux*): Likewise. + 2017-09-14 Simon Marchi * dwarf2expr.h (dwarf_stack_value): Add constructor. diff --git a/gdb/configure.tgt b/gdb/configure.tgt index 9d9ef4b0f97..2e69e1d8cba 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -193,7 +193,7 @@ i[34567]86-*-darwin*) i386-darwin-tdep.o solib-darwin.o" if test "x$enable_64_bit_bfd" = "xyes"; then # Target: GNU/Linux x86-64 - gdb_target_obs="amd64-tdep.o amd64-darwin-tdep.o ${gdb_target_obs}" + gdb_target_obs="amd64-tdep.o amd64.o amd64-darwin-tdep.o ${gdb_target_obs}" fi ;; i[34567]86-*-dicos*) @@ -224,7 +224,7 @@ i[34567]86-*-nto*) ;; i[34567]86-*-solaris2.1[0-9]* | x86_64-*-solaris2.1[0-9]*) # Target: Solaris x86_64 - gdb_target_obs="i386-tdep.o i386.o i387-tdep.o amd64-tdep.o \ + gdb_target_obs="i386-tdep.o i386.o i387-tdep.o amd64-tdep.o amd64.o \ amd64-sol2-tdep.o i386-sol2-tdep.o sol2-tdep.o \ solib-svr4.o" ;; @@ -241,7 +241,7 @@ i[34567]86-*-linux*) linux-tdep.o linux-record.o" if test "x$enable_64_bit_bfd" = "xyes"; then # Target: GNU/Linux x86-64 - gdb_target_obs="amd64-tdep.o amd64-linux-tdep.o ${gdb_target_obs}" + gdb_target_obs="amd64-tdep.o amd64.o amd64-linux-tdep.o ${gdb_target_obs}" fi build_gdbserver=yes ;; -- 2.30.2