* testsuite/Makefile.am (memory_test.o): New target.

	(memory_test): Depend on memory_test.o, gcctestdir/ld, and
	memory_test.t.
	* testsuite/Makefile.in: Rebuild.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index db96352..fa478b4 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,6 +1,10 @@
 2010-09-17  Ian Lance Taylor  <iant@google.com>
 
        * testsuite/memory_test.sh: Adjust for change of 2010-09-10.
+       * testsuite/Makefile.am (memory_test.o): New target.
+       (memory_test): Depend on memory_test.o, gcctestdir/ld, and
+       memory_test.t.
+       * testsuite/Makefile.in: Rebuild.
 
 2010-09-17  Doug Kwan  <dougkwan@google.com>
 

diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index 064f44d..adc0a23 100644 (file)
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -1788,8 +1788,9 @@ libstart_lib_test.a: start_lib_test_1.o
 check_SCRIPTS += memory_test.sh
 check_DATA += memory_test.stdout
 MOSTLYCLEANFILES += memory_test.stdout memory_test memory_test.o
-memory_test: memory_test.s
-       $(COMPILE) -c $< -o memory_test.o
+memory_test.o: memory_test.s
+       $(COMPILE) -o $@ -c $<
+memory_test: memory_test.o gcctestdir/ld $(srcdir)/memory_test.t
        $(LINK) -Bgcctestdir/ -nostartfiles -nostdlib -T $(srcdir)/memory_test.t -o $@ memory_test.o
 memory_test.stdout: memory_test
        $(TEST_READELF) -lWS  $< > $@

diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
index 7f62404..357b96e 100644 (file)
--- a/gold/testsuite/Makefile.in
+++ b/gold/testsuite/Makefile.in
@@ -4528,8 +4528,9 @@ uninstall-am:
 @GCC_TRUE@@NATIVE_LINKER_TRUE@         -Wl,--start-lib start_lib_test_2.o start_lib_test_3.o -Wl,--end-lib
 @GCC_TRUE@@NATIVE_LINKER_TRUE@libstart_lib_test.a: start_lib_test_1.o
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_AR) rc $@ $^
-@GCC_TRUE@@NATIVE_LINKER_TRUE@memory_test: memory_test.s
-@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(COMPILE) -c $< -o memory_test.o
+@GCC_TRUE@@NATIVE_LINKER_TRUE@memory_test.o: memory_test.s
+@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(COMPILE) -o $@ -c $<
+@GCC_TRUE@@NATIVE_LINKER_TRUE@memory_test: memory_test.o gcctestdir/ld $(srcdir)/memory_test.t
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(LINK) -Bgcctestdir/ -nostartfiles -nostdlib -T $(srcdir)/memory_test.t -o $@ memory_test.o
 @GCC_TRUE@@NATIVE_LINKER_TRUE@memory_test.stdout: memory_test
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_READELF) -lWS  $< > $@