From 854062337d056ffc8b805e0d5a8c1a66b99a4076 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 16 May 2017 09:09:20 -0700
Subject: [PATCH] Fix commit 0a7d38897b9fb1ec7a064ca3347cbac3ba49e5ac

---
 ld/testsuite/ld-x86-64/x86-64.exp | 40 +++++++++++++++++--------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index d583f098455..e7f73266aa3 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -1221,24 +1221,6 @@ if { [isnative] && [which $CC] != 0 } {
 		"pr19784b" \
 		"pass.out" \
 	    ] \
-	    [list \
-		"Run pr21481a" \
-		"$NOPIE_LDFLAGS -Wl,-z,bndplt" \
-		"" \
-		{ pr21481a.c pr21481b.S } \
-		"pr21481a" \
-		"pass.out" \
-		"$NOPIE_CFLAGS" \
-	    ] \
-	    [list \
-		"Run pr21481b" \
-		"$NOPIE_LDFLAGS -Wl,-z,bndplt,-z,now" \
-		"" \
-		{ pr21481a.c pr21481b.S } \
-		"pr21481b" \
-		"pass.out" \
-		"$NOPIE_CFLAGS" \
-	    ] \
 	]
     }
 
@@ -1336,6 +1318,28 @@ if { [isnative] && [which $CC] != 0 } {
 		"pass.out" \
 	    ] \
 	]
+	if { [check_ifunc_attribute_available] } {
+	    run_ld_link_exec_tests [list \
+		[list \
+		    "Run pr21481a" \
+		    "$NOPIE_LDFLAGS -Wl,-z,bndplt" \
+		    "" \
+		    { pr21481a.c pr21481b.S } \
+		    "pr21481a" \
+		    "pass.out" \
+		     "$NOPIE_CFLAGS" \
+		] \
+		[list \
+		    "Run pr21481b" \
+		    "$NOPIE_LDFLAGS -Wl,-z,bndplt,-z,now" \
+		    "" \
+		    { pr21481a.c pr21481b.S } \
+		    "pr21481b" \
+		    "pass.out" \
+		    "$NOPIE_CFLAGS" \
+		] \
+	    ]
+	}
     }
 
     undefined_weak "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS"
-- 
2.30.2