From 0d28b0a5caa6b04129e21a9aff371d4032c7ef17 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 6 Oct 2017 14:53:39 +0100 Subject: [PATCH] Move aarch64-insn.o to arch/aarch64-insn.o and Remove a rule for arch/*.c This patch moves aarch64-insn.o to arch/aarch64-insn.o. Then, all arch/*.c are built to arch/*.o, so we don't need a Makefile rule to build *.o from arch/*.c. This patch removes it too. gdb: 2017-10-06 Yao Qi * Makefile.in (ALL_64_TARGET_OBS): Replace aarch64-insn.o with arch/aarch64-insn.o. Remove one rule. * configure.tgt: Replace aarch64-insn.o with arch/aarch64-insn.o. --- gdb/ChangeLog | 7 +++++++ gdb/Makefile.in | 6 +----- gdb/configure.tgt | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index df704f8ee1c..18224e0305e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2017-10-06 Yao Qi + + * Makefile.in (ALL_64_TARGET_OBS): Replace aarch64-insn.o with + arch/aarch64-insn.o. + Remove one rule. + * configure.tgt: Replace aarch64-insn.o with arch/aarch64-insn.o. + 2017-10-06 Yao Qi * Makefile.in (ALL_TARGET_OBS): Replace arm.o, arm-get-next-pcs.o, diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 4492aca530f..da4095d4a25 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -759,7 +759,6 @@ TARGET_OBS = @TARGET_OBS@ # (used with --enable-targets=all --enable-64-bit-bfd). ALL_64_TARGET_OBS = \ aarch64-fbsd-tdep.o \ - aarch64-insn.o \ aarch64-linux-tdep.o \ aarch64-newlib-tdep.o \ aarch64-tdep.o \ @@ -778,6 +777,7 @@ ALL_64_TARGET_OBS = \ amd64-sol2-tdep.o \ amd64-tdep.o \ amd64-windows-tdep.o \ + arch/aarch64-insn.o \ arch/amd64.o \ ia64-linux-tdep.o \ ia64-tdep.o \ @@ -1926,10 +1926,6 @@ all: gdb$(EXEEXT) $(CONFIG_ALL) $(POSTCOMPILE) # Rules for compiling .c files in the various source subdirectories. -%.o: ${srcdir}/arch/%.c - $(COMPILE) $< - $(POSTCOMPILE) - %.o: $(srcdir)/cli/%.c $(COMPILE) $< $(POSTCOMPILE) diff --git a/gdb/configure.tgt b/gdb/configure.tgt index 52ae4675522..f8677b4e311 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -46,7 +46,7 @@ amd64_tobjs="amd64-tdep.o arch/amd64.o" case "${targ}" in aarch64*-*-*) - cpu_obs="aarch64-tdep.o aarch64-insn.o";; + cpu_obs="aarch64-tdep.o arch/aarch64-insn.o";; alpha*-*-*) # Target: Alpha -- 2.30.2