* ld-cris/libdso-10.d: Adjust for elf.sc .bss change.

	* ld-cris/libdso-2.d: Likewise.
	* ld-mmix/loc6.d: Likewise.

4 files changed, 21 insertions, 20 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 00c68af..e167642 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2005-06-10  Alan Modra  <amodra@bigpond.net.au>
 
+	* ld-cris/libdso-10.d: Adjust for elf.sc .bss change.
+	* ld-cris/libdso-2.d: Likewise.
+	* ld-mmix/loc6.d: Likewise.
+
+2005-06-10  Alan Modra  <amodra@bigpond.net.au>
+
 	* ld-scripts/empty-aligned.t: Adjust alignment expressions so
 	that no .text? section is kept.  Also check setting vma and
 	lma.
diff --git a/ld/testsuite/ld-cris/libdso-10.d b/ld/testsuite/ld-cris/libdso-10.d
index 3fe6ddb..5bd9439 100644
--- a/ld/testsuite/ld-cris/libdso-10.d
+++ b/ld/testsuite/ld-cris/libdso-10.d
@@ -11,7 +11,7 @@ Program Header:
     LOAD off    0x0+ vaddr 0x0+ paddr 0x0+ align 2\*\*13
          filesz 0x0+188 memsz 0x0+188 flags r-x
     LOAD off    0x0+188 vaddr 0x0+2188 paddr 0x0+2188 align 2\*\*13
-         filesz 0x0+64 memsz 0x0+78 flags rw-
+         filesz 0x0+64 memsz 0x0+64 flags rw-
  DYNAMIC off    0x0+188 vaddr 0x0+2188 paddr 0x0+2188 align 2\*\*2
          filesz 0x0+58 memsz 0x0+58 flags rw-
 Dynamic Section:
@@ -35,5 +35,3 @@ Idx Name          Size      VMA       LMA       File off  Algn
                   CONTENTS, ALLOC, LOAD, DATA
   5 \.got          0+c  0+21e0  0+21e0  0+1e0  2\*\*2
                   CONTENTS, ALLOC, LOAD, DATA
-  6 \.bss          0+14  0+21ec  0+21ec  0+1ec  2\*\*0
-                  ALLOC
diff --git a/ld/testsuite/ld-cris/libdso-2.d b/ld/testsuite/ld-cris/libdso-2.d
index 10bfe28..42852e7 100644
--- a/ld/testsuite/ld-cris/libdso-2.d
+++ b/ld/testsuite/ld-cris/libdso-2.d
@@ -10,7 +10,7 @@
 # entries.  This formerly SEGV:ed because .rela.got was created
 # too late to have it mapped to an output section.
 
-There are 14 section headers.*
+There are 13 section headers.*
 #...
   \[ 1\] \.hash             HASH     .*
   \[ 2\] \.dynsym           DYNSYM   .*
@@ -21,10 +21,9 @@ There are 14 section headers.*
   \[ 7\] \.text             PROGBITS .*
   \[ 8\] \.dynamic          DYNAMIC  .*
   \[ 9\] \.got              PROGBITS .*
-  \[10\] \.bss              NOBITS   .*
-  \[11\] \.shstrtab         STRTAB   .*
-  \[12\] \.symtab           SYMTAB   .*
-  \[13\] \.strtab           STRTAB   .*
+  \[10\] \.shstrtab         STRTAB   .*
+  \[11\] \.symtab           SYMTAB   .*
+  \[12\] \.strtab           STRTAB   .*
 #...
 Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
 #...
@@ -35,11 +34,11 @@ Symbol table '\.dynsym' contains 6 entries:
      0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: [0-9a-f]+     0 SECTION LOCAL  DEFAULT    7 
      2: [0-9a-f]+     0 NOTYPE  LOCAL  DEFAULT  UND 
-     3: [0-9a-f]+     0 SECTION LOCAL  DEFAULT   10 
+     3: [0-9a-f]+     0 NOTYPE  LOCAL  DEFAULT  UND 
      4: 0+     0 OBJECT  GLOBAL DEFAULT  ABS TST1
      5: 0+188     0 FUNC    GLOBAL DEFAULT    7 export_1@@TST1
 
-Symbol table '\.symtab' contains 22 entries:
+Symbol table '\.symtab' contains 21 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: [0-9a-f]+     0 SECTION LOCAL  DEFAULT    1 
@@ -54,12 +53,11 @@ Symbol table '\.symtab' contains 22 entries:
     10: [0-9a-f]+     0 SECTION LOCAL  DEFAULT   10 
     11: [0-9a-f]+     0 SECTION LOCAL  DEFAULT   11 
     12: [0-9a-f]+     0 SECTION LOCAL  DEFAULT   12 
-    13: [0-9a-f]+     0 SECTION LOCAL  DEFAULT   13 
-    14: 0+2198     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
-    15: 0+2230     0 NOTYPE  LOCAL  DEFAULT  ABS __bss_start
-    16: 0+2230     0 NOTYPE  LOCAL  DEFAULT  ABS _edata
-    17: 0+2220     0 OBJECT  LOCAL  HIDDEN  ABS _GLOBAL_OFFSET_TABLE_
-    18: 0+2240     0 NOTYPE  LOCAL  DEFAULT  ABS _end
-    19: 0+184     0 FUNC    LOCAL  DEFAULT    7 dsofn
-    20: 0+     0 OBJECT  GLOBAL DEFAULT  ABS TST1
-    21: 0+188     0 FUNC    GLOBAL DEFAULT    7 export_1
+    13: 0+2198     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
+    14: 0+2230     0 NOTYPE  LOCAL  DEFAULT  ABS __bss_start
+    15: 0+2230     0 NOTYPE  LOCAL  DEFAULT  ABS _edata
+    16: 0+2220     0 OBJECT  LOCAL  HIDDEN  ABS _GLOBAL_OFFSET_TABLE_
+    17: 0+2240     0 NOTYPE  LOCAL  DEFAULT  ABS _end
+    18: 0+184     0 FUNC    LOCAL  DEFAULT    7 dsofn
+    19: 0+     0 OBJECT  GLOBAL DEFAULT  ABS TST1
+    20: 0+188     0 FUNC    GLOBAL DEFAULT    7 export_1
diff --git a/ld/testsuite/ld-mmix/loc6.d b/ld/testsuite/ld-mmix/loc6.d
index f13fd2f..030ba6c 100644
--- a/ld/testsuite/ld-mmix/loc6.d
+++ b/ld/testsuite/ld-mmix/loc6.d
@@ -10,7 +10,6 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 2000000000000200 l    d  \.data	0+ (|\.data)
-200000000000020c l    d  \.bss	0+ (|\.bss)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
 0+ l    d  \*ABS\*	0+ (|\.strtab)