From cda77e9efc68d04e50990ea72890bd8e515d4d7b Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 27 Jul 2015 05:17:26 -0700 Subject: [PATCH] Pass $PLT_CFLAGS to ld_compile Some linker shard library tests without PIC expect PLT. This patch passes $PLT_CFLAGS to ld_compile. * ld-shared/shared.exp: Pass $PLT_CFLAGS to ld_compile. --- ld/testsuite/ChangeLog | 4 ++++ ld/testsuite/ld-shared/shared.exp | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 9e785a808c..abc49b365f 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-07-27 H.J. Lu + + * ld-shared/shared.exp: Pass $PLT_CFLAGS to ld_compile. + 2015-07-27 H.J. Lu * ld-scripts/crossref.exp (CC): Save and restore. Append diff --git a/ld/testsuite/ld-shared/shared.exp b/ld/testsuite/ld-shared/shared.exp index 7f418dc4b5..2be4f6af28 100644 --- a/ld/testsuite/ld-shared/shared.exp +++ b/ld/testsuite/ld-shared/shared.exp @@ -217,9 +217,10 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $srcdir/$subdir/main.c $tmpdir/mainnp.o] # although it will be less efficient because the dynamic linker # will need to do more relocation work. However, note that not # using -fpic will cause some of the tests to return different - # results. - if { ![ld_compile "$CC $CFLAGS $SHCFLAG" $srcdir/$subdir/sh1.c $tmpdir/sh1np.o] - || ![ld_compile "$CC $CFLAGS $SHCFLAG" $srcdir/$subdir/sh2.c $tmpdir/sh2np.o] } { + # results. Make sure that PLT is used since PLT is expected. + global PLT_CFLAGS + if { ![ld_compile "$CC $PLT_CFLAGS $CFLAGS $SHCFLAG" $srcdir/$subdir/sh1.c $tmpdir/sh1np.o] + || ![ld_compile "$CC $PLT_CFLAGS $CFLAGS $SHCFLAG" $srcdir/$subdir/sh2.c $tmpdir/sh2np.o] } { unresolved "shared (non PIC)" } else { if { [istarget rs6000*-*-aix*] || [istarget powerpc*-*-aix*] } { shared_test shnp "shared (nonPIC)" mainnp.o sh1np.o sh2np.o xcoff