Fix make 3.81 build errors

gdbserver/
	* Makefile.in: Switch order of make rules.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index b7e017c831d03a5e377ad289f858603aee3c07da..f105efa3daa56bda10b2316d827793ee87c51281 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-20  Alan Hayward  <alan.hayward@arm.com>
+           Simon Marchi  <simon.marchi@ericsson.com>
+
+       * Makefile.in: Switch order of make rules.
+
 2018-02-19  Alan Hayward  <alan.hayward@arm.com>
 
        * Makefile.in: Add common directory in build.

diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index fcb6e1e817f521385de3986861c430c31a1b7eec..2dbf9ae63df15502d038bcd26af6963dfa87e739 100644 (file)
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -537,11 +537,15 @@ ax.o: ax.c
        $(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
        $(POSTCOMPILE)
 
-arch/%.o: ../arch/%.c
-       $(COMPILE) $<
+# Rules for objects that go in the in-process agent.
+
+arch/%-ipa.o: ../arch/%.c
+       $(IPAGENT_COMPILE) $<
        $(POSTCOMPILE)
 
-# Rules for objects that go in the in-process agent.
+common/%-ipa.o: ../common/%.c
+       $(IPAGENT_COMPILE) $<
+       $(POSTCOMPILE)
 
 %-ipa.o: %-generated.c
        $(IPAGENT_COMPILE) $<
@@ -562,25 +566,21 @@ arch/%.o: ../arch/%.c
        $(IPAGENT_COMPILE) $<
        $(POSTCOMPILE)
 
-common/%-ipa.o: ../common/%.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
+# Rules for objects that go in the gdbserver binary.
 
-arch/%-ipa.o: ../arch/%.c
-       $(IPAGENT_COMPILE) $<
+arch/%.o: ../arch/%.c
+       $(COMPILE) $<
        $(POSTCOMPILE)
 
-# Rules for objects that go in the gdbserver binary.
-
-%.o: %-generated.c
+common/%.o: ../common/%.c
        $(COMPILE) $<
        $(POSTCOMPILE)
 
-%.o: %.c
+%.o: %-generated.c
        $(COMPILE) $<
        $(POSTCOMPILE)
 
-common/%.o: ../common/%.c
+%.o: %.c
        $(COMPILE) $<
        $(POSTCOMPILE)