From 25d28c91b89d8f4a7e78b98b01e2c2382cea3e60 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 8 Aug 2017 20:20:43 -0700
Subject: [PATCH] ld: Require GCC 5 or above for 3 x86 tests

Require GCC 5 or above for 3 x86 tests which fail with GCC 4.9.3.

	PR ld/21924
	* testsuite/ld-i386/i386.exp: Require GCC 5 or above for
	"weakundef1 with PIE" test.
	* testsuite/ld-x86-64/tls.exp: Require GCC 5 or above for
	"tlsdesc1" and "tlsdesc1 with PIE" tests.
---
 ld/ChangeLog                   |  8 +++++++
 ld/testsuite/ld-i386/i386.exp  | 22 ++++++++++--------
 ld/testsuite/ld-x86-64/tls.exp | 41 +++++++++++++++++++---------------
 3 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index c1db121fd4..b6d378fed2 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2017-08-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/21924
+	* testsuite/ld-i386/i386.exp: Require GCC 5 or above for
+	"weakundef1 with PIE" test.
+	* testsuite/ld-x86-64/tls.exp: Require GCC 5 or above for
+	"tlsdesc1" and "tlsdesc1 with PIE" tests.
+
 2017-08-08  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* configure.ac (TESTBFDLIB): Add a ',' after -Wl,--rpath.
diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index 2d7d532a49..060a7e9dd4 100644
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -1252,16 +1252,20 @@ if { [isnative]
 	    "pass.out" \
 	    "$NOPIE_CFLAGS" \
 	] \
-	[list \
-	    "Run weakundef1 with PIE" \
-	    "-pie" \
-	    "" \
-	    { weakundef1.c } \
-	    "weakundef1pie" \
-	    "pass.out" \
-	    "-fPIE" \
-	] \
     ]
+    if { [at_least_gcc_version 5 0] } {
+	run_ld_link_exec_tests [list \
+	    [list \
+		"Run weakundef1 with PIE" \
+		"-pie" \
+		"" \
+		{ weakundef1.c } \
+		"weakundef1pie" \
+		"pass.out" \
+		"-fPIE" \
+	    ] \
+	]
+    }
 }
 
 if { !([istarget "i?86-*-linux*"]
diff --git a/ld/testsuite/ld-x86-64/tls.exp b/ld/testsuite/ld-x86-64/tls.exp
index 4263d95bd1..7896451c01 100644
--- a/ld/testsuite/ld-x86-64/tls.exp
+++ b/ld/testsuite/ld-x86-64/tls.exp
@@ -206,16 +206,30 @@ if { ![check_gnu2_tls_available] } {
     return
 }
 
+if { [at_least_gcc_version 5 0] } {
+    run_ld_link_exec_tests [list \
+	[list \
+	    "Run tlsdesc1" \
+	    "-Wl,--no-as-needed tmpdir/libtlsdesc1.so" \
+	    "" \
+	    { tlsdesc1a.c } \
+	    "tlsdesc1a" \
+	    "pass.out" \
+	    "$GNU2_CFLAGS" \
+	] \
+	[list \
+	    "Run tlsdesc1 with PIE" \
+	    "-pie -Wl,--no-as-needed tmpdir/libtlsdesc1.so" \
+	    "" \
+	    { tlsdesc1a.c } \
+	    "tlsdesc1c" \
+	    "pass.out" \
+	    "-fPIE $GNU2_CFLAGS" \
+	] \
+    ]
+}
+
 run_ld_link_exec_tests [list \
-    [list \
-	"Run tlsdesc1" \
-	"-Wl,--no-as-needed tmpdir/libtlsdesc1.so" \
-	"" \
-	{ tlsdesc1a.c } \
-	"tlsdesc1a" \
-	"pass.out" \
-	"$GNU2_CFLAGS" \
-    ] \
     [list \
 	"Run tlsdesc1 (-z now)" \
 	"-Wl,-z,now -Wl,--no-as-needed tmpdir/libtlsdesc1n.so" \
@@ -225,15 +239,6 @@ run_ld_link_exec_tests [list \
 	"pass.out" \
 	"$GNU2_CFLAGS" \
     ] \
-    [list \
-	"Run tlsdesc1 with PIE" \
-	"-pie -Wl,--no-as-needed tmpdir/libtlsdesc1.so" \
-	"" \
-	{ tlsdesc1a.c } \
-	"tlsdesc1c" \
-	"pass.out" \
-	"-fPIE $GNU2_CFLAGS" \
-    ] \
     [list \
 	"Run tlsdesc1 with PIE (-z now)" \
 	"-pie -Wl,-z,now -Wl,--no-as-needed tmpdir/libtlsdesc1n.so" \
-- 
2.34.1