From d0042c6ed311694e791ecea8c132b3f01278b7ee Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 2 Aug 2018 05:42:53 -0700 Subject: [PATCH] ifunc.exp: Always build static_nonifunc_prog Since static_nonifunc_prog isn't linked against libc.a, we can always build it. * testsuite/ld-ifunc/ifunc.exp: Always build static_nonifunc_prog. --- ld/ChangeLog | 4 ++++ ld/testsuite/ld-ifunc/ifunc.exp | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index c5838d294bb..e1e67d5ab52 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2018-08-02 H.J. Lu + + * testsuite/ld-ifunc/ifunc.exp: Always build static_nonifunc_prog. + 2018-08-02 H.J. Lu PR binutils/23460 diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp index 86892b96b58..5fee56d3bf6 100644 --- a/ld/testsuite/ld-ifunc/ifunc.exp +++ b/ld/testsuite/ld-ifunc/ifunc.exp @@ -231,10 +231,10 @@ if ![string match "" $STATIC_LDFLAGS] { fail "Could not link a static executable" set fails [expr $fails + 1] } - if ![ld_link $ld "tmpdir/static_nonifunc_prog" "-static tmpdir/empty.o"] { - fail "Could not link a non-ifunc using static executable" - set fails [expr $fails + 1] - } +} +if ![ld_link $ld "tmpdir/static_nonifunc_prog" "-static tmpdir/empty.o"] { + fail "Could not link a non-ifunc using static executable" + set fails [expr $fails + 1] } if ![ld_link $CC "tmpdir/test-1" "-Wl,--no-as-needed,-rpath=./tmpdir tmpdir/test-1.o tmpdir/libshared_ifunc.so"] { fail "Could not link test-1" -- 2.30.2