From 068e05badb9c3802961d67bc90e39c12798e8488 Mon Sep 17 00:00:00 2001 From: Alan Modra <amodra@gmail.com> Date: Wed, 29 Jun 2016 18:37:27 +0930 Subject: [PATCH] [GOLD] Pass -Wl,-z to gcc, not plain -z * testsuite/Makefile.am (memory_test, memory_test_2): Pass -Wl,-z to gcc, not plain -z. * testsuite/Makefile.in: Regenerate. --- gold/ChangeLog | 6 ++++++ gold/testsuite/Makefile.am | 4 ++-- gold/testsuite/Makefile.in | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index f21121c400e..6880b759a1b 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,9 @@ +2016-06-30 Alan Modra <amodra@gmail.com> + + * testsuite/Makefile.am (memory_test, memory_test_2): Pass + -Wl,-z to gcc, not plain -z. + * testsuite/Makefile.in: Regenerate. + 2016-06-29 H.J. Lu <hongjiu.lu@intel.com> PR gold/20308 diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am index d297085141f..b1c671f6129 100644 --- a/gold/testsuite/Makefile.am +++ b/gold/testsuite/Makefile.am @@ -2730,7 +2730,7 @@ MOSTLYCLEANFILES += memory_test.stdout memory_test 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 -z max-page-size=0x1000 -z common-page-size=0x1000 -Wl,-T,$(srcdir)/memory_test.t -o $@ memory_test.o + $(LINK) -Bgcctestdir/ -nostartfiles -nostdlib -Wl,-z,max-page-size=0x1000 -Wl,-z,common-page-size=0x1000 -Wl,-T,$(srcdir)/memory_test.t -o $@ memory_test.o memory_test.stdout: memory_test $(TEST_READELF) -lWS $< > $@ @@ -2745,7 +2745,7 @@ memory_test_inc_2.t: $(srcdir)/memory_test_inc_2.t.src memory_test_inc_3.t: $(srcdir)/memory_test_inc_3.t.src cp $< $@ memory_test_2: memory_test.o gcctestdir/ld $(srcdir)/memory_test.t memory_test_inc_1.t memory_test_inc_2.t memory_test_inc_3.t - $(LINK) -Bgcctestdir/ -nostartfiles -nostdlib -z max-page-size=0x1000 -z common-page-size=0x1000 -Wl,-T,$(srcdir)/memory_test.t -o $@ memory_test.o + $(LINK) -Bgcctestdir/ -nostartfiles -nostdlib -Wl,-z,max-page-size=0x1000 -Wl,-z,common-page-size=0x1000 -Wl,-T,$(srcdir)/memory_test.t -o $@ memory_test.o if HAVE_PUBNAMES diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in index d291014c012..c28b4f9a243 100644 --- a/gold/testsuite/Makefile.in +++ b/gold/testsuite/Makefile.in @@ -6962,7 +6962,7 @@ uninstall-am: @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 -z max-page-size=0x1000 -z common-page-size=0x1000 -Wl,-T,$(srcdir)/memory_test.t -o $@ memory_test.o +@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(LINK) -Bgcctestdir/ -nostartfiles -nostdlib -Wl,-z,max-page-size=0x1000 -Wl,-z,common-page-size=0x1000 -Wl,-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 $< > $@ @GCC_TRUE@@NATIVE_LINKER_TRUE@memory_test_inc_1.t: $(srcdir)/memory_test_inc_1.t.src @@ -6972,7 +6972,7 @@ uninstall-am: @GCC_TRUE@@NATIVE_LINKER_TRUE@memory_test_inc_3.t: $(srcdir)/memory_test_inc_3.t.src @GCC_TRUE@@NATIVE_LINKER_TRUE@ cp $< $@ @GCC_TRUE@@NATIVE_LINKER_TRUE@memory_test_2: memory_test.o gcctestdir/ld $(srcdir)/memory_test.t memory_test_inc_1.t memory_test_inc_2.t memory_test_inc_3.t -@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(LINK) -Bgcctestdir/ -nostartfiles -nostdlib -z max-page-size=0x1000 -z common-page-size=0x1000 -Wl,-T,$(srcdir)/memory_test.t -o $@ memory_test.o +@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(LINK) -Bgcctestdir/ -nostartfiles -nostdlib -Wl,-z,max-page-size=0x1000 -Wl,-z,common-page-size=0x1000 -Wl,-T,$(srcdir)/memory_test.t -o $@ memory_test.o @GCC_TRUE@@HAVE_PUBNAMES_TRUE@@NATIVE_LINKER_TRUE@gdb_index_test.o: gdb_index_test.cc @GCC_TRUE@@HAVE_PUBNAMES_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -O0 -g -gno-pubnames -c -o $@ $< @GCC_TRUE@@HAVE_PUBNAMES_TRUE@@NATIVE_LINKER_TRUE@gdb_index_test_1: gdb_index_test.o gcctestdir/ld -- GitLab