From 640d0ed874167d73b11dfbf5e838c65cc43e6a63 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sun, 12 Nov 2017 17:41:50 +1030 Subject: [PATCH] ld-ifunc non-PIC tests * testsuite/ld-ifunc/ifunc.exp: Ensure non-PIC tests are really not PIE by default gcc options. --- ld/ChangeLog | 5 +++++ ld/testsuite/ld-ifunc/ifunc.exp | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 16786d7020..634c9903c0 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2017-11-14 Alan Modra + + * testsuite/ld-ifunc/ifunc.exp: Ensure non-PIC tests are really + not PIE by default gcc options. + 2017-11-13 H.J. Lu * emultempl/ppc32elf.em (ppc_before_allocation): Replace diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp index 9445f9f233..4ef66edf2e 100644 --- a/ld/testsuite/ld-ifunc/ifunc.exp +++ b/ld/testsuite/ld-ifunc/ifunc.exp @@ -164,7 +164,7 @@ if ![ld_compile "$CC -c -fPIC" "$srcdir/$subdir/prog.c" "tmpdir/shared_prog.o"] fail "Could not create a PIC object file" set fails [expr $fails + 1] } -if ![ld_compile "$CC -c" "$srcdir/$subdir/prog.c" "tmpdir/static_prog.o"] { +if ![ld_compile "$CC -c $NOPIE_CFLAGS" "$srcdir/$subdir/prog.c" "tmpdir/static_prog.o"] { fail "Could not create a non-PIC object file" set fails [expr $fails + 1] } @@ -172,7 +172,7 @@ if ![ld_compile "$CC -c -fPIC -DWITH_IFUNC" "$srcdir/$subdir/lib.c" "tmpdir/shar fail "Could not create a PIC object file containing an IFUNC symbol" set fails [expr $fails + 1] } -if ![ld_compile "$CC -c -DWITH_IFUNC" "$srcdir/$subdir/lib.c" "tmpdir/static_ifunc.o"] { +if ![ld_compile "$CC -c $NOPIE_CFLAGS -DWITH_IFUNC" "$srcdir/$subdir/lib.c" "tmpdir/static_ifunc.o"] { fail "Could not create a non-PIC object file containing an IFUNC symbol" set fails [expr $fails + 1] } @@ -214,7 +214,7 @@ if ![ld_link $CC "tmpdir/dynamic_prog" "-Wl,--no-as-needed,-rpath=./tmpdir,-Bdyn fail "Could not link a dynamic executable" set fails [expr $fails + 1] } -if ![ld_link $CC "tmpdir/local_prog" "-Wl,--no-as-needed,-rpath=./tmpdir -Ltmpdir tmpdir/static_prog.o -lifunc"] { +if ![ld_link $CC "tmpdir/local_prog" "$NOPIE_LDFLAGS -Wl,--no-as-needed,-rpath=./tmpdir -Ltmpdir tmpdir/static_prog.o -lifunc"] { fail "Could not link a dynamic executable using local ifunc" set fails [expr $fails + 1] }