From fdbd3e95ee4b35c9b3f61cab71f339513ca326dc Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Wed, 20 Jan 2016 15:41:06 +0000
Subject: [PATCH] Fix linker testsuite failures for arm-pe targets.

	PR 19457
	* testsuite/ld-scripts/script.exp (extract_symbol_test): Stop test
	early for PE based targets.
	* testsuite/ld-scripts/align.t: Use 0x1000 as VMA alignment.
	* testsuite/ld-pe/tlssec32.d: Allow for relocatable output.
---
 ld/ChangeLog                       | 8 ++++++++
 ld/testsuite/ld-pe/tlssec32.d      | 2 +-
 ld/testsuite/ld-scripts/align.t    | 4 ++--
 ld/testsuite/ld-scripts/script.exp | 9 +++++++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 94b6f47d6e..fc01ed6161 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2016-01-20  Nick Clifton  <nickc@redhat.com>
+
+	PR 19457
+	* testsuite/ld-scripts/script.exp (extract_symbol_test): Stop test
+	early for PE based targets.
+	* testsuite/ld-scripts/align.t: Use 0x1000 as VMA alignment.
+	* testsuite/ld-pe/tlssec32.d: Allow for relocatable output.
+
 2016-01-20  Mickael Guene  <mickael.guene@st.com>
 
 	* testsuite/ld-arm/thumb1-noread-not-present-mixing-two-section.s:
diff --git a/ld/testsuite/ld-pe/tlssec32.d b/ld/testsuite/ld-pe/tlssec32.d
index 0114064a33..7e19772425 100644
--- a/ld/testsuite/ld-pe/tlssec32.d
+++ b/ld/testsuite/ld-pe/tlssec32.d
@@ -1,3 +1,3 @@
 #...
-Entry 9 00003000 00000018 Thread Storage Directory \[\.tls\]
+Entry 9 0000.000 000000.. Thread Storage Directory \[\.tls\]
 #...
diff --git a/ld/testsuite/ld-scripts/align.t b/ld/testsuite/ld-scripts/align.t
index 49d6053a10..81c21c6cae 100644
--- a/ld/testsuite/ld-scripts/align.t
+++ b/ld/testsuite/ld-scripts/align.t
@@ -1,8 +1,8 @@
 SECTIONS
 {
   .text : {*(.text)}
-  .data ALIGN(0x40) : AT (ALIGN (LOADADDR (.text) + SIZEOF (.text), 0x80))
+  .data ALIGN(0x1000) : AT (ALIGN (LOADADDR (.text) + SIZEOF (.text), 0x80))
     {}
   ASSERT (LOADADDR(.data) == 0x80, "dyadic ALIGN broken")
-  ASSERT (ADDR(.data) == 0x40, "monadic ALIGN broken")
+  ASSERT (ADDR(.data) == 0x1000, "monadic ALIGN broken")
 }
diff --git a/ld/testsuite/ld-scripts/script.exp b/ld/testsuite/ld-scripts/script.exp
index fc95658774..61ada1060a 100644
--- a/ld/testsuite/ld-scripts/script.exp
+++ b/ld/testsuite/ld-scripts/script.exp
@@ -145,6 +145,15 @@ proc extract_symbol_test { testfile testname } {
 	    pass $testname
 	    return
 	}
+	[a-z]*-*-pe$ {
+	    # Fails for PE based targets because the extracted section
+	    # relative symbols (eg tred or .text) all become undefined
+	    # when the sections are blown away by --extract-symbol.  Again
+	    # this should not matter as --extract-symbol is only used by
+	    # VxWorks.
+	    pass $testname
+	    return
+	}
     }
 
     set extract_syms [run_host_cmd $nm $copyfile]