diff --git a/ld/ChangeLog b/ld/ChangeLog
index c5838d294b..e1e67d5ab5 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+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
diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp
index 86892b96b5..5fee56d3bf 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"