2005-03-20 H.J. Lu <hongjiu.lu@intel.com>

	* ld-mmix/bpo-1.d: Updated for empty section removal.
	* ld-mmix/bpo-10.d: Likewise.
	* ld-mmix/bpo-11.d: Likewise.
	* ld-mmix/bpo-14.d: Likewise.
	* ld-mmix/bpo-16.d: Likewise.
	* ld-mmix/bpo-17.d: Likewise.
	* ld-mmix/bpo-18.d: Likewise.
	* ld-mmix/bpo-19.d: Likewise.
	* ld-mmix/bpo-2.d: Likewise.
	* ld-mmix/bpo-3.d: Likewise.
	* ld-mmix/bpo-4.d: Likewise.
	* ld-mmix/bpo-5.d: Likewise.
	* ld-mmix/bpo-6.d: Likewise.
	* ld-mmix/bpo-9.d: Likewise.
	* ld-mmix/bspec1.d: Likewise.
	* ld-mmix/bspec2.d: Likewise.
	* ld-mmix/greg-1.d: Likewise.
	* ld-mmix/greg-19.d: Likewise.
	* ld-mmix/greg-2.d: Likewise.
	* ld-mmix/greg-3.d: Likewise.
	* ld-mmix/greg-4.d: Likewise.
	* ld-mmix/greg-5.d: Likewise.
	* ld-mmix/greg-5s.d: Likewise.
	* ld-mmix/greg-6.d: Likewise.
	* ld-mmix/greg-7.d: Likewise.
	* ld-mmix/loc1.d: Likewise.
	* ld-mmix/loc2.d: Likewise.
	* ld-mmix/loc3.d: Likewise.
	* ld-mmix/loc4.d: Likewise.
	* ld-mmix/loc6.d: Likewise.
	* ld-mmix/local1.d: Likewise.
	* ld-mmix/local12.d: Likewise.
	* ld-mmix/local3.d: Likewise.
	* ld-mmix/local5.d: Likewise.
	* ld-mmix/local7.d: Likewise.
	* ld-mmix/locdo-1.d: Likewise.
	* ld-mmix/loct-1.d: Likewise.
	* ld-mmix/locto-1.d: Likewise.
	* ld-mmix/start-1.d: Likewise.
	* ld-mmix/undef-3.d: Likewise.

40 files changed, 122 insertions, 280 deletions

diff --git a/ld/testsuite/ld-mmix/bpo-1.d b/ld/testsuite/ld-mmix/bpo-1.d
index e7e0390..5b07e5f 100644
--- a/ld/testsuite/ld-mmix/bpo-1.d
+++ b/ld/testsuite/ld-mmix/bpo-1.d
@@ -10,9 +10,6 @@
 
 SYMBOL TABLE:
 0000000000000000 l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/bpo-10.d b/ld/testsuite/ld-mmix/bpo-10.d
index 3c2b7d3..66ff03f 100644
--- a/ld/testsuite/ld-mmix/bpo-10.d
+++ b/ld/testsuite/ld-mmix/bpo-10.d
@@ -12,9 +12,6 @@
 SYMBOL TABLE:
 0+ l    d  \.init	0+ (|\.init)
 0+4 l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
-0+7f8 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
 0+ l    d  \*ABS\*	0+ (|\.strtab)
diff --git a/ld/testsuite/ld-mmix/bpo-11.d b/ld/testsuite/ld-mmix/bpo-11.d
index 3e40bfb..1adeb1d 100644
--- a/ld/testsuite/ld-mmix/bpo-11.d
+++ b/ld/testsuite/ld-mmix/bpo-11.d
@@ -13,8 +13,6 @@
 SYMBOL TABLE:
 0+ l    d  \.init	0+ (|\.init)
 0+10 l    d  \.text	0+ (|\.text)
-20+ l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7e8 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/bpo-14.d b/ld/testsuite/ld-mmix/bpo-14.d
index 521fce2..e57412c 100644
--- a/ld/testsuite/ld-mmix/bpo-14.d
+++ b/ld/testsuite/ld-mmix/bpo-14.d
@@ -11,9 +11,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/bpo-16.d b/ld/testsuite/ld-mmix/bpo-16.d
index 2836401..a4022e1 100644
--- a/ld/testsuite/ld-mmix/bpo-16.d
+++ b/ld/testsuite/ld-mmix/bpo-16.d
@@ -12,9 +12,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/bpo-17.d b/ld/testsuite/ld-mmix/bpo-17.d
index f5f41a3..6c8fe34 100644
--- a/ld/testsuite/ld-mmix/bpo-17.d
+++ b/ld/testsuite/ld-mmix/bpo-17.d
@@ -11,9 +11,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/bpo-18.d b/ld/testsuite/ld-mmix/bpo-18.d
index d86a452..96fda3b 100644
--- a/ld/testsuite/ld-mmix/bpo-18.d
+++ b/ld/testsuite/ld-mmix/bpo-18.d
@@ -12,8 +12,6 @@
 SYMBOL TABLE:
 0+100 l    d  \.text	0+ (|\.text)
 4000000000001060 l    d  \.text\.away	0+ (|\.text\.away)
-400000000000106c l    d  \.data	0+ (|\.data)
-400000000000106c l    d  \.bss	0+ (|\.bss)
 0+7e0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/bpo-19.d b/ld/testsuite/ld-mmix/bpo-19.d
index b75be29..b8f131d 100644
--- a/ld/testsuite/ld-mmix/bpo-19.d
+++ b/ld/testsuite/ld-mmix/bpo-19.d
@@ -11,9 +11,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+100 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/bpo-2.d b/ld/testsuite/ld-mmix/bpo-2.d
index 350da41..4781175 100644
--- a/ld/testsuite/ld-mmix/bpo-2.d
+++ b/ld/testsuite/ld-mmix/bpo-2.d
@@ -11,9 +11,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7e8 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/bpo-3.d b/ld/testsuite/ld-mmix/bpo-3.d
index 0b47f87..00fb7a9 100644
--- a/ld/testsuite/ld-mmix/bpo-3.d
+++ b/ld/testsuite/ld-mmix/bpo-3.d
@@ -11,9 +11,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/bpo-4.d b/ld/testsuite/ld-mmix/bpo-4.d
index 366e050..1e7c903 100644
--- a/ld/testsuite/ld-mmix/bpo-4.d
+++ b/ld/testsuite/ld-mmix/bpo-4.d
@@ -12,9 +12,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7e0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/bpo-5.d b/ld/testsuite/ld-mmix/bpo-5.d
index 75bcffa..0460028 100644
--- a/ld/testsuite/ld-mmix/bpo-5.d
+++ b/ld/testsuite/ld-mmix/bpo-5.d
@@ -12,9 +12,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7e8 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/bpo-6.d b/ld/testsuite/ld-mmix/bpo-6.d
index 7c134e6..ab94ffb 100644
--- a/ld/testsuite/ld-mmix/bpo-6.d
+++ b/ld/testsuite/ld-mmix/bpo-6.d
@@ -10,9 +10,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+100 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/bpo-9.d b/ld/testsuite/ld-mmix/bpo-9.d
index 82f3012..f230b19 100644
--- a/ld/testsuite/ld-mmix/bpo-9.d
+++ b/ld/testsuite/ld-mmix/bpo-9.d
@@ -12,8 +12,6 @@
 SYMBOL TABLE:
 0+ l    d  \.init	0+ (|\.init)
 0+10 l    d  \.text	0+ (|\.text)
-20+ l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7e8 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/bspec1.d b/ld/testsuite/ld-mmix/bspec1.d
index a9091af..ce83480 100644
--- a/ld/testsuite/ld-mmix/bspec1.d
+++ b/ld/testsuite/ld-mmix/bspec1.d
@@ -1,30 +1,24 @@
 #source: bspec1.s
 #source: start.s
 #ld: -m elf64mmix
-#readelf: -Ssr -x1 -x5
+#readelf: -Ssr -x1 -x2
 
-There are 9 section headers, starting at offset 0x100:
+There are 6 section headers, starting at offset 0xb8:
 
 Section Headers:
   \[Nr\] Name              Type             Address           Offset
        Size              EntSize          Flags  Link  Info  Align
   \[ 0\]                   NULL             0+  0+
        0+  0+           0     0     0
-  \[ 1\] \.text             PROGBITS         0+  0+b0
+  \[ 1\] \.text             PROGBITS         0+  0+78
        0+4  0+  AX       0     0     4
-  \[ 2\] \.data             PROGBITS         2000000000000000  0+b4
-       0+  0+  WA       0     0     1
-  \[ 3\] \.sbss             PROGBITS         2000000000000000  0+b4
-       0+  0+   W       0     0     1
-  \[ 4\] \.bss              NOBITS           2000000000000000  0+b4
-       0+  0+  WA       0     0     1
-  \[ 5\] \.MMIX\.spec_data\.2 PROGBITS         0+  0+b4
+  \[ 2\] \.MMIX\.spec_data\.2 PROGBITS         0+  0+7c
        0+4  0+           0     0     4
-  \[ 6\] \.shstrtab         STRTAB           0+  0+b8
-       0+44  0+           0     0     1
-  \[ 7\] \.symtab           SYMTAB           0+  0+340
-       0+168  0+18           8     9     8
-  \[ 8\] \.strtab           STRTAB           0+  0+4a8
+  \[ 3\] \.shstrtab         STRTAB           0+  0+80
+       0+33  0+           0     0     1
+  \[ 4\] \.symtab           SYMTAB           0+  0+238
+       0+120  0+18           5     6     8
+  \[ 5\] \.strtab           STRTAB           0+  0+358
        0+2d  0+           0     0     1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
@@ -33,19 +27,16 @@ Key to Flags:
 
 There are no relocations in this file\.
 
-Symbol table '\.symtab' contains 15 entries:
+Symbol table '\.symtab' contains 12 entries:
    Num:    Value          Size Type    Bind   Vis      Ndx Name
      0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: 0+     0 SECTION LOCAL  DEFAULT    1 
-     2: 2000000000000000     0 SECTION LOCAL  DEFAULT    2 
-     3: 2000000000000000     0 SECTION LOCAL  DEFAULT    3 
-     4: 2000000000000000     0 SECTION LOCAL  DEFAULT    4 
+     2: 0+     0 SECTION LOCAL  DEFAULT    2 
+     3: 0+     0 SECTION LOCAL  DEFAULT    3 
+     4: 0+     0 SECTION LOCAL  DEFAULT    4 
      5: 0+     0 SECTION LOCAL  DEFAULT    5 
-     6: 0+     0 SECTION LOCAL  DEFAULT    6 
-     7: 0+     0 SECTION LOCAL  DEFAULT    7 
-     8: 0+     0 SECTION LOCAL  DEFAULT    8 
-     9: 0+     0 FUNC    GLOBAL DEFAULT    1 Main
-    10: 0+     0 NOTYPE  GLOBAL DEFAULT    1 _start
+     6: 0+     0 FUNC    GLOBAL DEFAULT    1 Main
+     7: 0+     0 NOTYPE  GLOBAL DEFAULT    1 _start
 #...
 
 Hex dump of section '\.text':
diff --git a/ld/testsuite/ld-mmix/bspec2.d b/ld/testsuite/ld-mmix/bspec2.d
index aa1d753..b5e683b 100644
--- a/ld/testsuite/ld-mmix/bspec2.d
+++ b/ld/testsuite/ld-mmix/bspec2.d
@@ -4,32 +4,26 @@
 #source: start.s
 #source: ext1.s
 #ld: -m elf64mmix
-#readelf: -Ssr -x1 -x5 -x6
+#readelf: -Ssr -x1 -x2 -x3
 
-There are 10 section headers, starting at offset 0x118:
+There are 7 section headers, starting at offset 0xd0:
 
 Section Headers:
   \[Nr\] Name              Type             Address           Offset
        Size              EntSize          Flags  Link  Info  Align
   \[ 0\]                   NULL             0+  0+
        0+  0+           0     0     0
-  \[ 1\] \.text             PROGBITS         0+  0+b0
+  \[ 1\] \.text             PROGBITS         0+  0+78
        0+4  0+  AX       0     0     4
-  \[ 2\] \.data             PROGBITS         2000000000000000  0+b4
-       0+  0+  WA       0     0     1
-  \[ 3\] \.sbss             PROGBITS         2000000000000000  0+b4
-       0+  0+   W       0     0     1
-  \[ 4\] \.bss              NOBITS           2000000000000000  0+b4
-       0+  0+  WA       0     0     1
-  \[ 5\] \.MMIX\.spec_data\.2 PROGBITS         0+  0+b4
+  \[ 2\] \.MMIX\.spec_data\.2 PROGBITS         0+  0+7c
        0+8  0+           0     0     4
-  \[ 6\] \.MMIX\.spec_data\.3 PROGBITS         0+  0+bc
+  \[ 3\] \.MMIX\.spec_data\.3 PROGBITS         0+  0+84
        0+4  0+           0     0     4
-  \[ 7\] \.shstrtab         STRTAB           0+  0+c0
-       0+56  0+           0     0     1
-  \[ 8\] \.symtab           SYMTAB           0+  0+398
-       0+198  0+18           9    10     8
-  \[ 9\] \.strtab           STRTAB           0+  0+530
+  \[ 4\] \.shstrtab         STRTAB           0+  0+88
+       0+45  0+           0     0     1
+  \[ 5\] \.symtab           SYMTAB           0+  0+290
+       0+150  0+18           6     7     8
+  \[ 6\] \.strtab           STRTAB           0+  0+3e0
        0+32  0+           0     0     1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
@@ -38,21 +32,18 @@ Key to Flags:
 
 There are no relocations in this file\.
 
-Symbol table '\.symtab' contains 17 entries:
+Symbol table '\.symtab' contains 14 entries:
    Num:    Value          Size Type    Bind   Vis      Ndx Name
      0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: 0+     0 SECTION LOCAL  DEFAULT    1 
-     2: 2000000000000000     0 SECTION LOCAL  DEFAULT    2 
-     3: 2000000000000000     0 SECTION LOCAL  DEFAULT    3 
-     4: 2000000000000000     0 SECTION LOCAL  DEFAULT    4 
+     2: 0+     0 SECTION LOCAL  DEFAULT    2 
+     3: 0+     0 SECTION LOCAL  DEFAULT    3 
+     4: 0+     0 SECTION LOCAL  DEFAULT    4 
      5: 0+     0 SECTION LOCAL  DEFAULT    5 
      6: 0+     0 SECTION LOCAL  DEFAULT    6 
-     7: 0+     0 SECTION LOCAL  DEFAULT    7 
-     8: 0+     0 SECTION LOCAL  DEFAULT    8 
-     9: 0+     0 SECTION LOCAL  DEFAULT    9 
-    10: 0+     0 FUNC    GLOBAL DEFAULT    1 Main
-    11: 0+fc     0 NOTYPE  GLOBAL DEFAULT  ABS ext1
-    12: 0+     0 NOTYPE  GLOBAL DEFAULT    1 _start
+     7: 0+     0 FUNC    GLOBAL DEFAULT    1 Main
+     8: 0+fc     0 NOTYPE  GLOBAL DEFAULT  ABS ext1
+     9: 0+     0 NOTYPE  GLOBAL DEFAULT    1 _start
 #...
 
 Hex dump of section '\.text':
diff --git a/ld/testsuite/ld-mmix/greg-1.d b/ld/testsuite/ld-mmix/greg-1.d
index 1dcdf2b..b5a42ca 100644
--- a/ld/testsuite/ld-mmix/greg-1.d
+++ b/ld/testsuite/ld-mmix/greg-1.d
@@ -11,9 +11,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/greg-19.d b/ld/testsuite/ld-mmix/greg-19.d
index fcabfd2..b4a9025 100644
--- a/ld/testsuite/ld-mmix/greg-19.d
+++ b/ld/testsuite/ld-mmix/greg-19.d
@@ -8,9 +8,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/greg-2.d b/ld/testsuite/ld-mmix/greg-2.d
index f2a725a..baf3647 100644
--- a/ld/testsuite/ld-mmix/greg-2.d
+++ b/ld/testsuite/ld-mmix/greg-2.d
@@ -15,9 +15,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7e0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/greg-3.d b/ld/testsuite/ld-mmix/greg-3.d
index 10c78b7..0e55087 100644
--- a/ld/testsuite/ld-mmix/greg-3.d
+++ b/ld/testsuite/ld-mmix/greg-3.d
@@ -15,9 +15,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/greg-4.d b/ld/testsuite/ld-mmix/greg-4.d
index db9b288..67715ed 100644
--- a/ld/testsuite/ld-mmix/greg-4.d
+++ b/ld/testsuite/ld-mmix/greg-4.d
@@ -12,9 +12,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/greg-5.d b/ld/testsuite/ld-mmix/greg-5.d
index a0412dc..81f4fa5 100644
--- a/ld/testsuite/ld-mmix/greg-5.d
+++ b/ld/testsuite/ld-mmix/greg-5.d
@@ -12,9 +12,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/greg-5s.d b/ld/testsuite/ld-mmix/greg-5s.d
index feea430..30d3b04 100644
--- a/ld/testsuite/ld-mmix/greg-5s.d
+++ b/ld/testsuite/ld-mmix/greg-5s.d
@@ -11,9 +11,6 @@
 .*:     file format elf64-mmix
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/greg-6.d b/ld/testsuite/ld-mmix/greg-6.d
index e841cf3..2cf163e 100644
--- a/ld/testsuite/ld-mmix/greg-6.d
+++ b/ld/testsuite/ld-mmix/greg-6.d
@@ -40,9 +40,6 @@
 
 SYMBOL TABLE:
 0+0 l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+100 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/greg-7.d b/ld/testsuite/ld-mmix/greg-7.d
index c553032..13d0aa2 100644
--- a/ld/testsuite/ld-mmix/greg-7.d
+++ b/ld/testsuite/ld-mmix/greg-7.d
@@ -40,9 +40,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+100 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/loc1.d b/ld/testsuite/ld-mmix/loc1.d
index a34618a..7ecf491 100644
--- a/ld/testsuite/ld-mmix/loc1.d
+++ b/ld/testsuite/ld-mmix/loc1.d
@@ -8,9 +8,6 @@
 
 SYMBOL TABLE:
 0+1000 l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
 0+ l    d  \*ABS\*	0+ (|\.strtab)
diff --git a/ld/testsuite/ld-mmix/loc2.d b/ld/testsuite/ld-mmix/loc2.d
index 234bddb..c4e8cc9 100644
--- a/ld/testsuite/ld-mmix/loc2.d
+++ b/ld/testsuite/ld-mmix/loc2.d
@@ -9,9 +9,6 @@
 
 SYMBOL TABLE:
 0+1000 l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
 0+ l    d  \*ABS\*	0+ (|\.strtab)
diff --git a/ld/testsuite/ld-mmix/loc3.d b/ld/testsuite/ld-mmix/loc3.d
index 4dcdd80..7969d00 100644
--- a/ld/testsuite/ld-mmix/loc3.d
+++ b/ld/testsuite/ld-mmix/loc3.d
@@ -9,9 +9,6 @@
 
 SYMBOL TABLE:
 0+1000 l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
 0+ l    d  \*ABS\*	0+ (|\.strtab)
diff --git a/ld/testsuite/ld-mmix/loc4.d b/ld/testsuite/ld-mmix/loc4.d
index 0c09e6d..15333de 100644
--- a/ld/testsuite/ld-mmix/loc4.d
+++ b/ld/testsuite/ld-mmix/loc4.d
@@ -11,8 +11,6 @@
 SYMBOL TABLE:
 0+1000 l    d  \.text	0+ (|\.text)
 2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000008 l    d  \.sbss	0+ (|\.sbss)
-2000000000000008 l    d  \.bss	0+ (|\.bss)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
 0+ l    d  \*ABS\*	0+ (|\.strtab)
diff --git a/ld/testsuite/ld-mmix/loc6.d b/ld/testsuite/ld-mmix/loc6.d
index 7c0f76b..f13fd2f 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  \.sbss	0+ (|\.sbss)
 200000000000020c l    d  \.bss	0+ (|\.bss)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
diff --git a/ld/testsuite/ld-mmix/local1.d b/ld/testsuite/ld-mmix/local1.d
index 30b41b4..3e8ecaa 100644
--- a/ld/testsuite/ld-mmix/local1.d
+++ b/ld/testsuite/ld-mmix/local1.d
@@ -4,55 +4,46 @@
 #source: regext1.s
 #source: start.s
 #ld: -m elf64mmix
-#readelf: -Ssx1 -x5
+#readelf: -Ssx1 -x2
 
 # We check that the externally visible symbol ext1 is a local register
 # (different meaning of "local" than for symbol), which can be seen as
 # somewhat twisted.
 
-There are 9 section headers, starting at offset 0x110:
+There are 6 section headers, starting at offset 0xc8:
 
 Section Headers:
   \[Nr\] Name              Type             Address           Offset
        Size              EntSize          Flags  Link  Info  Align
   \[ 0\]                   NULL             0+  0+
        0+  0+           0     0     0
-  \[ 1\] \.text             PROGBITS         0+  0+b0
+  \[ 1\] \.text             PROGBITS         0+  0+78
        0+8  0+  AX       0     0     4
-  \[ 2\] \.data             PROGBITS         2000000000000000  0+b8
-       0+  0+  WA       0     0     1
-  \[ 3\] \.sbss             PROGBITS         2000000000000000  0+b8
-       0+  0+   W       0     0     1
-  \[ 4\] \.bss              NOBITS           2000000000000000  0+b8
-       0+  0+  WA       0     0     1
-  \[ 5\] \.MMIX\.reg_content PROGBITS         0+7e8  0+b8
+  \[ 2\] \.MMIX\.reg_content PROGBITS         0+7e8  0+80
        0+10  0+   W       0     0     1
-  \[ 6\] \.shstrtab         STRTAB           0+  0+c8
-       0+45  0+           0     0     1
-  \[ 7\] \.symtab           SYMTAB           0+  0+350
-       0+198  0+18           8    11     8
-  \[ 8\] \.strtab           STRTAB           0+  0+4e8
+  \[ 3\] \.shstrtab         STRTAB           0+  0+90
+       0+34  0+           0     0     1
+  \[ 4\] \.symtab           SYMTAB           0+  0+248
+       0+150  0+18           5     8     8
+  \[ 5\] \.strtab           STRTAB           0+  0+398
        0+32  0+           0     0     1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), x \(unknown\)
   O \(extra OS processing required\) o \(OS specific\), p \(processor specific\)
 
-Symbol table '\.symtab' contains 17 entries:
+Symbol table '\.symtab' contains 14 entries:
    Num:    Value          Size Type    Bind   Vis      Ndx Name
      0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: 0+     0 SECTION LOCAL  DEFAULT    1 
-     2: 20+     0 SECTION LOCAL  DEFAULT    2 
-     3: 2000000000000000     0 SECTION LOCAL  DEFAULT    3 
-     4: 2000000000000000     0 SECTION LOCAL  DEFAULT    4 
-     5: 0+7e8     0 SECTION LOCAL  DEFAULT    5 
-     6: 0+     0 SECTION LOCAL  DEFAULT    6 
-     7: 0+     0 SECTION LOCAL  DEFAULT    7 
-     8: 0+     0 SECTION LOCAL  DEFAULT    8 
-     9: 0+fd     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
-    10: 0+fe     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
-    11: 0+fc     0 NOTYPE  GLOBAL DEFAULT PRC\[0xff00\] ext1
-    12: 0+4     0 NOTYPE  GLOBAL DEFAULT    1 _start
+     2: 0+7e8     0 SECTION LOCAL  DEFAULT    2 
+     3: 0+     0 SECTION LOCAL  DEFAULT    3 
+     4: 0+     0 SECTION LOCAL  DEFAULT    4 
+     5: 0+     0 SECTION LOCAL  DEFAULT    5 
+     6: 0+fd     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
+     7: 0+fe     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
+     8: 0+fc     0 NOTYPE  GLOBAL DEFAULT PRC\[0xff00\] ext1
+     9: 0+4     0 NOTYPE  GLOBAL DEFAULT    1 _start
 #...
 
 Hex dump of section '\.text':
diff --git a/ld/testsuite/ld-mmix/local12.d b/ld/testsuite/ld-mmix/local12.d
index db0c838..2dd1eb4 100644
--- a/ld/testsuite/ld-mmix/local12.d
+++ b/ld/testsuite/ld-mmix/local12.d
@@ -10,13 +10,7 @@
 
 Sections:
 Idx Name          Size      VMA               LMA               File off  Algn
-  0 \.text         0+8  0+  0+  0+b0  2\*\*2
+  0 \.text         0+8  0+  0+  0+78  2\*\*2
                   CONTENTS, ALLOC, LOAD, READONLY, CODE
-  1 \.data         0+  2000000000000000  [0-9]+  0+b8  2\*\*0
-                  CONTENTS, ALLOC, LOAD, DATA
-  2 \.sbss         0+  2000000000000000  [0-9]+  0+b8  2\*\*0
-                  CONTENTS
-  3 \.bss          0+  2000000000000000  [0-9]+  0+b8  2\*\*0
-                  ALLOC
 Contents of section \.text:
  0000 fd030201 e3fd0001                    .*
diff --git a/ld/testsuite/ld-mmix/local3.d b/ld/testsuite/ld-mmix/local3.d
index 46bd313..db54591 100644
--- a/ld/testsuite/ld-mmix/local3.d
+++ b/ld/testsuite/ld-mmix/local3.d
@@ -4,53 +4,44 @@
 #source: ext1.s
 #source: start.s
 #ld: -m elf64mmix
-#readelf:  -Ssx1 -x5
+#readelf:  -Ssx1 -x2
 
 # Like local1, but ext1 is here a constant, not a global register.
 
-There are 9 section headers, starting at offset 0x110:
+There are 6 section headers, starting at offset 0xc8:
 
 Section Headers:
   \[Nr\] Name              Type             Address           Offset
        Size              EntSize          Flags  Link  Info  Align
   \[ 0\]                   NULL             0+  0+
        0+  0+           0     0     0
-  \[ 1\] \.text             PROGBITS         0+  0+b0
+  \[ 1\] \.text             PROGBITS         0+  0+78
        0+8  0+  AX       0     0     4
-  \[ 2\] \.data             PROGBITS         2000000000000000  0+b8
-       0+  0+  WA       0     0     1
-  \[ 3\] \.sbss             PROGBITS         2000000000000000  0+b8
-       0+  0+   W       0     0     1
-  \[ 4\] \.bss              NOBITS           2000000000000000  0+b8
-       0+  0+  WA       0     0     1
-  \[ 5\] \.MMIX\.reg_content PROGBITS         0+7e8  0+b8
+  \[ 2\] \.MMIX\.reg_content PROGBITS         0+7e8  0+80
        0+10  0+   W       0     0     1
-  \[ 6\] \.shstrtab         STRTAB           0+  0+c8
-       0+45  0+           0     0     1
-  \[ 7\] \.symtab           SYMTAB           0+  0+350
-       0+198  0+18           8    11     8
-  \[ 8\] \.strtab           STRTAB           0+  0+4e8
+  \[ 3\] \.shstrtab         STRTAB           0+  0+90
+       0+34  0+           0     0     1
+  \[ 4\] \.symtab           SYMTAB           0+  0+248
+       0+150  0+18           5     8     8
+  \[ 5\] \.strtab           STRTAB           0+  0+398
        0+32  0+           0     0     1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), x \(unknown\)
   O \(extra OS processing required\) o \(OS specific\), p \(processor specific\)
 
-Symbol table '\.symtab' contains 17 entries:
+Symbol table '\.symtab' contains 14 entries:
    Num:    Value          Size Type    Bind   Vis      Ndx Name
      0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: 0+     0 SECTION LOCAL  DEFAULT    1 
-     2: 2000000000000000     0 SECTION LOCAL  DEFAULT    2 
-     3: 2000000000000000     0 SECTION LOCAL  DEFAULT    3 
-     4: 2000000000000000     0 SECTION LOCAL  DEFAULT    4 
-     5: 0+7e8     0 SECTION LOCAL  DEFAULT    5 
-     6: 0+     0 SECTION LOCAL  DEFAULT    6 
-     7: 0+     0 SECTION LOCAL  DEFAULT    7 
-     8: 0+     0 SECTION LOCAL  DEFAULT    8 
-     9: 0+fd     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
-    10: 0+fe     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
-    11: 0+fc     0 NOTYPE  GLOBAL DEFAULT  ABS ext1
-    12: 0+4     0 NOTYPE  GLOBAL DEFAULT    1 _start
+     2: 0+7e8     0 SECTION LOCAL  DEFAULT    2 
+     3: 0+     0 SECTION LOCAL  DEFAULT    3 
+     4: 0+     0 SECTION LOCAL  DEFAULT    4 
+     5: 0+     0 SECTION LOCAL  DEFAULT    5 
+     6: 0+fd     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
+     7: 0+fe     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
+     8: 0+fc     0 NOTYPE  GLOBAL DEFAULT  ABS ext1
+     9: 0+4     0 NOTYPE  GLOBAL DEFAULT    1 _start
 #...
 
 Hex dump of section '\.text':
diff --git a/ld/testsuite/ld-mmix/local5.d b/ld/testsuite/ld-mmix/local5.d
index 99681f4..37dc0f5 100644
--- a/ld/testsuite/ld-mmix/local5.d
+++ b/ld/testsuite/ld-mmix/local5.d
@@ -5,53 +5,44 @@
 #source: regext1.s
 #source: start.s
 #ld: -m elf64mmix
-#readelf:  -Ssx1 -x5
+#readelf:  -Ssx1 -x2
 
 # Like local1, but with two checks for a local register.
 
-There are 9 section headers, starting at offset 0x118:
+There are 6 section headers, starting at offset 0xc8:
 
 Section Headers:
   \[Nr\] Name              Type             Address           Offset
        Size              EntSize          Flags  Link  Info  Align
   \[ 0\]                   NULL             0+  0+
        0+  0+           0     0     0
-  \[ 1\] \.text             PROGBITS         0+  0+b0
+  \[ 1\] \.text             PROGBITS         0+  0+78
        0+c  0+  AX       0     0     4
-  \[ 2\] \.data             PROGBITS         2000000000000000  0+bc
-       0+  0+  WA       0     0     1
-  \[ 3\] \.sbss             PROGBITS         2000000000000000  0+bc
-       0+  0+   W       0     0     1
-  \[ 4\] \.bss              NOBITS           2000000000000000  0+bc
-       0+  0+  WA       0     0     1
-  \[ 5\] \.MMIX\.reg_content PROGBITS         0+7e8  0+bc
+  \[ 2\] \.MMIX\.reg_content PROGBITS         0+7e8  0+84
        0+10  0+   W       0     0     1
-  \[ 6\] \.shstrtab         STRTAB           0+  0+cc
-       0+45  0+           0     0     1
-  \[ 7\] \.symtab           SYMTAB           0+  0+358
-       0+198  0+18           8    11     8
-  \[ 8\] \.strtab           STRTAB           0+  0+4f0
+  \[ 3\] \.shstrtab         STRTAB           0+  0+94
+       0+34  0+           0     0     1
+  \[ 4\] \.symtab           SYMTAB           0+  0+248
+       0+150  0+18           5     8     8
+  \[ 5\] \.strtab           STRTAB           0+  0+398
        0+32  0+           0     0     1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), x \(unknown\)
   O \(extra OS processing required\) o \(OS specific\), p \(processor specific\)
 
-Symbol table '\.symtab' contains 17 entries:
+Symbol table '\.symtab' contains 14 entries:
    Num:    Value          Size Type    Bind   Vis      Ndx Name
      0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: 0+     0 SECTION LOCAL  DEFAULT    1 
-     2: 2000000000000000     0 SECTION LOCAL  DEFAULT    2 
-     3: 2000000000000000     0 SECTION LOCAL  DEFAULT    3 
-     4: 2000000000000000     0 SECTION LOCAL  DEFAULT    4 
-     5: 0+7e8     0 SECTION LOCAL  DEFAULT    5 
-     6: 0+     0 SECTION LOCAL  DEFAULT    6 
-     7: 0+     0 SECTION LOCAL  DEFAULT    7 
-     8: 0+     0 SECTION LOCAL  DEFAULT    8 
-     9: 0+fd     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
-    10: 0+fe     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
-    11: 0+fc     0 NOTYPE  GLOBAL DEFAULT PRC\[0xff00\] ext1
-    12: 0+8     0 NOTYPE  GLOBAL DEFAULT    1 _start
+     2: 0+7e8     0 SECTION LOCAL  DEFAULT    2 
+     3: 0+     0 SECTION LOCAL  DEFAULT    3 
+     4: 0+     0 SECTION LOCAL  DEFAULT    4 
+     5: 0+     0 SECTION LOCAL  DEFAULT    5 
+     6: 0+fd     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
+     7: 0+fe     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
+     8: 0+fc     0 NOTYPE  GLOBAL DEFAULT PRC\[0xff00\] ext1
+     9: 0+8     0 NOTYPE  GLOBAL DEFAULT    1 _start
 #...
 
 Hex dump of section '\.text':
diff --git a/ld/testsuite/ld-mmix/local7.d b/ld/testsuite/ld-mmix/local7.d
index 0bf9d9e..2407fcd 100644
--- a/ld/testsuite/ld-mmix/local7.d
+++ b/ld/testsuite/ld-mmix/local7.d
@@ -5,54 +5,45 @@
 #source: ext1.s
 #source: start.s
 #ld: -m elf64mmix
-#readelf:  -Ssx1 -x5
+#readelf:  -Ssx1 -x2
 
 # Like local1, but ext1 is here a constant, not a global register and two
 # local-register checks.
 
-There are 9 section headers, starting at offset 0x118:
+There are 6 section headers, starting at offset 0xc8:
 
 Section Headers:
   \[Nr\] Name              Type             Address           Offset
        Size              EntSize          Flags  Link  Info  Align
   \[ 0\]                   NULL             0+  0+
        0+  0+           0     0     0
-  \[ 1\] \.text             PROGBITS         0+  0+b0
+  \[ 1\] \.text             PROGBITS         0+  0+78
        0+c  0+  AX       0     0     4
-  \[ 2\] \.data             PROGBITS         2000000000000000  0+bc
-       0+  0+  WA       0     0     1
-  \[ 3\] \.sbss             PROGBITS         2000000000000000  0+bc
-       0+  0+   W       0     0     1
-  \[ 4\] \.bss              NOBITS           2000000000000000  0+bc
-       0+  0+  WA       0     0     1
-  \[ 5\] \.MMIX\.reg_content PROGBITS         0+7e8  0+bc
+  \[ 2\] \.MMIX\.reg_content PROGBITS         0+7e8  0+84
        0+10  0+   W       0     0     1
-  \[ 6\] \.shstrtab         STRTAB           0+  0+cc
-       0+45  0+           0     0     1
-  \[ 7\] \.symtab           SYMTAB           0+  0+358
-       0+198  0+18           8    11     8
-  \[ 8\] \.strtab           STRTAB           0+  0+4f0
+  \[ 3\] \.shstrtab         STRTAB           0+  0+94
+       0+34  0+           0     0     1
+  \[ 4\] \.symtab           SYMTAB           0+  0+248
+       0+150  0+18           5     8     8
+  \[ 5\] \.strtab           STRTAB           0+  0+398
        0+32  0+           0     0     1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), x \(unknown\)
   O \(extra OS processing required\) o \(OS specific\), p \(processor specific\)
 
-Symbol table '\.symtab' contains 17 entries:
+Symbol table '\.symtab' contains 14 entries:
    Num:    Value          Size Type    Bind   Vis      Ndx Name
      0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: 0+     0 SECTION LOCAL  DEFAULT    1 
-     2: 2000000000000000     0 SECTION LOCAL  DEFAULT    2 
-     3: 2000000000000000     0 SECTION LOCAL  DEFAULT    3 
-     4: 2000000000000000     0 SECTION LOCAL  DEFAULT    4 
-     5: 0+7e8     0 SECTION LOCAL  DEFAULT    5 
-     6: 0+     0 SECTION LOCAL  DEFAULT    6 
-     7: 0+     0 SECTION LOCAL  DEFAULT    7 
-     8: 0+     0 SECTION LOCAL  DEFAULT    8 
-     9: 0+fd     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
-    10: 0+fe     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
-    11: 0+fc     0 NOTYPE  GLOBAL DEFAULT  ABS ext1
-    12: 0+8     0 NOTYPE  GLOBAL DEFAULT    1 _start
+     2: 0+7e8     0 SECTION LOCAL  DEFAULT    2 
+     3: 0+     0 SECTION LOCAL  DEFAULT    3 
+     4: 0+     0 SECTION LOCAL  DEFAULT    4 
+     5: 0+     0 SECTION LOCAL  DEFAULT    5 
+     6: 0+fd     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
+     7: 0+fe     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
+     8: 0+fc     0 NOTYPE  GLOBAL DEFAULT  ABS ext1
+     9: 0+8     0 NOTYPE  GLOBAL DEFAULT    1 _start
 #...
 
 Hex dump of section '\.text':
diff --git a/ld/testsuite/ld-mmix/locdo-1.d b/ld/testsuite/ld-mmix/locdo-1.d
index ad7f73a..2e8409f 100644
--- a/ld/testsuite/ld-mmix/locdo-1.d
+++ b/ld/testsuite/ld-mmix/locdo-1.d
@@ -8,8 +8,6 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 2000000000000008 l    d  \.data	0+ (|\.data)
-2000000000000010 l    d  \.sbss	0+ (|\.sbss)
-2000000000000010 l    d  \.bss	0+ (|\.bss)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
 0+ l    d  \*ABS\*	0+ (|\.strtab)
diff --git a/ld/testsuite/ld-mmix/loct-1.d b/ld/testsuite/ld-mmix/loct-1.d
index 32a08a3..96b6a14 100644
--- a/ld/testsuite/ld-mmix/loct-1.d
+++ b/ld/testsuite/ld-mmix/loct-1.d
@@ -7,9 +7,6 @@
 
 SYMBOL TABLE:
 0+1004 l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
 0+ l    d  \*ABS\*	0+ (|\.strtab)
diff --git a/ld/testsuite/ld-mmix/locto-1.d b/ld/testsuite/ld-mmix/locto-1.d
index 8aa9f42..08e6652 100644
--- a/ld/testsuite/ld-mmix/locto-1.d
+++ b/ld/testsuite/ld-mmix/locto-1.d
@@ -7,9 +7,6 @@
 
 SYMBOL TABLE:
 0+1008 l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
 0+ l    d  \*ABS\*	0+ (|\.strtab)
diff --git a/ld/testsuite/ld-mmix/start-1.d b/ld/testsuite/ld-mmix/start-1.d
index d372d1d..13fdbdc 100644
--- a/ld/testsuite/ld-mmix/start-1.d
+++ b/ld/testsuite/ld-mmix/start-1.d
@@ -6,9 +6,6 @@
 
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
-2000000000000000 l    d  \.data	0+ (|\.data)
-2000000000000000 l    d  \.sbss	0+ (|\.sbss)
-2000000000000000 l    d  \.bss	0+ (|\.bss)
 0+ l    d  \*ABS\*	0+ (|\.shstrtab)
 0+ l    d  \*ABS\*	0+ (|\.symtab)
 0+ l    d  \*ABS\*	0+ (|\.strtab)
diff --git a/ld/testsuite/ld-mmix/undef-3.d b/ld/testsuite/ld-mmix/undef-3.d
index 2ae4d73..a17b968 100644
--- a/ld/testsuite/ld-mmix/undef-3.d
+++ b/ld/testsuite/ld-mmix/undef-3.d
@@ -2,45 +2,36 @@
 #ld: -u undefd -m elf64mmix
 #readelf: -S -s
 
-There are 8 section headers, starting at offset 0xe8:
+There are 5 section headers, starting at offset 0xa0:
 
 Section Headers:
   \[Nr\] Name              Type             Address           Offset
        Size              EntSize          Flags  Link  Info  Align
   \[ 0\]                   NULL             0+  0+
        0+  0+           0     0     0
-  \[ 1\] \.text             PROGBITS         0+  0+b0
+  \[ 1\] \.text             PROGBITS         0+  0+78
        0+4  0+  AX       0     0     4
-  \[ 2\] \.data             PROGBITS         20+  0+b4
-       0+  0+  WA       0     0     1
-  \[ 3\] \.sbss             PROGBITS         2000000000000000  0+b4
-       0+  0+   W       0     0     1
-  \[ 4\] \.bss              NOBITS           2000000000000000  0+b4
-       0+  0+  WA       0     0     1
-  \[ 5\] \.shstrtab         STRTAB           0+  0+b4
-       0+32  0+           0     0     1
-  \[ 6\] \.symtab           SYMTAB           0+  0+2e8
-       0+150  0+18           7     8     8
-  \[ 7\] \.strtab           STRTAB           0+  0+438
+  \[ 2\] \.shstrtab         STRTAB           0+  0+7c
+       0+21  0+           0     0     1
+  \[ 3\] \.symtab           SYMTAB           0+  0+1e0
+       0+108  0+18           4     5     8
+  \[ 4\] \.strtab           STRTAB           0+  0+2e8
        0+2f  0+           0     0     1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), x \(unknown\)
   O \(extra OS processing required\) o \(OS specific\), p \(processor specific\)
 
-Symbol table '\.symtab' contains 14 entries:
+Symbol table '\.symtab' contains 11 entries:
    Num:    Value          Size Type    Bind   Vis      Ndx Name
      0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: 0+     0 SECTION LOCAL  DEFAULT    1 
-     2: 2000000000000000     0 SECTION LOCAL  DEFAULT    2 
-     3: 2000000000000000     0 SECTION LOCAL  DEFAULT    3 
-     4: 2000000000000000     0 SECTION LOCAL  DEFAULT    4 
-     5: 0+     0 SECTION LOCAL  DEFAULT    5 
-     6: 0+     0 SECTION LOCAL  DEFAULT    6 
-     7: 0+     0 SECTION LOCAL  DEFAULT    7 
-     8: 0+     0 NOTYPE  GLOBAL DEFAULT  UND undefd
-     9: 0+     0 NOTYPE  GLOBAL DEFAULT    1 _start
-    10: 2000000000000000     0 NOTYPE  GLOBAL DEFAULT  ABS __bss_start
-    11: 2000000000000000     0 NOTYPE  GLOBAL DEFAULT  ABS _edata
-    12: 2000000000000000     0 NOTYPE  GLOBAL DEFAULT  ABS _end
-    13: 0+     0 NOTYPE  GLOBAL DEFAULT    1 _start\.
+     2: 0+     0 SECTION LOCAL  DEFAULT    2 
+     3: 0+     0 SECTION LOCAL  DEFAULT    3 
+     4: 0+     0 SECTION LOCAL  DEFAULT    4 
+     5: 0+     0 NOTYPE  GLOBAL DEFAULT  UND undefd
+     6: 0+     0 NOTYPE  GLOBAL DEFAULT    1 _start
+     7: 2000000000000000     0 NOTYPE  GLOBAL DEFAULT  ABS __bss_start
+     8: 2000000000000000     0 NOTYPE  GLOBAL DEFAULT  ABS _edata
+     9: 2000000000000000     0 NOTYPE  GLOBAL DEFAULT  ABS _end
+    10: 0+     0 NOTYPE  GLOBAL DEFAULT    1 _start\.