From 71917808c3490b4d4df9c6e848e3c5d75f5278d2 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 6 Oct 2017 14:36:04 +0100 Subject: [PATCH] Move arm.o arm-get-next-pcs.o arm-linux.o to arch/ It is tested by building GDB for some targets, arm-elf, arm-netbsd, arm-linux, and aarch64-linux. gdb: 2017-10-06 Yao Qi * Makefile.in (ALL_TARGET_OBS): Replace arm.o, arm-get-next-pcs.o, and arm-linux.o with arch/arm.o, arch/arm-get-next-pcs.o and arch/arm-linux.o respectively. * configure.tgt: Likewise. --- gdb/ChangeLog | 7 +++++++ gdb/Makefile.in | 6 +++--- gdb/configure.tgt | 8 ++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fc19c8b49c..df704f8ee1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2017-10-06 Yao Qi + + * Makefile.in (ALL_TARGET_OBS): Replace arm.o, arm-get-next-pcs.o, + and arm-linux.o with arch/arm.o, arch/arm-get-next-pcs.o and + arch/arm-linux.o respectively. + * configure.tgt: Likewise. + 2017-10-06 Yao Qi * Makefile.in (ALL_TARGET_OBS): Rename i386.o to arch/i386.o. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index c40cb762a3..4492aca530 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -793,11 +793,11 @@ ALL_64_TARGET_OBS = \ # All other target-dependent objects files (used with --enable-targets=all). ALL_TARGET_OBS = \ arc-tdep.o \ + arch/arm.o \ + arch/arm-get-next-pcs.o \ + arch/arm-linux.o \ arch/i386.o \ - arm.o \ arm-bsd-tdep.o \ - arm-get-next-pcs.o \ - arm-linux.o \ arm-linux-tdep.o \ arm-nbsd-tdep.o \ arm-obsd-tdep.o \ diff --git a/gdb/configure.tgt b/gdb/configure.tgt index 4b3be3fb80..52ae467552 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -59,7 +59,7 @@ arc*-*-*) ;; arm*-*-*) - cpu_obs="arm.o arm-get-next-pcs.o arm-tdep.o";; + cpu_obs="arch/arm.o arch/arm-get-next-pcs.o arm-tdep.o";; hppa*-*-*) # Target: HP PA-RISC @@ -115,8 +115,8 @@ aarch64*-*-freebsd*) aarch64*-*-linux*) # Target: AArch64 linux gdb_target_obs="aarch64-linux-tdep.o \ - arm.o arm-linux.o arm-get-next-pcs.o arm-tdep.o \ - arm-linux-tdep.o \ + arch/arm.o arch/arm-linux.o arch/arm-get-next-pcs.o \ + arm-tdep.o arm-linux-tdep.o \ glibc-tdep.o linux-tdep.o solib-svr4.o \ symfile-mem.o linux-record.o" build_gdbserver=yes @@ -156,7 +156,7 @@ arm*-wince-pe | arm*-*-mingw32ce*) ;; arm*-*-linux*) # Target: ARM based machine running GNU/Linux - gdb_target_obs="arm-linux.o arm-linux-tdep.o glibc-tdep.o \ + gdb_target_obs="arch/arm-linux.o arm-linux-tdep.o glibc-tdep.o \ solib-svr4.o symfile-mem.o linux-tdep.o linux-record.o" build_gdbserver=yes ;; -- 2.34.1