Better make rule for arch/ files built for IPA

gdbserver/
	* Makefile.in: Update arch rules.
	* configure.srv: Explicitly mark arch/ files.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 0652f074b98467d8f6202380bed7baf0e19cfd31..069ef9347feec84bfb49468a13e2ab3905ddb871 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-15  Alan Hayward  <alan.hayward@arm.com>
+
+       * Makefile.in: Update arch rules.
+       * configure.srv: Explicitly mark arch/ files.
+
 2017-11-13  Andreas Schwab  <schwab@suse.de>
 
        * linux-m68k-low.c (m68k_supports_hardware_single_step): New

diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 8e73563b103f720ddd5e77607c3190a2959903f5..1d51819014270e48b6a670e3defa1dc449e3abf5 100644 (file)
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -567,7 +567,7 @@ arch/%.o: ../arch/%.c
        $(IPAGENT_COMPILE) $<
        $(POSTCOMPILE)
 
-%-ipa.o: ../arch/%.c
+arch/%-ipa.o: ../arch/%.c
        $(IPAGENT_COMPILE) $<
        $(POSTCOMPILE)
 

diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv
index 515c6dc8b3e57574286149ebdca37da149218a35..82c3dc237c3fb6baeb2a72cd9ed66d8c7556d72a 100644 (file)
--- a/gdb/gdbserver/configure.srv
+++ b/gdb/gdbserver/configure.srv
@@ -133,7 +133,7 @@ case "${target}" in
                        srv_linux_thread_db=yes
                        srv_linux_btrace=yes
                        ipa_obj="linux-i386-ipa.o linux-x86-tdesc-ipa.o"
-                       ipa_obj="${ipa_obj} i386-ipa.o"
+                       ipa_obj="${ipa_obj} arch/i386-ipa.o"
                        ;;
   i[34567]86-*-lynxos*)        srv_regobj=""
                        srv_tgtobj="lynx-low.o lynx-i386-low.o fork-child.o fork-inferior.o"
@@ -383,7 +383,7 @@ case "${target}" in
                        srv_linux_thread_db=yes
                        srv_linux_btrace=yes
                        ipa_obj="linux-amd64-ipa.o linux-x86-tdesc-ipa.o"
-                       ipa_obj="${ipa_obj} amd64-ipa.o"
+                       ipa_obj="${ipa_obj} arch/amd64-ipa.o"
                        ;;
   x86_64-*-mingw*)     srv_regobj=""
                        srv_tgtobj="x86-low.o x86-dregs.o i387-fp.o win32-low.o win32-i386-low.o"