From 0a7d38897b9fb1ec7a064ca3347cbac3ba49e5ac Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 16 May 2017 08:52:01 -0700
Subject: [PATCH] Run PR ld/21481 tests only if IFUNC is supported

	PR ld/21481
	* testsuite/ld-x86-64/x86-64.exp: Run PR ld/21481 tests only
	if IFUNC is supported by run-time.
---
 ld/ChangeLog                      |  6 ++++++
 ld/testsuite/ld-x86-64/x86-64.exp | 36 +++++++++++++++----------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index a1df77a96f9..2034a1a690e 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/21481
+	* testsuite/ld-x86-64/x86-64.exp: Run PR ld/21481 tests only
+	if IFUNC is supported by run-time.
+
 2017-05-16  Alan Modra  <amodra@gmail.com>
 
 	* plugin.c: Rename occurrences of non_ir_ref.
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 05125df6b27..d583f098455 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -1221,6 +1221,24 @@ 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" \
+	    ] \
 	]
     }
 
@@ -1317,24 +1335,6 @@ if { [isnative] && [which $CC] != 0 } {
 		"pr20800" \
 		"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" \
-	    ] \
 	]
     }
 
-- 
2.30.2