[binutils-gdb] ifunc.exp: Always build static_nonifunc_prog

[H.J.Lu]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=d0042c6ed311694e791ecea8c132b3f01278b7ee

commit d0042c6ed311694e791ecea8c132b3f01278b7ee
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Thu Aug 2 05:42:53 2018 -0700

    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.

Diff:
---
 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 c5838d2..e1e67d5 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,9 @@
 2018-08-02  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* testsuite/ld-ifunc/ifunc.exp: Always build static_nonifunc_prog.
+
+2018-08-02  H.J. Lu  <hongjiu.lu@intel.com>
+
 	PR binutils/23460
 	* testsuite/ld-plugin/lto.exp: Run the PR binutils/23460 test.
 	* testsuite/ld-plugin/pr23460a.c: New file.
diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp
index 86892b9..5fee56d 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"