From: Andrew Burgess <andrew.burgess@embecosm.com>
Date: Tue, 20 Jan 2015 16:00:41 +0000 (+0000)
Subject: ld: Update expected test results for 32-bit hosts.
X-Git-Tag: binutils-2_25_1~226
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87e3999a45d1ef6a7fea2690eb3315d57dd722fd;p=thirdparty%2Fbinutils-gdb.git

ld: Update expected test results for 32-bit hosts.

Tests that I added in commit c05b575a8dfabab6af5d8586d1a5c0c67f819ac2
fails on 32-bit hosts due to differences in whitespace.

This patch updates the expected output patterns to be more accepting of
differences in whitespace, the tests should now pass.

ld/testsuite/ChangeLog:

	* ld-scripts/provide-4-map.d: Update expected output.
	* ld-scripts/provide-5-map.d: Likewise.
---

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 0b97c822166..3bf27586c5e 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,6 +1,10 @@
 2015-02-11  Alan Modra  <amodra@gmail.com>
 
 	Apply from master.
+	2015-01-20  Andrew Burgess  <andrew.burgess@embecosm.com>
+	* ld-scripts/provide-4-map.d: Update expected output.
+	* ld-scripts/provide-5-map.d: Likewise.
+
 	2015-01-20  Andrew Burgess  <andrew.burgess@embecosm.com>
 	* ld-scripts/provide-4.d: New file.
 	* ld-scripts/provide-4-map.d: New file.
diff --git a/ld/testsuite/ld-scripts/provide-4-map.d b/ld/testsuite/ld-scripts/provide-4-map.d
index d8e4a2815b9..189d1d04bcc 100644
--- a/ld/testsuite/ld-scripts/provide-4-map.d
+++ b/ld/testsuite/ld-scripts/provide-4-map.d
@@ -1,13 +1,13 @@
 #...
 Linker script and memory map
 #...
-                \[!provide\]                        PROVIDE \(foo, 0x1\)
-                \[!provide\]                        PROVIDE \(bar, 0x2\)
-                0x0+3                PROVIDE \(baz, 0x3\)
-#...
-                0x0+2000                foo
-                \[!provide\]                        PROVIDE \(loc1, ALIGN \(\., 0x10\)\)
-                0x0+2010                PROVIDE \(loc2, ALIGN \(\., 0x10\)\)
-                \[!provide\]                        PROVIDE \(loc3, \(loc1 \+ 0x20\)\)
-                0x0+2030                loc4 = \(loc2 \+ 0x20\)
+                \[!provide\] +PROVIDE \(foo, 0x1\)
+                \[!provide\] +PROVIDE \(bar, 0x2\)
+                0x0+3 +PROVIDE \(baz, 0x3\)
+#...
+                0x0+2000 +foo
+                \[!provide\] +PROVIDE \(loc1, ALIGN \(\., 0x10\)\)
+                0x0+2010 +PROVIDE \(loc2, ALIGN \(\., 0x10\)\)
+                \[!provide\] +PROVIDE \(loc3, \(loc1 \+ 0x20\)\)
+                0x0+2030 +loc4 = \(loc2 \+ 0x20\)
 #...
diff --git a/ld/testsuite/ld-scripts/provide-5-map.d b/ld/testsuite/ld-scripts/provide-5-map.d
index 2271dfd1b78..a75e4aa73c5 100644
--- a/ld/testsuite/ld-scripts/provide-5-map.d
+++ b/ld/testsuite/ld-scripts/provide-5-map.d
@@ -1,6 +1,6 @@
 #...
 Linker script and memory map
 #...
-                0x0+10                foo = 0x10
-                \[!provide\]                        PROVIDE \(foo, bar\)
+                0x0+10 +foo = 0x10
+                \[!provide\] +PROVIDE \(foo, bar\)
 #...