[GDBserver] Move aarch64-insn.o to arch/ and remove one Makefile rule

gdb/gdbserver:

2017-10-17  Yao Qi  <yao.qi@linaro.org>

	* Makefile.in: Remove one rule.
	* configure.srv: Rename aarch64-insn.o with arch/aarch64-insn.o.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index df481cbc575da6ae6a977d382e402682d469cca2..350843e65f225c77abd53c030a8403d0128dedbf 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-17  Yao Qi  <yao.qi@linaro.org>
+
+       * Makefile.in: Remove one rule.
+       * configure.srv: Rename aarch64-insn.o with arch/aarch64-insn.o.
+
 2017-10-17  Yao Qi  <yao.qi@linaro.org>
 
        * configure.srv: Rename arm-linux.o with arch/arm-linux.o.

diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index eff6fa56747a6ea88e22b5b43ba91c9820491a32..8e73563b103f720ddd5e77607c3190a2959903f5 100644 (file)
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -581,10 +581,6 @@ arch/%.o: ../arch/%.c
        $(COMPILE) $<
        $(POSTCOMPILE)
 
-%.o: ../arch/%.c
-       $(COMPILE) $<
-       $(POSTCOMPILE)
-
 %.o: ../common/%.c
        $(COMPILE) $<
        $(POSTCOMPILE)

diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv
index d1b08cfdbb6bf6d723ec0435bd13fb6084b9608a..515c6dc8b3e57574286149ebdca37da149218a35 100644 (file)
--- a/gdb/gdbserver/configure.srv
+++ b/gdb/gdbserver/configure.srv
@@ -56,7 +56,7 @@ case "${target}" in
                        srv_tgtobj="$srv_tgtobj linux-aarch32-low.o"
                        srv_tgtobj="${srv_tgtobj} arch/arm.o"
                        srv_tgtobj="$srv_tgtobj aarch64-linux.o"
-                       srv_tgtobj="$srv_tgtobj aarch64-insn.o"
+                       srv_tgtobj="$srv_tgtobj arch/aarch64-insn.o"
                        srv_tgtobj="${srv_tgtobj} $srv_linux_obj"
                        srv_xmlfiles="aarch64.xml"
                        srv_xmlfiles="${srv_xmlfiles} aarch64-core.xml"