From a7eaf017f95932eb2d654bd61f4c4a873ba71f77 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 7 Apr 2017 08:53:43 -0700 Subject: [PATCH] Use NOPIE_CFLAGS and NOPIE_LDFLAGS to disable PIE Since not all compilers support -no-pie, NOPIE_CFLAGS and NOPIE_LDFLAGS should be used to disable PIE. PR ld/21090 * testsuite/ld-x86-64/x86-64.exp (undefined_weak): Use NOPIE_CFLAGS and NOPIE_LDFLAGS to disable PIE for the non-pie version of the test. --- ld/ChangeLog | 7 +++++++ ld/testsuite/ld-x86-64/x86-64.exp | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 044b947f5b0..29d85303abc 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2017-04-07 H.J. Lu + + PR ld/21090 + * testsuite/ld-x86-64/x86-64.exp (undefined_weak): Use + NOPIE_CFLAGS and NOPIE_LDFLAGS to disable PIE for the non-pie + version of the test. + 2017-04-07 H.J. Lu PR ld/19579 diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 579ffc14b5a..a9394c3a564 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -589,6 +589,8 @@ proc undefined_weak {cflags ldflags} { # Add $PLT_CFLAGS if PLT is expected. global PLT_CFLAGS +# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required. +global NOPIE_CFLAGS NOPIE_LDFLAGS # Must be native with the C compiler if { [isnative] && [which $CC] != 0 } { @@ -1277,7 +1279,7 @@ if { [isnative] && [which $CC] != 0 } { ] } - undefined_weak "-fno-pie" "-no-pie" + undefined_weak "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS" undefined_weak "-fPIE" "" undefined_weak "-fPIE" "-pie" undefined_weak "-fPIE" "-Wl,-z,nodynamic-undefined-weak" -- 2.30.2