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

gdb/gdbserver/ChangeLog:

	* Makefile.in (%.o: ../nat/%.c): New rule.
	(x86-dregs.o: ../nat/x86-dregs.c): Remove.
	(amd64-linux-siginfo.o: ../nat/amd64-linux-siginfo.c): Remove.
	(linux-btrace.o: ../nat/linux-btrace.c): Remove.
	(linux-osdata.o: ../nat/linux-osdata.c): Remove.
	(linux-procfs.o: ../nat/linux-procfs.c): Remove.
	(linux-ptrace.o: ../nat/linux-ptrace.c): Remove.
	(linux-waitpid.o: ../nat/linux-waitpid.c): Remove.
	(mips-linux-watch.o: ../nat/mips-linux-watch.c): Remove.
	(ppc-linux.o: ../nat/ppc-linux.c): Remove.
	(linux-personality.o: ../nat/linux-personality.c): Remove.
	(aarch64-linux-hw-point.o: ../nat/aarch64-linux-hw-point.c): Remove.
	(aarch64-linux.o: ../nat/aarch64-linux.c): Remove.
	(x86-linux.o: ../nat/x86-linux.c): Remove.
	(x86-linux-dregs.o: ../nat/x86-linux-dregs.c): Remove.
	(linux-namespaces.o: ../nat/linux-namespaces.c): Remove.
---
 gdb/gdbserver/ChangeLog   | 19 ++++++++++++++
 gdb/gdbserver/Makefile.in | 52 +++------------------------------------
 2 files changed, 23 insertions(+), 48 deletions(-)

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 30a5a447b33..08a6b58997d 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,22 @@
+2017-03-13  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* Makefile.in (%.o: ../nat/%.c): New rule.
+	(x86-dregs.o: ../nat/x86-dregs.c): Remove.
+	(amd64-linux-siginfo.o: ../nat/amd64-linux-siginfo.c): Remove.
+	(linux-btrace.o: ../nat/linux-btrace.c): Remove.
+	(linux-osdata.o: ../nat/linux-osdata.c): Remove.
+	(linux-procfs.o: ../nat/linux-procfs.c): Remove.
+	(linux-ptrace.o: ../nat/linux-ptrace.c): Remove.
+	(linux-waitpid.o: ../nat/linux-waitpid.c): Remove.
+	(mips-linux-watch.o: ../nat/mips-linux-watch.c): Remove.
+	(ppc-linux.o: ../nat/ppc-linux.c): Remove.
+	(linux-personality.o: ../nat/linux-personality.c): Remove.
+	(aarch64-linux-hw-point.o: ../nat/aarch64-linux-hw-point.c): Remove.
+	(aarch64-linux.o: ../nat/aarch64-linux.c): Remove.
+	(x86-linux.o: ../nat/x86-linux.c): Remove.
+	(x86-linux-dregs.o: ../nat/x86-linux-dregs.c): Remove.
+	(linux-namespaces.o: ../nat/linux-namespaces.c): Remove.
+
 2017-03-13  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* Makefile.in (%.o: ../common/%.c): New rule.
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 2129f2a4d34..bcf12d017ec 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -747,54 +747,6 @@ arm-get-next-pcs.o: ../arch/arm-get-next-pcs.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
 
-# Native object files rules from ../nat
-
-x86-dregs.o: ../nat/x86-dregs.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-amd64-linux-siginfo.o: ../nat/amd64-linux-siginfo.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-linux-btrace.o: ../nat/linux-btrace.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-linux-osdata.o: ../nat/linux-osdata.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-linux-procfs.o: ../nat/linux-procfs.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-linux-ptrace.o: ../nat/linux-ptrace.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-linux-waitpid.o: ../nat/linux-waitpid.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-mips-linux-watch.o: ../nat/mips-linux-watch.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-ppc-linux.o: ../nat/ppc-linux.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-linux-personality.o: ../nat/linux-personality.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-aarch64-linux-hw-point.o: ../nat/aarch64-linux-hw-point.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-aarch64-linux.o: ../nat/aarch64-linux.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-x86-linux.o: ../nat/x86-linux.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-x86-linux-dregs.o: ../nat/x86-linux-dregs.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-linux-namespaces.o: ../nat/linux-namespaces.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-
 # Architecture specific object files rules from ../arch
 
 aarch64-insn.o: ../arch/aarch64-insn.c
@@ -811,6 +763,10 @@ aarch64-insn.o: ../arch/aarch64-insn.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
 
+%.o: ../nat/%.c
+	$(COMPILE) $<
+	$(POSTCOMPILE)
+
 %.o: ../target/%.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
-- 
2.30.2