From 6bda016bec556855c6d4e191f360f921faa40ded Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Mon, 13 Mar 2017 18:44:02 -0400
Subject: [PATCH] gdbserver: Use pattern rule for objects from common/

gdb/gdbserver/ChangeLog:

	* Makefile.in (%.o: ../common/%.c): New rule.
	(signals.o: ../common/signals.c): Remove.
	(print-utils.o: ../common/print-utils.c): Remove.
	(rsp-low.o: ../common/rsp-low.c): Remove.
	(common-utils.o: ../common/common-utils.c): Remove.
	(posix-strerror.o: ../common/posix-strerror.c): Remove.
	(mingw-strerror.o: ../common/mingw-strerror.c): Remove.
	(vec.o: ../common/vec.c): Remove.
	(gdb_vecs.o: ../common/gdb_vecs.c): Remove.
	(xml-utils.o: ../common/xml-utils.c): Remove.
	(ptid.o: ../common/ptid.c): Remove.
	(buffer.o: ../common/buffer.c): Remove.
	(format.o: ../common/format.c): Remove.
	(filestuff.o: ../common/filestuff.c): Remove.
	(agent.o: ../common/agent.c): Remove.
	(errors.o: ../common/errors.c): Remove.
	(environ.o: ../common/environ.c): Remove.
	(common-debug.o: ../common/common-debug.c): Remove.
	(cleanups.o: ../common/cleanups.c): Remove.
	(common-exceptions.o: ../common/common-exceptions.c): Remove.
	(fileio.o: ../common/fileio.c): Remove.
	(common-regcache.o: ../common/common-regcache.c): Remove.
	(signals-state-save-restore.o: ../common/signals-state-save-restore.c): Remove.
	(new-op.o: ../common/new-op.c): Remove.
	(btrace-common.o: ../common/btrace-common.c): Remove.
---
 gdb/gdbserver/ChangeLog   | 28 ++++++++++++++
 gdb/gdbserver/Makefile.in | 77 ++-------------------------------------
 2 files changed, 32 insertions(+), 73 deletions(-)

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 521a3392761..30a5a447b33 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,31 @@
+2017-03-13  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* Makefile.in (%.o: ../common/%.c): New rule.
+	(signals.o: ../common/signals.c): Remove.
+	(print-utils.o: ../common/print-utils.c): Remove.
+	(rsp-low.o: ../common/rsp-low.c): Remove.
+	(common-utils.o: ../common/common-utils.c): Remove.
+	(posix-strerror.o: ../common/posix-strerror.c): Remove.
+	(mingw-strerror.o: ../common/mingw-strerror.c): Remove.
+	(vec.o: ../common/vec.c): Remove.
+	(gdb_vecs.o: ../common/gdb_vecs.c): Remove.
+	(xml-utils.o: ../common/xml-utils.c): Remove.
+	(ptid.o: ../common/ptid.c): Remove.
+	(buffer.o: ../common/buffer.c): Remove.
+	(format.o: ../common/format.c): Remove.
+	(filestuff.o: ../common/filestuff.c): Remove.
+	(agent.o: ../common/agent.c): Remove.
+	(errors.o: ../common/errors.c): Remove.
+	(environ.o: ../common/environ.c): Remove.
+	(common-debug.o: ../common/common-debug.c): Remove.
+	(cleanups.o: ../common/cleanups.c): Remove.
+	(common-exceptions.o: ../common/common-exceptions.c): Remove.
+	(fileio.o: ../common/fileio.c): Remove.
+	(common-regcache.o: ../common/common-regcache.c): Remove.
+	(signals-state-save-restore.o: ../common/signals-state-save-restore.c): Remove.
+	(new-op.o: ../common/new-op.c): Remove.
+	(btrace-common.o: ../common/btrace-common.c): Remove.
+
 2017-03-13  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* Makefile.in (%.o: ../target/%.c): New rule.
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index f814366a012..2129f2a4d34 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -735,76 +735,6 @@ ax.o: ax.c
 	$(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
 	$(POSTCOMPILE)
 
-signals.o: ../common/signals.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-print-utils.o: ../common/print-utils.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-rsp-low.o: ../common/rsp-low.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-common-utils.o: ../common/common-utils.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-posix-strerror.o: ../common/posix-strerror.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-mingw-strerror.o: ../common/mingw-strerror.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-vec.o: ../common/vec.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-gdb_vecs.o: ../common/gdb_vecs.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-xml-utils.o: ../common/xml-utils.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-ptid.o: ../common/ptid.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-buffer.o: ../common/buffer.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-format.o: ../common/format.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-filestuff.o: ../common/filestuff.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-agent.o: ../common/agent.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-errors.o: ../common/errors.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-environ.o: ../common/environ.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-common-debug.o: ../common/common-debug.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-cleanups.o: ../common/cleanups.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-common-exceptions.o: ../common/common-exceptions.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-fileio.o: ../common/fileio.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-common-regcache.o: ../common/common-regcache.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-signals-state-save-restore.o: ../common/signals-state-save-restore.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-new-op.o: ../common/new-op.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-
 # Arch object files rules form ../arch
 
 arm.o: ../arch/arm.c
@@ -855,9 +785,6 @@ aarch64-linux-hw-point.o: ../nat/aarch64-linux-hw-point.c
 aarch64-linux.o: ../nat/aarch64-linux.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
-btrace-common.o: ../common/btrace-common.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
 x86-linux.o: ../nat/x86-linux.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
@@ -880,6 +807,10 @@ aarch64-insn.o: ../arch/aarch64-insn.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
 
+%.o: ../common/%.c
+	$(COMPILE) $<
+	$(POSTCOMPILE)
+
 %.o: ../target/%.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
-- 
2.30.2