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

	output.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 193c6ee29bb4fcfd98c5ac9a10e4ae5efd211200..8e829615fec9ebcbfd0262c8bdf68730df4faa52 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-08  Joe Seymour  <jseymour@codesourcery.com>
+
+       * ld-scripts/sane1.d: Sort output from nm. Allow for other symbols in
+       output.
+
 2012-09-19  Chris Schlumberger-Socha  <chris.schlumberger-socha@arm.com>
 
        * ld-aarch64/emit-relocs-309-low.d: Replace symbol with regexp.

diff --git a/ld/testsuite/ld-scripts/sane1.d b/ld/testsuite/ld-scripts/sane1.d
index 26abaf3af8b38f3e9a85f21163f095f9691f4a33..d11a2103ee59529b2f7dcd2a3c6d6f06f13d119e 100644 (file)
--- 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
+#...