summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-07-24 15:22:24 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-07-26 15:16:55 -0700
commitf7348a51f6557f93a5f441133a7073ad7ec3760f (patch)
treecede4b29daceaaff42ec847dcbbb0427a2f331f0
parent69458b59ad9f84d86ea8febd214f0628d7cdf924 (diff)
downloadbinutils-gdb-users/hjl/no-plt.tar.gz
Append $PLT_CFLAGS to CC/CXX for S-records testsusers/hjl/no-plt
S-records tests don't work with -fno-plt. This path appends $PLT_CFLAGS to CC and CXX for S-records tests. * ld-srec/srec.exp (CC): Save and restore. Append $PLT_CFLAGS. (CXX): Likewise.
-rw-r--r--ld/testsuite/ChangeLog5
-rw-r--r--ld/testsuite/ld-srec/srec.exp17
2 files changed, 22 insertions, 0 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 9b101c9288d..429e60d687b 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -22,6 +22,11 @@
2015-07-24 H.J. Lu <hongjiu.lu@intel.com>
+ * ld-srec/srec.exp (CC): Save and restore. Append $PLT_CFLAGS.
+ (CXX): Likewise.
+
+2015-07-24 H.J. Lu <hongjiu.lu@intel.com>
+
* ld-shared/shared.exp: Pass $PLT_CFLAGS to ld_compile.
2015-07-24 H.J. Lu <hongjiu.lu@intel.com>
diff --git a/ld/testsuite/ld-srec/srec.exp b/ld/testsuite/ld-srec/srec.exp
index 758ed2821fd..ea2f1e0ec64 100644
--- a/ld/testsuite/ld-srec/srec.exp
+++ b/ld/testsuite/ld-srec/srec.exp
@@ -339,10 +339,20 @@ if { ![is_remote host] && [which $CC] == 0 } {
return
}
+# Pass -fplt to CC and CXX since -fno-plt doesn't work with S-records
+# tests.
+global PLT_CFLAGS
+set old_CC "$CC"
+set CC "$CC $PLT_CFLAGS"
+set old_CXX "$CXX"
+set CXX "$CXX $PLT_CFLAGS"
+
if { ![ld_compile $CC $srcdir/$subdir/sr1.c tmpdir/sr1.o] \
|| ![ld_compile $CC $srcdir/$subdir/sr2.c tmpdir/sr2.o] } {
unresolved $test1
unresolved $test2
+ set CC "$old_CC"
+ set CXX "$old_CXX"
return
}
@@ -403,11 +413,15 @@ run_srec_test $test1 "tmpdir/sr1.o tmpdir/sr2.o"
if { ![is_remote host] && [which $CXX] == 0 } {
untested $test2
+ set CC "$old_CC"
+ set CXX "$old_CXX"
return
}
if ![ld_compile "$CXX $CXXFLAGS -fno-exceptions" $srcdir/$subdir/sr3.cc tmpdir/sr3.o] {
unresolved $test2
+ set CC "$old_CC"
+ set CXX "$old_CXX"
return
}
@@ -427,3 +441,6 @@ setup_xfail "bfin-*-linux-uclibc"
setup_xfail "tile*-*-*"
run_srec_test $test2 "tmpdir/sr3.o"
+
+set CC "$old_CC"
+set CXX "$old_CXX"