diff options
| -rw-r--r-- | ld/ChangeLog | 7 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/x86-64.exp | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 044b947..29d8530 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,12 @@ 2017-04-07 H.J. Lu <hongjiu.lu@intel.com> + 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 <hongjiu.lu@intel.com> + PR ld/19579 PR ld/21306 * testsuite/ld-elf/pr19579a.c (main): Updated. diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 579ffc1..a9394c3 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" |