[PATCH] btrace: fix the non-native build

Mircea Gherzan
2013-08-13T14:47:15Z

When building on a non-Linux host for a Linux target, the build fails
because the linux-btrace object is not built/linked.

2013-08-09 Mircea Gherzan <mircea.gherzan@intel.com>

gdb/
* configure.tgt: Add linux-btrace.o to gdb_target_obs for i386
and x86_64 Linux targets.
* config/i386/linux.mh (NATDEPFILES): Remove linux-btrace.o.
* config/i386/linux64.mh (NATDEPFILES): Remove linux-btrace.o.

Signed-off-by: Mircea Gherzan <mircea.gherzan@intel.com>
---
gdb/config/i386/linux.mh | 3 +--
gdb/config/i386/linux64.mh | 2 +-
gdb/configure.tgt | 5 +++--
3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gdb/config/i386/linux.mh b/gdb/config/i386/linux.mh
index 7c64e83..8316d87 100644
--- a/gdb/config/i386/linux.mh
+++ b/gdb/config/i386/linux.mh
@@ -4,8 +4,7 @@ NAT_FILE= config/nm-linux.h
NATDEPFILES= inf-ptrace.o fork-child.o \
i386-nat.o i386-linux-nat.o \
proc-service.o linux-thread-db.o \
- linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \
- linux-btrace.o
+ linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o
NAT_CDEPS = $(srcdir)/proc-service.list

# The dynamically loaded libthread_db needs access to symbols in the
diff --git a/gdb/config/i386/linux64.mh b/gdb/config/i386/linux64.mh
index 8d782c1..d2b95fd 100644
--- a/gdb/config/i386/linux64.mh
+++ b/gdb/config/i386/linux64.mh
@@ -3,7 +3,7 @@ NATDEPFILES= inf-ptrace.o fork-child.o \
i386-nat.o amd64-nat.o amd64-linux-nat.o \
linux-nat.o linux-osdata.o \
proc-service.o linux-thread-db.o linux-fork.o \
- linux-procfs.o linux-ptrace.o linux-btrace.o
+ linux-procfs.o linux-ptrace.o
NAT_FILE= config/nm-linux.h
NAT_CDEPS = $(srcdir)/proc-service.list

diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 653ba2b..0dabd57 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -221,7 +221,7 @@ i[34567]86-*-linux*)
# Target: Intel 386 running GNU/Linux
gdb_target_obs="i386-tdep.o i386-linux-tdep.o glibc-tdep.o i387-tdep.o \
solib-svr4.o symfile-mem.o \
- linux-tdep.o linux-record.o"
+ linux-tdep.o linux-record.o linux-btrace.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}"
@@ -660,7 +660,8 @@ x86_64-*-linux*)
# Target: GNU/Linux x86-64
gdb_target_obs="amd64-tdep.o amd64-linux-tdep.o i386-tdep.o \
i387-tdep.o i386-linux-tdep.o glibc-tdep.o \
- solib-svr4.o symfile-mem.o linux-tdep.o linux-record.o"
+ solib-svr4.o symfile-mem.o linux-tdep.o linux-record.o \
+ linux-btrace.o"
build_gdbserver=yes
;;
x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
--
1.7.12.4