aboutsummaryrefslogtreecommitdiff
path: root/gold
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>2010-09-18 00:34:58 +0000
committerIan Lance Taylor <ian@airs.com>2010-09-18 00:34:58 +0000
commitd4d9148957223e46022675f5322ba422f15943f9 (patch)
treed8b7f80475e6ae848dbfe2ea9847080de206776e /gold
parent * testsuite/memory_test.sh: Adjust for change of 2010-09-10. (diff)
downloadbinutils-gdb-d4d9148957223e46022675f5322ba422f15943f9.tar.gz
binutils-gdb-d4d9148957223e46022675f5322ba422f15943f9.tar.bz2
binutils-gdb-d4d9148957223e46022675f5322ba422f15943f9.zip
* 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.
Diffstat (limited to 'gold')
-rw-r--r--gold/ChangeLog4
-rw-r--r--gold/testsuite/Makefile.am5
-rw-r--r--gold/testsuite/Makefile.in5
3 files changed, 10 insertions, 4 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index db96352bdc1..fa478b42527 100644
--- 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 064f44d40f2..adc0a235fbc 100644
--- 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 7f62404201f..357b96e62f1 100644
--- 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 $< > $@