From e92372274e77fc0ce87f35a833de8a60d733580a Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 10 Jan 2017 10:54:39 -0800 Subject: [PATCH] i386: Pass -Wl,-R,tmpdir/-Wl --as-needed to $CC Since linker tests were changed to use $CC, instead of $LD, we need to pass -Wl,-R,tmpdir and -Wl,--as-needed to $CC. * testsuite/ld-i386/i386.exp: Pass -Wl,-R,tmpdir to GCC driver. * testsuite/ld-i386/tls.exp: Likewise. --- ld/ChangeLog | 6 ++++++ ld/testsuite/ld-i386/i386.exp | 4 ++-- ld/testsuite/ld-i386/tls.exp | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 72826b93658..ef2c466e150 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2017-01-10 H.J. Lu + + * testsuite/ld-i386/i386.exp: Pass -Wl,-R,tmpdir and + -Wl,--as-needed to $CC. + * testsuite/ld-i386/tls.exp: Likewise. + 2017-01-10 Nick Clifton * po/sv.po: Updated Swedish translation. diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index e748e8b2d48..973a1106517 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -472,7 +472,7 @@ proc undefined_weak {cflags ldflags} { run_ld_link_exec_tests [list \ [list \ "Run pr19704" \ - "$ldflags tmpdir/libpr19704.so -R tmpdir" \ + "$ldflags tmpdir/libpr19704.so -Wl,-R,tmpdir" \ "" \ { pr19704a.c } \ "pr19704" \ @@ -757,7 +757,7 @@ if { [isnative] ] \ [list \ "Run copyreloc-main with PIE and GOTOFF" \ - "--as-needed tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \ + "-Wl,--as-needed tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \ "" \ { dummy.s } \ "copyreloc-main" \ diff --git a/ld/testsuite/ld-i386/tls.exp b/ld/testsuite/ld-i386/tls.exp index 3cf183ec435..165310494e6 100644 --- a/ld/testsuite/ld-i386/tls.exp +++ b/ld/testsuite/ld-i386/tls.exp @@ -98,7 +98,7 @@ run_ld_link_exec_tests [list \ [list \ "TLS GD/LD -> IE transition without PLT" \ "tmpdir/tls-main1.o tmpdir/tls-gd1.o tmpdir/tls-ld1.o \ - tmpdir/libtls-1a.so -R tmpdir" \ + tmpdir/libtls-1a.so -Wl,-R,tmpdir" \ "" \ { dummy.s } \ "tls-1d" \ @@ -107,7 +107,7 @@ run_ld_link_exec_tests [list \ [list \ "TLS without PLT (1)" \ "tmpdir/tls-main1.o \ - tmpdir/libtls-1a.so tmpdir/libtls-1b.so -R tmpdir" \ + tmpdir/libtls-1a.so tmpdir/libtls-1b.so -Wl,-R,tmpdir" \ "" \ { dummy.s } \ "tls-1e" \ @@ -116,7 +116,7 @@ run_ld_link_exec_tests [list \ [list \ "TLS without PLT (2)" \ "tmpdir/tls-main1.o tmpdir/tls-def1.o \ - tmpdir/libtls-1b.so -R tmpdir" \ + tmpdir/libtls-1b.so -Wl,-R,tmpdir" \ "" \ { dummy.s } \ "tls-1f" \ -- 2.30.2