Re: [PATCH] Fix ld-scripts/sane1 for mingw32

[Joe Seymour <jseymour at codesourcery dot com>]

On 10/05/12 02:32, Alan Modra wrote:
> On Thu, Oct 04, 2012 at 10:07:14PM +0100, Joe Seymour wrote:
>> 	* ld-scripts/sane1.d: Sort output from nm.
> 
> Not OK.  This breaks pe targets, which add a bunch of symbols like
> __file_alignment__.
> 

I'd missed that, sorry. This revised version adds #... lines between each line
of output, allowing for other random symbols but still checking the expected
symbols are present at the correct address. Any better?

Checked with the following configurations:

host: i686-pc-linux-gnu target: i686-mingw32
host: i686-pc-linux-gnu target: i686-elf (yes a little weird)
host: i686-mingw32 target: i686-elf

Thanks,

2012-10-05  Joe Seymour  <jseymour@codesourcery.com>

	* ld-scripts/sane1.d: Sort output from nm. Allow for other symbols in
	output.

diff --git a/ld/testsuite/ld-scripts/sane1.d b/ld/testsuite/ld-scripts/sane1.d
index 26abaf3..d11a210 100644
--- a/ld/testsuite/ld-scripts/sane1.d
+++ b/ld/testsuite/ld-scripts/sane1.d
@@ -1,33 +1,58 @@
 # source: data.s
 # ld: -T sane1.t
-# nm: -B
+# nm: -B -n
 # notarget: mmix-* pdp11-* rs6000-*-aix* tic30-*-aout
 # mmix symbol sections are wrong, pdp sign extends 16-bit addresses
 # rs6000-aix and tic30 don't like empty .text

 #...
-0+8004 D d1
-0+8024 D d2
+0+0004 A s5
+#...
+0+0004 A x5
+#...
 0+0020 A diff
-0+0100 A e1
+#...
+0+0020 A sum_neg
+#...
+0+0028 A sum
+#...
 0+0080 A e2
-0+8000 A e3
+#...
 0+0090 A prod
-0+8002 D s1
+#...
+0+0100 A e1
+#...
+0+19a0 A s6
+#...
+0+19a0 A x6
+#...
+0+8000 A e3
+#...
 0+8001 D s2
-0+8007 D s3
+#...
+0+8001 D x2
+#...
+0+8002 D s1
+#...
 0+8002 A s4
-0+0004 A s5
-0+19a0 A s6
-0+8020 D s_diff
-0+8090 D s_prod
-0+8028 D s_sum
-0+8020 D s_sum_neg
-0+0028 A sum
-0+0020 A sum_neg
+#...
 0+8002 D x1
-0+8001 D x2
-0+8007 D x3
+#...
 0+8002 A x4
-0+0004 A x5
-0+19a0 A x6
+#...
+0+8004 D d1
+#...
+0+8007 D s3
+#...
+0+8007 D x3
+#...
+0+8020 D s_diff
+#...
+0+8020 D s_sum_neg
+#...
+0+8024 D d2
+#...
+0+8028 D s_sum
+#...
+0+8090 D s_prod
+#...