From 50cfacb78f3998e5ecc653090e4f1a11dfb3d8dd Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 13 Mar 2017 18:44:03 -0400 Subject: [PATCH] gdbserver: Use pattern rule for objects from arch/ gdb/gdbserver/ChangeLog: * Makefile.in (%.o: ../arch/%.c): New rule. (arm.o: ../arch/arm.c): Remove. (arm-linux.o: ../arch/arm-linux.c): Remove. (arm-get-next-pcs.o: ../arch/arm-get-next-pcs.c): Remove. (aarch64-insn.o: ../arch/aarch64-insn.c): Remove. --- gdb/gdbserver/ChangeLog | 8 ++++++++ gdb/gdbserver/Makefile.in | 20 +++----------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 08a6b58997..bfad881b7c 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,11 @@ +2017-03-13 Simon Marchi + + * Makefile.in (%.o: ../arch/%.c): New rule. + (arm.o: ../arch/arm.c): Remove. + (arm-linux.o: ../arch/arm-linux.c): Remove. + (arm-get-next-pcs.o: ../arch/arm-get-next-pcs.c): Remove. + (aarch64-insn.o: ../arch/aarch64-insn.c): Remove. + 2017-03-13 Simon Marchi * Makefile.in (%.o: ../nat/%.c): New rule. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index bcf12d017e..3baa96f4a9 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -735,27 +735,13 @@ ax.o: ax.c $(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $< $(POSTCOMPILE) -# Arch object files rules form ../arch - -arm.o: ../arch/arm.c - $(COMPILE) $< - $(POSTCOMPILE) -arm-linux.o: ../arch/arm-linux.c - $(COMPILE) $< - $(POSTCOMPILE) -arm-get-next-pcs.o: ../arch/arm-get-next-pcs.c - $(COMPILE) $< - $(POSTCOMPILE) - -# Architecture specific object files rules from ../arch +# Rules for objects that go in the gdbserver binary. -aarch64-insn.o: ../arch/aarch64-insn.c +%.o: %.c $(COMPILE) $< $(POSTCOMPILE) -# Rules for objects that go in the gdbserver binary. - -%.o: %.c +%.o: ../arch/%.c $(COMPILE) $< $(POSTCOMPILE) -- 2.34.1