* ld-cris/start1.s: Prepend register name with $.

	* ld-cris/dso-1.s, ld-cris/libdso-1.d, ld-cris/libdso-11.d,
	ld-cris/libdso-2.d, ld-cris/pv32.s, ld-cris/undef1.d: Correct
	.size expressions and adjust expected output accordingly.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index c67a655..bd920b1 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-25  Hans-Peter Nilsson  <hp@axis.com>
+
+       * ld-cris/start1.s: Prepend register name with $.
+
+       * ld-cris/dso-1.s, ld-cris/libdso-1.d, ld-cris/libdso-11.d,
+       ld-cris/libdso-2.d, ld-cris/pv32.s, ld-cris/undef1.d: Correct
+       .size expressions and adjust expected output accordingly.
+
 2008-11-23  Hans-Peter Nilsson  <hp@axis.com>
 
        * ld-cris/badgotr1.d: Robustify regexp.

diff --git a/ld/testsuite/ld-cris/dso-1.s b/ld/testsuite/ld-cris/dso-1.s
index 6c621b5..7cf9950 100644 (file)
--- a/ld/testsuite/ld-cris/dso-1.s
+++ b/ld/testsuite/ld-cris/dso-1.s
@@ -4,5 +4,5 @@
        .p2align 1
 dsofn:
        nop
-.Lfe:
+.Lfe1:
        .size   dsofn,.Lfe1-dsofn

diff --git a/ld/testsuite/ld-cris/libdso-1.d b/ld/testsuite/ld-cris/libdso-1.d
index dec0ccd..aa41d4f 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-1.d
+++ b/ld/testsuite/ld-cris/libdso-1.d
@@ -9,5 +9,5 @@
 
 DYNAMIC SYMBOL TABLE:
 #...
-00000[12].[02468ace] g    DF .text     00000000 dsofn
+00000[12].[02468ace] g    DF .text     0+2 dsofn
 #pass

diff --git a/ld/testsuite/ld-cris/libdso-11.d b/ld/testsuite/ld-cris/libdso-11.d
index 754edff..dc7b75a 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-11.d
+++ b/ld/testsuite/ld-cris/libdso-11.d
@@ -10,7 +10,7 @@ DYNAMIC SYMBOL TABLE:
 #...
 0+1a0 g    DF \.text   0+8 dsofn3
 #...
-0+19c g    DF \.text   0+ dsofn
+0+19c g    DF \.text   0+2 dsofn
 #...
 Contents of section \.rela\.plt:
  015c 2c220000 0b060000 00000000           .*

diff --git a/ld/testsuite/ld-cris/libdso-2.d b/ld/testsuite/ld-cris/libdso-2.d
index 1417745..92a1784 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-2.d
+++ b/ld/testsuite/ld-cris/libdso-2.d
@@ -53,6 +53,6 @@ Symbol table '\.symtab' contains 18 entries:
     12: 0+2..[046c]     0 NOTYPE  LOCAL  DEFAULT  ABS _edata
     13: 0+2..[046c]     0 OBJECT  LOCAL  HIDDEN  ABS _GLOBAL_OFFSET_TABLE_
     14: 0+2..[046c]     0 NOTYPE  LOCAL  DEFAULT  ABS _end
-    15: 0+150     0 FUNC    LOCAL  DEFAULT    7 dsofn
+    15: 0+150     2 FUNC    LOCAL  DEFAULT    7 dsofn
     16: 0+     0 OBJECT  GLOBAL DEFAULT  ABS TST1
     17: 0+154     0 FUNC    GLOBAL DEFAULT    7 export_1

diff --git a/ld/testsuite/ld-cris/pv32.s b/ld/testsuite/ld-cris/pv32.s
index d5ef7c6..7606266 100644 (file)
--- a/ld/testsuite/ld-cris/pv32.s
+++ b/ld/testsuite/ld-cris/pv32.s
@@ -3,7 +3,7 @@
 here:
        nop
 .Lfe3:
-       .size   here,.Lfe3-dsofn
+       .size   here,.Lfe3-here
 
        .type   pfn,@function
 pfn:

diff --git a/ld/testsuite/ld-cris/start1.s b/ld/testsuite/ld-cris/start1.s
index ef09d37..2f19811 100644 (file)
--- a/ld/testsuite/ld-cris/start1.s
+++ b/ld/testsuite/ld-cris/start1.s
@@ -1,5 +1,5 @@
  .global _start
 _start:
 ; This must be compilable with --march=common_v10_v32.
- moveq 1,r11
+ moveq 1,$r11
 

diff --git a/ld/testsuite/ld-cris/undef1.d b/ld/testsuite/ld-cris/undef1.d
index 70d007e..cec00cb 100644 (file)
--- a/ld/testsuite/ld-cris/undef1.d
+++ b/ld/testsuite/ld-cris/undef1.d
@@ -9,5 +9,5 @@
 # symbol; no --export-dynamic is supposed to be needed.
 
 #...
-[0-9a-f]+ g    DF .text        00000000 dsofn
+[0-9a-f]+ g    DF .text        0+2 dsofn
 #pass