From d2fcdd85466668c06dda0fa02ac8c1f4cef3910d Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Tue, 5 Sep 2017 14:46:47 +0100 Subject: [PATCH] Add i386.o to gdb_target_obs for x86_64-* targets This patch fixes the build failure caused by 22916b0 (Convert the rest x86 target descriptions). gdb: 2017-09-05 Yao Qi * configure.tgt (gdb_target_obs): Add i386.o for x86_64-* targets. --- gdb/ChangeLog | 5 +++++ gdb/configure.tgt | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0297eeb..3ba07ce 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-09-05 Yao Qi + + * configure.tgt (gdb_target_obs): Add i386.o for x86_64-* + targets. + 2017-09-05 Pedro Alves * eval.c (eval_call, evaluate_funcall): New functions, factored diff --git a/gdb/configure.tgt b/gdb/configure.tgt index 2b48749..603a30c 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -665,18 +665,18 @@ vax-*-*) x86_64-*-darwin*) # Target: Darwin/x86-64 - gdb_target_obs="amd64-tdep.o amd64.o i386-tdep.o i387-tdep.o \ + gdb_target_obs="amd64-tdep.o amd64.o i386-tdep.o i386.o i387-tdep.o \ i386-darwin-tdep.o amd64-darwin-tdep.o \ solib-darwin.o" ;; x86_64-*-dicos*) # Target: DICOS/x86-64 - gdb_target_obs="amd64-tdep.o amd64.o i386-tdep.o i387-tdep.o \ + gdb_target_obs="amd64-tdep.o amd64.o i386-tdep.o i386.o i387-tdep.o \ dicos-tdep.o i386-dicos-tdep.o amd64-dicos-tdep.o" ;; x86_64-*-elf*) - gdb_target_obs="amd64-tdep.o amd64.o i386-tdep.o i387-tdep.o" + gdb_target_obs="amd64-tdep.o amd64.o i386-tdep.o i386.o i387-tdep.o" ;; x86_64-*-linux*) # Target: GNU/Linux x86-64 @@ -688,7 +688,7 @@ x86_64-*-linux*) x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) # Target: FreeBSD/amd64 gdb_target_obs="amd64-tdep.o amd64.o amd64-fbsd-tdep.o i386-tdep.o \ - i387-tdep.o i386-bsd-tdep.o i386-fbsd-tdep.o \ + i386.o i387-tdep.o i386-bsd-tdep.o i386-fbsd-tdep.o \ fbsd-tdep.o solib-svr4.o" ;; x86_64-*-mingw* | x86_64-*-cygwin*) @@ -701,16 +701,17 @@ x86_64-*-mingw* | x86_64-*-cygwin*) x86_64-*-netbsd* | x86_64-*-knetbsd*-gnu) # Target: NetBSD/amd64 gdb_target_obs="amd64-tdep.o amd64.o amd64-nbsd-tdep.o i386-tdep.o \ - i387-tdep.o nbsd-tdep.o solib-svr4.o" + i386.o i387-tdep.o nbsd-tdep.o solib-svr4.o" ;; x86_64-*-openbsd*) # Target: OpenBSD/amd64 gdb_target_obs="amd64-tdep.o amd64.o amd64-obsd-tdep.o i386-tdep.o \ i387-tdep.o i386-bsd-tdep.o i386-obsd-tdep.o \ - obsd-tdep.o bsd-uthread.o solib-svr4.o" + i386.o obsd-tdep.o bsd-uthread.o solib-svr4.o" ;; x86_64-*-rtems*) - gdb_target_obs="amd64-tdep.o amd64.o i386-tdep.o i387-tdep.o i386-bsd-tdep.o" + gdb_target_obs="amd64-tdep.o amd64.o i386-tdep.o i386.o i387-tdep.o \ + i386-bsd-tdep.o" ;; xtensa*-*-linux*) gdb_target=linux # Target: GNU/Linux Xtensa -- 2.7.4