* ld-cris/expdyn1.s (expobj): Set size here, at definition...

	* ld-cris/pv32.s: ...not here.
	* ld-cris/expdyn1.d, ld-cris/libdso-12.d, ld-cris/locref1.d:
	Adjust for expobj size being set at definition.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 53a6fd8..af1cc5f 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2005-08-11  Hans-Peter Nilsson  <hp@axis.com>
 
+       * ld-cris/expdyn1.s (expobj): Set size here, at definition...
+       * ld-cris/pv32.s: ...not here.
+       * ld-cris/expdyn1.d, ld-cris/libdso-12.d, ld-cris/locref1.d:
+       Adjust for expobj size being set at definition.
+
        * ld-cris/v32-ba-1.d: Regexpize to adjust for symbol change.
 
 2005-08-08  Richard Earnshaw  <richard.earnshaw@arm.com>

diff --git a/ld/testsuite/ld-cris/expdyn1.d b/ld/testsuite/ld-cris/expdyn1.d
index a1fae23..51d875d 100644 (file)
--- a/ld/testsuite/ld-cris/expdyn1.d
+++ b/ld/testsuite/ld-cris/expdyn1.d
@@ -9,6 +9,6 @@
 
 DYNAMIC SYMBOL TABLE:
 #...
-00080... g    DF .text 00000002 expfn
-00082... g    DO .data 00000000 expobj
+00080... g    DF .text 0+2 expfn
+00082... g    DO .data 0+4 expobj
 #pass

diff --git a/ld/testsuite/ld-cris/expdyn1.s b/ld/testsuite/ld-cris/expdyn1.s
index 100cef4..646be85 100644 (file)
--- a/ld/testsuite/ld-cris/expdyn1.s
+++ b/ld/testsuite/ld-cris/expdyn1.s
@@ -1,6 +1,7 @@
        .data
        .global expobj
        .type   expobj,@object
+       .size   expobj,4
 expobj:
        .dword 0
 

diff --git a/ld/testsuite/ld-cris/libdso-12.d b/ld/testsuite/ld-cris/libdso-12.d
index 2266f67..42d7fd5 100644 (file)
--- a/ld/testsuite/ld-cris/libdso-12.d
+++ b/ld/testsuite/ld-cris/libdso-12.d
@@ -14,7 +14,7 @@ DYNAMIC SYMBOL TABLE:
 #...
 0+26e g    DF \.text   0+12 dsofn4
 0+264 g    DF \.text   0+2 expfn
-0+232c g    DO \.data  0+ expobj
+0+232c g    DO \.data  0+4 expobj
 #...
 0+266 g    DF \.text   0+8 dsofn3
 #...

diff --git a/ld/testsuite/ld-cris/locref1.d b/ld/testsuite/ld-cris/locref1.d
index 0411553..c3e60a1 100644 (file)
--- a/ld/testsuite/ld-cris/locref1.d
+++ b/ld/testsuite/ld-cris/locref1.d
@@ -12,7 +12,7 @@
 SYMBOL TABLE:
 #...
 0+80076 g     F \.text 0+2 expfn
-0+82090 g     O \.data 0+ expobj
+0+82090 g     O \.data 0+4 expobj
 #...
 0+82084 g     O \.got  0+ \.hidden _GLOBAL_OFFSET_TABLE_
 #...

diff --git a/ld/testsuite/ld-cris/pv32.s b/ld/testsuite/ld-cris/pv32.s
index d08adef..d5ef7c6 100644 (file)
--- a/ld/testsuite/ld-cris/pv32.s
+++ b/ld/testsuite/ld-cris/pv32.s
@@ -14,8 +14,6 @@ pfn:
 .Lfe1:
        .size   pfn,.Lfe1-pfn
 
-       .global expobj
-       .size   expobj,4
        .global dsofn
        .type   dsofn,@function
 dsofn: