From 21122961ecea30b3be7c788e09179d297e3233f0 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 target/

gdb/gdbserver/ChangeLog:

	* Makefile.in (%.o: ../target/%.c): New rule.
	(waitstatus.o: ../target/waitstatus.c): Remove.
---
 gdb/gdbserver/ChangeLog   |  5 +++++
 gdb/gdbserver/Makefile.in | 17 ++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 60ed76e950..521a339276 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-13  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* Makefile.in (%.o: ../target/%.c): New rule.
+	(waitstatus.o: ../target/waitstatus.c): Remove.
+
 2017-03-13  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* Makefile.in
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 85138e09c5..f814366a01 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -328,10 +328,6 @@ FLAGS_TO_PASS = \
 # All generated files which can be included by another file.
 generated_files = config.h $(GNULIB_H)
 
-%.o: %.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-
 all: gdbserver$(EXEEXT) gdbreplay$(EXEEXT) $(extra_libraries)
 	@$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
 
@@ -796,9 +792,6 @@ cleanups.o: ../common/cleanups.c
 common-exceptions.o: ../common/common-exceptions.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
-waitstatus.o: ../target/waitstatus.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
 fileio.o: ../common/fileio.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
@@ -881,6 +874,16 @@ aarch64-insn.o: ../arch/aarch64-insn.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
 
+# Rules for objects that go in the gdbserver binary.
+
+%.o: %.c
+	$(COMPILE) $<
+	$(POSTCOMPILE)
+
+%.o: ../target/%.c
+	$(COMPILE) $<
+	$(POSTCOMPILE)
+
 # Rules for register format descriptions.
 
 %.c: ../regformats/%.dat | $(regdat_sh)
-- 
2.34.1