Place .shstrtab section after .symtab and .strtab, thus restoring monotonically increasing section offsets.

bfd
  * elf.c (assign_section_numbers): Assign number for the .shstrtab
  section after the symbol table and string table sections.

binutils
  * testsuite/binutils-all/readelf.s: Adjust expected ordering of
  sections.
  * testsuite/binutils-all/readelf.s-64: Likewise.

gas
  * testsuite/gas/i386/ilp32/x86-64-unwind.d: Adjust expected ordering
  of sections.
  * testsuite/gas/i386/x86-64-unwind.d: Likewise.
  * testsuite/gas/ia64/alias-ilp32.d: Likewise.
  * testsuite/gas/ia64/alias.d: Likewise.
  * testsuite/gas/ia64/group-1.d: Likewise.
  * testsuite/gas/ia64/group-2.d: Likewise.
  * testsuite/gas/ia64/secname-ilp32.d: Likewise.
  * testsuite/gas/ia64/secname.d: Likewise.
  * testsuite/gas/ia64/unwind-ilp32.d: Likewise.
  * testsuite/gas/ia64/unwind.d: Likewise.
  * testsuite/gas/ia64/xdata-ilp32.d: Likewise.
  * testsuite/gas/ia64/xdata.d: Likewise.
  * testsuite/gas/mmix/bspec-1.d: Likewise.
  * testsuite/gas/mmix/bspec-2.d: Likewise.
  * testsuite/gas/mmix/byte-1.d: Likewise.
  * testsuite/gas/mmix/loc-1.d: Likewise.
  * testsuite/gas/mmix/loc-2.d: Likewise.
  * testsuite/gas/mmix/loc-3.d: Likewise.
  * testsuite/gas/mmix/loc-4.d: Likewise.
  * testsuite/gas/mmix/loc-5.d: Likewise.
  * testsuite/gas/tic6x/scomm-directive-4.d: Likewise.

ld
  * testsuite/ld-alpha/tlsbin.rd: Adjust expected ordering of sections.
  * testsuite/ld-alpha/tlsbinr.rd: Likewise.
  * testsuite/ld-alpha/tlspic.rd: Likewise.
  * testsuite/ld-cris/libdso-2.d: Likewise.
  * testsuite/ld-i386/nogot1.d: Likewise.
  * testsuite/ld-i386/pr12718.d: Likewise.
  * testsuite/ld-i386/pr12921.d: Likewise.
  * testsuite/ld-i386/tlsbin-nacl.rd: Likewise.
  * testsuite/ld-i386/tlsbin.rd: Likewise.
  * testsuite/ld-i386/tlsbin2-nacl.rd: Likewise.
  * testsuite/ld-i386/tlsbin2.rd: Likewise.
  * testsuite/ld-i386/tlsbindesc-nacl.rd: Likewise.
  * testsuite/ld-i386/tlsbindesc.rd: Likewise.
  * testsuite/ld-i386/tlsdesc-nacl.rd: Likewise.
  * testsuite/ld-i386/tlsdesc.rd: Likewise.
  * testsuite/ld-i386/tlsgdesc-nacl.rd: Likewise.
  * testsuite/ld-i386/tlsgdesc.rd: Likewise.
  * testsuite/ld-i386/tlsnopic-nacl.rd: Likewise.
  * testsuite/ld-i386/tlsnopic.rd: Likewise.
  * testsuite/ld-i386/tlspic-nacl.rd: Likewise.
  * testsuite/ld-i386/tlspic.rd: Likewise.
  * testsuite/ld-i386/tlspic2-nacl.rd: Likewise.
  * testsuite/ld-i386/tlspic2.rd: Likewise.
  * testsuite/ld-ia64/tlsbin.rd: Likewise.
  * testsuite/ld-ia64/tlspic.rd: Likewise.
  * testsuite/ld-mips-elf/attr-gnu-4-10.d: Likewise.
  * testsuite/ld-mips-elf/attr-gnu-4-50.d: Likewise.
  * testsuite/ld-mips-elf/attr-gnu-4-60.d: Likewise.
  * testsuite/ld-mips-elf/attr-gnu-4-70.d: Likewise.
  * testsuite/ld-mmix/bspec1.d: Likewise.
  * testsuite/ld-mmix/bspec2.d: Likewise.
  * testsuite/ld-mmix/local1.d: Likewise.
  * testsuite/ld-mmix/local3.d: Likewise.
  * testsuite/ld-mmix/local5.d: Likewise.
  * testsuite/ld-mmix/local7.d: Likewise.
  * testsuite/ld-mmix/undef-3.d: Likewise.
  * testsuite/ld-powerpc/tlsexe.r: Likewise.
  * testsuite/ld-powerpc/tlsexe32.r: Likewise.
  * testsuite/ld-powerpc/tlsexetoc.r: Likewise.
  * testsuite/ld-powerpc/tlsso.r: Likewise.
  * testsuite/ld-powerpc/tlsso32.r: Likewise.
  * testsuite/ld-powerpc/tlstocso.r: Likewise.
  * testsuite/ld-s390/tlsbin.rd: Likewise.
  * testsuite/ld-s390/tlsbin_64.rd: Likewise.
  * testsuite/ld-s390/tlspic.rd: Likewise.
  * testsuite/ld-s390/tlspic_64.rd: Likewise.
  * testsuite/ld-sh/sh64/crange1.rd: Likewise.
  * testsuite/ld-sh/sh64/crange2.rd: Likewise.
  * testsuite/ld-sh/sh64/crange3-cmpct.rd: Likewise.
  * testsuite/ld-sh/sh64/crange3-media.rd: Likewise.
  * testsuite/ld-sh/sh64/crange3.rd: Likewise.
  * testsuite/ld-sh/sh64/crangerel1.rd: Likewise.
  * testsuite/ld-sh/sh64/crangerel2.rd: Likewise.
  * testsuite/ld-sh/tlsbin-2.d: Likewise.
  * testsuite/ld-sh/tlspic-2.d: Likewise.
  * testsuite/ld-sparc/gotop32.rd: Likewise.
  * testsuite/ld-sparc/gotop64.rd: Likewise.
  * testsuite/ld-sparc/tlssunbin32.rd: Likewise.
  * testsuite/ld-sparc/tlssunbin64.rd: Likewise.
  * testsuite/ld-sparc/tlssunnopic32.rd: Likewise.
  * testsuite/ld-sparc/tlssunnopic64.rd: Likewise.
  * testsuite/ld-sparc/tlssunpic32.rd: Likewise.
  * testsuite/ld-sparc/tlssunpic64.rd: Likewise.
  * testsuite/ld-tic6x/common.d: Likewise.
  * testsuite/ld-tic6x/shlib-1.rd: Likewise.
  * testsuite/ld-tic6x/shlib-1b.rd: Likewise.
  * testsuite/ld-tic6x/shlib-1r.rd: Likewise.
  * testsuite/ld-tic6x/shlib-1rb.rd: Likewise.
  * testsuite/ld-tic6x/shlib-app-1.rd: Likewise.
  * testsuite/ld-tic6x/shlib-app-1b.rd: Likewise.
  * testsuite/ld-tic6x/shlib-app-1r.rd: Likewise.
  * testsuite/ld-tic6x/shlib-app-1rb.rd: Likewise.
  * testsuite/ld-tic6x/shlib-noindex.rd: Likewise.
  * testsuite/ld-tic6x/static-app-1.rd: Likewise.
  * testsuite/ld-tic6x/static-app-1b.rd: Likewise.
  * testsuite/ld-tic6x/static-app-1r.rd: Likewise.
  * testsuite/ld-tic6x/static-app-1rb.rd: Likewise.
  * testsuite/ld-x86-64/ilp32-4-nacl.d: Likewise.
  * testsuite/ld-x86-64/ilp32-4.d: Likewise.
  * testsuite/ld-x86-64/nogot1.d: Likewise.
  * testsuite/ld-x86-64/pr12718.d: Likewise.
  * testsuite/ld-x86-64/pr12921.d: Likewise.
  * testsuite/ld-x86-64/split-by-file-nacl.rd: Likewise.
  * testsuite/ld-x86-64/split-by-file.rd: Likewise.
  * testsuite/ld-x86-64/tlsbin-nacl.rd: Likewise.
  * testsuite/ld-x86-64/tlsbin.rd: Likewise.
  * testsuite/ld-x86-64/tlsbin2-nacl.rd: Likewise.
  * testsuite/ld-x86-64/tlsbin2.rd: Likewise.
  * testsuite/ld-x86-64/tlsbindesc-nacl.rd: Likewise.
  * testsuite/ld-x86-64/tlsbindesc.rd: Likewise.
  * testsuite/ld-x86-64/tlsdesc-nacl.rd: Likewise.
  * testsuite/ld-x86-64/tlsdesc.rd: Likewise.
  * testsuite/ld-x86-64/tlsgdesc-nacl.rd: Likewise.
  * testsuite/ld-x86-64/tlsgdesc.rd: Likewise.
  * testsuite/ld-x86-64/tlspic-nacl.rd: Likewise.
  * testsuite/ld-x86-64/tlspic.rd: Likewise.
  * testsuite/ld-x86-64/tlspic2-nacl.rd: Likewise.
  * testsuite/ld-x86-64/tlspic2.rd: Likewise.
  * testsuite/ld-xtensa/tlsbin.rd: Likewise.
  * testsuite/ld-xtensa/tlspic.rd: Likewise.

22 files changed, 110 insertions, 85 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 403f122..d14b0d9 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,28 @@
+2016-08-19  Nick Clifton  <nickc@redhat.com>
+
+	* testsuite/gas/i386/ilp32/x86-64-unwind.d: Adjust expected
+	ordering of sections.
+	* testsuite/gas/i386/x86-64-unwind.d: Likewise.
+	* testsuite/gas/ia64/alias-ilp32.d: Likewise.
+	* testsuite/gas/ia64/alias.d: Likewise.
+	* testsuite/gas/ia64/group-1.d: Likewise.
+	* testsuite/gas/ia64/group-2.d: Likewise.
+	* testsuite/gas/ia64/secname-ilp32.d: Likewise.
+	* testsuite/gas/ia64/secname.d: Likewise.
+	* testsuite/gas/ia64/unwind-ilp32.d: Likewise.
+	* testsuite/gas/ia64/unwind.d: Likewise.
+	* testsuite/gas/ia64/xdata-ilp32.d: Likewise.
+	* testsuite/gas/ia64/xdata.d: Likewise.
+	* testsuite/gas/mmix/bspec-1.d: Likewise.
+	* testsuite/gas/mmix/bspec-2.d: Likewise.
+	* testsuite/gas/mmix/byte-1.d: Likewise.
+	* testsuite/gas/mmix/loc-1.d: Likewise.
+	* testsuite/gas/mmix/loc-2.d: Likewise.
+	* testsuite/gas/mmix/loc-3.d: Likewise.
+	* testsuite/gas/mmix/loc-4.d: Likewise.
+	* testsuite/gas/mmix/loc-5.d: Likewise.
+	* testsuite/gas/tic6x/scomm-directive-4.d: Likewise.
+
 2016-08-11  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* config/tc-aarch64.c (parse_aarch64_imm_float): Reject -0.0.
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-unwind.d b/gas/testsuite/gas/i386/ilp32/x86-64-unwind.d
index 5cea05e..5dc74d6c 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-unwind.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-unwind.d
@@ -11,8 +11,8 @@ Section Headers:
   \[ 2\] .data             PROGBITS        00000000 000034 000000 00  WA  0   0  1
   \[ 3\] .bss              NOBITS          00000000 000034 000000 00  WA  0   0  1
   \[ 4\] .eh_frame         X86_64_UNWIND   00000000 000034 000008 00   A  0   0  1
-  \[ 5\] .shstrtab         STRTAB          00000000 [0-9a-f]+ 000036 00   .  0   0  1
-  \[ 6\] .symtab           SYMTAB          00000000 [0-9a-f]+ 000050 10      7   5  4
-  \[ 7\] .strtab           STRTAB          00000000 [0-9a-f]+ 000001 00   .  0   0  1
+  \[ 5\] .symtab           SYMTAB          00000000 [0-9a-f]+ 000050 10      6   5  4
+  \[ 6\] .strtab           STRTAB          00000000 [0-9a-f]+ 000001 00   .  0   0  1
+  \[ 7\] .shstrtab         STRTAB          00000000 [0-9a-f]+ 000036 00   .  0   0  1
 Key to Flags:
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-unwind.d b/gas/testsuite/gas/i386/x86-64-unwind.d
index 7a4c64c..89f1a65 100644
--- a/gas/testsuite/gas/i386/x86-64-unwind.d
+++ b/gas/testsuite/gas/i386/x86-64-unwind.d
@@ -16,11 +16,11 @@ Section Headers:
        0000000000000000  0000000000000000  WA       0     0     1
   \[ 4\] \.eh_frame         X86_64_UNWIND    0000000000000000  00000040
        0000000000000008  0000000000000000   A       0     0     1
-  \[ 5\] \.shstrtab         STRTAB           0000000000000000  [0-9a-f]+
-       0000000000000036  0000000000000000   .       0     0     1
-  \[ 6\] \.symtab           SYMTAB           0000000000000000  [0-9a-f]+
-       0000000000000078  0000000000000018           7     5     8
-  \[ 7\] \.strtab           STRTAB           0000000000000000  [0-9a-f]+
+  \[ 5\] \.symtab           SYMTAB           0000000000000000  [0-9a-f]+
+       0000000000000078  0000000000000018           6     5     8
+  \[ 6\] \.strtab           STRTAB           0000000000000000  [0-9a-f]+
        0000000000000001  0000000000000000   .       0     0     1
+  \[ 7\] \.shstrtab         STRTAB           0000000000000000  [0-9a-f]+
+       0000000000000036  0000000000000000   .       0     0     1
 Key to Flags:
 #...
diff --git a/gas/testsuite/gas/ia64/alias-ilp32.d b/gas/testsuite/gas/ia64/alias-ilp32.d
index d882b3c..df05d36 100644
--- a/gas/testsuite/gas/ia64/alias-ilp32.d
+++ b/gas/testsuite/gas/ia64/alias-ilp32.d
@@ -12,9 +12,9 @@ Section Headers:
  +\[ 2\] .data +PROGBITS +00000000 000040 000000 00 +WA +0 +0 +1
  +\[ 3\] .bss +NOBITS +00000000 000040 000000 00 +WA +0 +0 +1
  +\[ 4\] 1234 +PROGBITS +00000000 000040 000005 00 +WA +0 +0 +1
- +\[ 5\] .shstrtab +STRTAB +00000000 [0-9a-f]+ 000031 00 +0 +0 +1
- +\[ 6\] .symtab +SYMTAB +00000000 [0-9a-f]+ 000060 10 +7 +6 +4
- +\[ 7\] .strtab +STRTAB +00000000 [0-9a-f]+ 000006 00 +0 +0 +1
+ +\[ 5\] .symtab +SYMTAB +00000000 [0-9a-f]+ 000060 10 +6 +6 +4
+ +\[ 6\] .strtab +STRTAB +00000000 [0-9a-f]+ 000006 00 +0 +0 +1
+ +\[ 7\] .shstrtab +STRTAB +00000000 [0-9a-f]+ 000031 00 +0 +0 +1
 Key to Flags:
 #...
 
diff --git a/gas/testsuite/gas/ia64/alias.d b/gas/testsuite/gas/ia64/alias.d
index 398bff4..23b9330 100644
--- a/gas/testsuite/gas/ia64/alias.d
+++ b/gas/testsuite/gas/ia64/alias.d
@@ -16,12 +16,12 @@ Section Headers:
  +0000000000000000 +0000000000000000 +WA +0 +0 +1
  +\[ 4\] 1234 +PROGBITS +0000000000000000 +00000040
  +0000000000000005 +0000000000000000 +WA +0 +0 +1
- +\[ 5\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+
- +0000000000000031 +0000000000000000 +0 +0 +1
- +\[ 6\] \.symtab +SYMTAB +0000000000000000 .*
- +0000000000000090 +0000000000000018 +7 +6 +8
- +\[ 7\] \.strtab +STRTAB +0000000000000000 .*
+ +\[ 5\] \.symtab +SYMTAB +0000000000000000 .*
+ +0000000000000090 +0000000000000018 +6 +6 +8
+ +\[ 6\] \.strtab +STRTAB +0000000000000000 .*
  +0000000000000006 +0000000000000000 +0 +0 +1
+ +\[ 7\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+
+ +0000000000000031 +0000000000000000 +0 +0 +1
 Key to Flags:
 #...
 
diff --git a/gas/testsuite/gas/ia64/group-1.d b/gas/testsuite/gas/ia64/group-1.d
index b4eab14..b90bd88 100644
--- a/gas/testsuite/gas/ia64/group-1.d
+++ b/gas/testsuite/gas/ia64/group-1.d
@@ -18,12 +18,12 @@ Section Headers:
        0000000000000000  0000000000000000  WA       0     0     1
   \[ 5\] \.text             PROGBITS         0000000000000000  00000050
        0000000000000010  0000000000000000 AXG       0     0     16
-  \[ 6\] \.shstrtab         STRTAB           0000000000000000  [0-9a-f]+
-       0000000000000033  0000000000000000           0     0     1
-  \[ 7\] \.symtab           SYMTAB           0000000000000000  .*
-       00000000000000c0  0000000000000018           8     8     8
-  \[ 8\] \.strtab           STRTAB           0000000000000000  .*
+  \[ 6\] \.symtab           SYMTAB           0000000000000000  .*
+       00000000000000c0  0000000000000018           7     8     8
+  \[ 7\] \.strtab           STRTAB           0000000000000000  .*
        000000000000000[7c]  0000000000000000           0     0     1
+  \[ 8\] \.shstrtab         STRTAB           0000000000000000  [0-9a-f]+
+       0000000000000033  0000000000000000           0     0     1
 Key to Flags:
 #...
 
diff --git a/gas/testsuite/gas/ia64/group-2.d b/gas/testsuite/gas/ia64/group-2.d
index 7370367..cc8413f 100644
--- a/gas/testsuite/gas/ia64/group-2.d
+++ b/gas/testsuite/gas/ia64/group-2.d
@@ -25,12 +25,12 @@ Section Headers:
        0000000000000018  0000000000000000 ALG       5     5     8
   \[ 8\] \.rela\.gnu\.linkonc RELA             0000000000000000  .*
        0000000000000048  0000000000000018   I      10     7     8
-  \[ 9\] \.shstrtab         STRTAB           0000000000000000  [0-9a-f]+
-       0000000000000081  0000000000000000           0     0     1
-  \[10\] \.symtab           SYMTAB           0000000000000000  .*
-       00000000000000d8  0000000000000018          11     9     8
-  \[11\] \.strtab           STRTAB           0000000000000000  .*
+  \[ 9\] \.symtab           SYMTAB           0000000000000000  .*
+       00000000000000d8  0000000000000018          10     9     8
+  \[10\] \.strtab           STRTAB           0000000000000000  .*
        0000000000000005  0000000000000000           0     0     1
+  \[11\] \.shstrtab         STRTAB           0000000000000000  [0-9a-f]+
+       0000000000000081  0000000000000000           0     0     1
 Key to Flags:
 #...
 
diff --git a/gas/testsuite/gas/ia64/secname-ilp32.d b/gas/testsuite/gas/ia64/secname-ilp32.d
index 4146307..0b8a771 100644
--- a/gas/testsuite/gas/ia64/secname-ilp32.d
+++ b/gas/testsuite/gas/ia64/secname-ilp32.d
@@ -12,8 +12,8 @@ Section Headers:
   \[ 2\] .data             PROGBITS        00000000 000040 000000 00  WA  0   0  1
   \[ 3\] .bss              NOBITS          00000000 000040 000000 00  WA  0   0  1
   \[ 4\] .foo              PROGBITS        00000000 000040 000008 00  WA  0   0  8
-  \[ 5\] .shstrtab         STRTAB          00000000 [0-9a-f]+ 000031 00      0   0  1
-  \[ 6\] .symtab           SYMTAB          00000000 [0-9a-f]+ 000050 10      7   5  4
-  \[ 7\] .strtab           STRTAB          00000000 [0-9a-f]+ 000001 00      0   0  1
+  \[ 5\] .symtab           SYMTAB          00000000 [0-9a-f]+ 000050 10      6   5  4
+  \[ 6\] .strtab           STRTAB          00000000 [0-9a-f]+ 000001 00      0   0  1
+  \[ 7\] .shstrtab         STRTAB          00000000 [0-9a-f]+ 000031 00      0   0  1
 Key to Flags:
 #...
diff --git a/gas/testsuite/gas/ia64/secname.d b/gas/testsuite/gas/ia64/secname.d
index 79f1e33..9d02e1a 100644
--- a/gas/testsuite/gas/ia64/secname.d
+++ b/gas/testsuite/gas/ia64/secname.d
@@ -16,11 +16,11 @@ Section Headers:
        0000000000000000  0000000000000000  WA       0     0     1
   \[ 4\] \.foo              PROGBITS         0000000000000000  00000040
        0000000000000008  0000000000000000  WA       0     0     8
-  \[ 5\] \.shstrtab         STRTAB           0000000000000000  [0-9a-f]+
-       0000000000000031  0000000000000000           0     0     1
-  \[ 6\] \.symtab           SYMTAB           0000000000000000  .*
-       0000000000000078  0000000000000018           7     5     8
-  \[ 7\] \.strtab           STRTAB           0000000000000000  .*
+  \[ 5\] \.symtab           SYMTAB           0000000000000000  .*
+       0000000000000078  0000000000000018           6     5     8
+  \[ 6\] \.strtab           STRTAB           0000000000000000  .*
        0000000000000001  0000000000000000           0     0     1
+  \[ 7\] \.shstrtab         STRTAB           0000000000000000  [0-9a-f]+
+       0000000000000031  0000000000000000           0     0     1
 Key to Flags:
 #...
diff --git a/gas/testsuite/gas/ia64/unwind-ilp32.d b/gas/testsuite/gas/ia64/unwind-ilp32.d
index cd25b0d..e96f89b 100644
--- a/gas/testsuite/gas/ia64/unwind-ilp32.d
+++ b/gas/testsuite/gas/ia64/unwind-ilp32.d
@@ -13,8 +13,8 @@ Section Headers:
   \[ 3\] .bss              NOBITS          00000000 000040 000000 00  WA  0   0  1
   \[ 4\] .IA_64.unwind_inf PROGBITS        00000000 000040 000008 00   A  0   0  8
   \[ 5\] .IA_64.unwind     IA_64_UNWIND    00000000 000048 000008 00  AL  1   1  8
-  \[ 6\] .shstrtab         STRTAB          00000000 [0-9a-f]+ 00004d 00      0   0  1
-  \[ 7\] .symtab           SYMTAB          00000000 [0-9a-f]+ 000060 10      8   6  4
-  \[ 8\] .strtab           STRTAB          00000000 [0-9a-f]+ 000001 00      0   0  1
+  \[ 6\] .symtab           SYMTAB          00000000 [0-9a-f]+ 000060 10      7   6  4
+  \[ 7\] .strtab           STRTAB          00000000 [0-9a-f]+ 000001 00      0   0  1
+  \[ 8\] .shstrtab         STRTAB          00000000 [0-9a-f]+ 00004d 00      0   0  1
 Key to Flags:
 #...
diff --git a/gas/testsuite/gas/ia64/unwind.d b/gas/testsuite/gas/ia64/unwind.d
index ce71a7a..bdb7af8 100644
--- a/gas/testsuite/gas/ia64/unwind.d
+++ b/gas/testsuite/gas/ia64/unwind.d
@@ -18,11 +18,11 @@ Section Headers:
        0000000000000008  0000000000000000   A       0     0     8
   \[ 5\] \.IA_64\.unwind     IA_64_UNWIND     0000000000000000  00000048
        0000000000000008  0000000000000000  AL       1     1     8
-  \[ 6\] \.shstrtab         STRTAB           0000000000000000  [0-9a-f]+
-       000000000000004d  0000000000000000           0     0     1
-  \[ 7\] \.symtab           SYMTAB           0000000000000000  .*
-       0000000000000090  0000000000000018           8     6     8
-  \[ 8\] \.strtab           STRTAB           0000000000000000  .*
+  \[ 6\] \.symtab           SYMTAB           0000000000000000  .*
+       0000000000000090  0000000000000018           7     6     8
+  \[ 7\] \.strtab           STRTAB           0000000000000000  .*
        0000000000000001  0000000000000000           0     0     1
+  \[ 8\] \.shstrtab         STRTAB           0000000000000000  [0-9a-f]+
+       000000000000004d  0000000000000000           0     0     1
 Key to Flags:
 #...
diff --git a/gas/testsuite/gas/ia64/xdata-ilp32.d b/gas/testsuite/gas/ia64/xdata-ilp32.d
index 8c0bb30..e5dd507 100644
--- a/gas/testsuite/gas/ia64/xdata-ilp32.d
+++ b/gas/testsuite/gas/ia64/xdata-ilp32.d
@@ -23,7 +23,7 @@ Section Headers:
   \[13\] \.xreal\[4\]         PROGBITS        00000000 [[:xdigit:]]+ 000020 00   A  0   0 16
   \[14\] \.xstr<1>          PROGBITS        00000000 [[:xdigit:]]+ 000003 00   A  0   0  1
   \[15\] \.xstr\{2\}          PROGBITS        00000000 [[:xdigit:]]+ 000004 00   A  0   0  1
-  \[16\] .shstrtab         STRTAB          00000000 [[:xdigit:]]+ [[:xdigit:]]+ 00      0   0  1
-  \[17\] .symtab           SYMTAB          00000000 [[:xdigit:]]+ [[:xdigit:]]+ 10     18  15  4
-  \[18\] .strtab           STRTAB          00000000 [[:xdigit:]]+ [[:xdigit:]]+ 00      0   0  1
+  \[16\] .symtab           SYMTAB          00000000 [[:xdigit:]]+ [[:xdigit:]]+ 10     17  15  4
+  \[17\] .strtab           STRTAB          00000000 [[:xdigit:]]+ [[:xdigit:]]+ 00      0   0  1
+  \[18\] .shstrtab         STRTAB          00000000 [[:xdigit:]]+ [[:xdigit:]]+ 00      0   0  1
 #pass
diff --git a/gas/testsuite/gas/ia64/xdata.d b/gas/testsuite/gas/ia64/xdata.d
index dc23b78..eb12819 100644
--- a/gas/testsuite/gas/ia64/xdata.d
+++ b/gas/testsuite/gas/ia64/xdata.d
@@ -38,10 +38,10 @@ Section Headers:
        0000000000000003  0000000000000000   A       0     0     1
   \[15\] \.xstr\{2\}          PROGBITS         0000000000000000  [[:xdigit:]]+
        0000000000000004  0000000000000000   A       0     0     1
-  \[16\] \.shstrtab         STRTAB           0000000000000000  [[:xdigit:]]+
+  \[16\] \.symtab           SYMTAB           0000000000000000  [[:xdigit:]]+
+       [[:xdigit:]]+  0000000000000018          17    15     8
+  \[17\] \.strtab           STRTAB           0000000000000000  [[:xdigit:]]+
        [[:xdigit:]]+  0000000000000000           0     0     1
-  \[17\] \.symtab           SYMTAB           0000000000000000  [[:xdigit:]]+
-       [[:xdigit:]]+  0000000000000018          18    15     8
-  \[18\] \.strtab           STRTAB           0000000000000000  [[:xdigit:]]+
+  \[18\] \.shstrtab         STRTAB           0000000000000000  [[:xdigit:]]+
        [[:xdigit:]]+  0000000000000000           0     0     1
 #pass
diff --git a/gas/testsuite/gas/mmix/bspec-1.d b/gas/testsuite/gas/mmix/bspec-1.d
index a18d242..4bbda8d 100644
--- a/gas/testsuite/gas/mmix/bspec-1.d
+++ b/gas/testsuite/gas/mmix/bspec-1.d
@@ -4,7 +4,7 @@ There are 9 section headers, starting at offset .*:
  +\[ 4\] \.MMIX\.spec_data\.2 +PROGBITS +0+ +0+44
  +0+4 +0+ +0 +0 +4
  +\[ 5\] \.rela\.MMIX\.spec_d +RELA +0+ +.*
- +0+18 +0+18 +I +7 +4 +8
+ +0+18 +0+18 +I +6 +4 +8
 #...
 Relocation section '\.rela\.MMIX\.spec_data\.2' at offset 0x[0-9a-f]+ contains 1 entries:
 .*
diff --git a/gas/testsuite/gas/mmix/bspec-2.d b/gas/testsuite/gas/mmix/bspec-2.d
index a9ce03d..ab3afd3 100644
--- a/gas/testsuite/gas/mmix/bspec-2.d
+++ b/gas/testsuite/gas/mmix/bspec-2.d
@@ -4,11 +4,11 @@ There are 11 section headers, starting at offset .*:
   \[ 4\] \.MMIX\.spec_data\.2 PROGBITS         0+  0+48
        0+10  0+           0     0     8
   \[ 5\] \.rela\.MMIX\.spec_d RELA             0+  .*
- +0+30  0+18 +I +9 +4 +8
+ +0+30  0+18 +I +8 +4 +8
   \[ 6\] \.MMIX\.spec_data\.3 PROGBITS         0+  0+58
        0+8  0+           0     0     8
   \[ 7\] \.rela\.MMIX\.spec_d RELA             0+  .*
- +0+18 +0+18 +I +9 +6 +8
+ +0+18 +0+18 +I +8 +6 +8
 #...
 Relocation section '\.rela\.MMIX\.spec_data\.2' at offset .* contains 2 entries:
 .*
diff --git a/gas/testsuite/gas/mmix/byte-1.d b/gas/testsuite/gas/mmix/byte-1.d
index b6c2768..a77eb08 100644
--- a/gas/testsuite/gas/mmix/byte-1.d
+++ b/gas/testsuite/gas/mmix/byte-1.d
@@ -12,12 +12,12 @@ Section Headers:
  +0000000000000000 +0000000000000000 +WA +0 +0 +1
  +\[ 3\] \.bss +NOBITS +0000000000000000 +00000056
  +0000000000000000 +0000000000000000 +WA +0 +0 +1
- +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+
- +000000000000002c +0000000000000000 +0 +0 +1
- +\[ 5\] \.symtab +SYMTAB +0000000000000000 .*
- +00000000000000c0 +0000000000000018 +6 +7 +8
- +\[ 6\] \.strtab +STRTAB +0000000000000000 .*
+ +\[ 4\] \.symtab +SYMTAB +0000000000000000 .*
+ +00000000000000c0 +0000000000000018 +5 +7 +8
+ +\[ 5\] \.strtab +STRTAB +0000000000000000 .*
  +0000000000000018 +0000000000000000 +0 +0 +1
+ +\[ 6\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+
+ +000000000000002c +0000000000000000 +0 +0 +1
 Key to Flags:
 #...
 
diff --git a/gas/testsuite/gas/mmix/loc-1.d b/gas/testsuite/gas/mmix/loc-1.d
index e45b1d5..e46247d 100644
--- a/gas/testsuite/gas/mmix/loc-1.d
+++ b/gas/testsuite/gas/mmix/loc-1.d
@@ -13,12 +13,12 @@ Section Headers:
  +0000000000000004 +0000000000000000 +WA +0 +0 +4
  +\[ 3\] \.bss +NOBITS +0000000000000000 +00000064
  +0000000000000000 +0000000000000000 +WA +0 +0 +1
- +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+
- +000000000000002c +0000000000000000 +0 +0 +1
- +\[ 5\] \.symtab +SYMTAB +0000000000000000 .*
- +00000000000000c0 +0000000000000018 +6 +6 +8
- +\[ 6\] \.strtab +STRTAB +0000000000000000 .*
+ +\[ 4\] \.symtab +SYMTAB +0000000000000000 .*
+ +00000000000000c0 +0000000000000018 +5 +6 +8
+ +\[ 5\] \.strtab +STRTAB +0000000000000000 .*
  +000000000000002a +0000000000000000 +0 +0 +1
+ +\[ 6\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+
+ +000000000000002c +0000000000000000 +0 +0 +1
 Key to Flags:
 #...
 
diff --git a/gas/testsuite/gas/mmix/loc-2.d b/gas/testsuite/gas/mmix/loc-2.d
index b92cabb..8d7ec8b 100644
--- a/gas/testsuite/gas/mmix/loc-2.d
+++ b/gas/testsuite/gas/mmix/loc-2.d
@@ -13,12 +13,12 @@ Section Headers:
  +0000000000000000 +0000000000000000 +WA +0 +0 +1
  +\[ 3\] \.bss +NOBITS +0000000000000000 +00000048
  +0000000000000000 +0000000000000000 +WA +0 +0 +1
- +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+
- +000000000000002c +0000000000000000 +0 +0 +1
- +\[ 5\] \.symtab +SYMTAB +0000000000000000 .*
- +0000000000000090 +0000000000000018 +6 +4 +8
- +\[ 6\] \.strtab +STRTAB +0000000000000000 .*
+ +\[ 4\] \.symtab +SYMTAB +0000000000000000 .*
+ +0000000000000090 +0000000000000018 +5 +4 +8
+ +\[ 5\] \.strtab +STRTAB +0000000000000000 .*
  +000000000000001a +0000000000000000 +0 +0 +1
+ +\[ 6\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+
+ +000000000000002c +0000000000000000 +0 +0 +1
 Key to Flags:
 #...
 
diff --git a/gas/testsuite/gas/mmix/loc-3.d b/gas/testsuite/gas/mmix/loc-3.d
index 2c477db..14a68fa 100644
--- a/gas/testsuite/gas/mmix/loc-3.d
+++ b/gas/testsuite/gas/mmix/loc-3.d
@@ -12,12 +12,12 @@ Section Headers:
  +0000000000000008 +0000000000000000 +WA +0 +0 +4
  +\[ 3\] \.bss +NOBITS +0000000000000000 +00000054
  +0000000000000000 +0000000000000000 +WA +0 +0 +1
- +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+
- +000000000000002c +0000000000000000 +0 +0 +1
- +\[ 5\] \.symtab +SYMTAB +0000000000000000 .*
- +00000000000000c0 +0000000000000018 +6 +5 +8
- +\[ 6\] \.strtab +STRTAB +0000000000000000 .*
+ +\[ 4\] \.symtab +SYMTAB +0000000000000000 .*
+ +00000000000000c0 +0000000000000018 +5 +5 +8
+ +\[ 5\] \.strtab +STRTAB +0000000000000000 .*
  +000000000000002e +0000000000000000 +0 +0 +1
+ +\[ 6\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+
+ +000000000000002c +0000000000000000 +0 +0 +1
 Key to Flags:
 #...
 
diff --git a/gas/testsuite/gas/mmix/loc-4.d b/gas/testsuite/gas/mmix/loc-4.d
index 1efc084..935cc18 100644
--- a/gas/testsuite/gas/mmix/loc-4.d
+++ b/gas/testsuite/gas/mmix/loc-4.d
@@ -12,12 +12,12 @@ Section Headers:
  +0000000000000004 +0000000000000000 +WA +0 +0 +4
  +\[ 3\] \.bss +NOBITS +0000000000000000 +0000005c
  +0000000000000000 +0000000000000000 +WA +0 +0 +1
- +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+
- +000000000000002c +0000000000000000 +0 +0 +1
- +\[ 5\] \.symtab +SYMTAB +0000000000000000 .*
- +00000000000000c0 +0000000000000018 +6 +5 +8
- +\[ 6\] \.strtab +STRTAB +0000000000000000 .*
+ +\[ 4\] \.symtab +SYMTAB +0000000000000000 .*
+ +00000000000000c0 +0000000000000018 +5 +5 +8
+ +\[ 5\] \.strtab +STRTAB +0000000000000000 .*
  +000000000000003b +0000000000000000 +0 +0 +1
+ +\[ 6\] \.shstrtab +STRTAB +0000000000000000 +[0-9a-f]+
+ +000000000000002c +0000000000000000 +0 +0 +1
 Key to Flags:
 #...
 
diff --git a/gas/testsuite/gas/mmix/loc-5.d b/gas/testsuite/gas/mmix/loc-5.d
index fa80a86..a8e7545 100644
--- a/gas/testsuite/gas/mmix/loc-5.d
+++ b/gas/testsuite/gas/mmix/loc-5.d
@@ -12,12 +12,12 @@ Section Headers:
  +0+24 +0+ +WA +0 +0 +4
  +\[ 3\] \.bss +NOBITS +0+ +0+6c
  +0+ +0+ +WA +0 +0 +1
- +\[ 4\] \.shstrtab +STRTAB +0+ +[0-9a-f]+
- +0+2c +0+ +0 +0 +1
- +\[ 5\] \.symtab +SYMTAB +0+ .*
- +0+c0 +0+18 +6 +6 +8
- +\[ 6\] \.strtab +STRTAB +0+ .*
+ +\[ 4\] \.symtab +SYMTAB +0+ .*
+ +0+c0 +0+18 +5 +6 +8
+ +\[ 5\] \.strtab +STRTAB +0+ .*
  +0+27 +0+ +0 +0 +1
+ +\[ 6\] \.shstrtab +STRTAB +0+ +[0-9a-f]+
+ +0+2c +0+ +0 +0 +1
 Key to Flags:
 #...
 
diff --git a/gas/testsuite/gas/tic6x/scomm-directive-4.d b/gas/testsuite/gas/tic6x/scomm-directive-4.d
index 7822e8f..219673d 100644
--- a/gas/testsuite/gas/tic6x/scomm-directive-4.d
+++ b/gas/testsuite/gas/tic6x/scomm-directive-4.d
@@ -12,9 +12,9 @@ Section Headers:
   \[ 2\] \.data             PROGBITS        00000000 000034 000000 00  WA  0   0  1
   \[ 3\] \.bss              NOBITS          00000000 000034 000000 00  WA  0   0  1
   \[ 4\] \.c6xabi\.attribute C6000_ATTRIBUTE 00000000 000034 000013 00      0   0  1
-  \[ 5\] \.shstrtab         STRTAB          00000000 [0-9a-f]+ 00003f 00      0   0  1
-  \[ 6\] \.symtab           SYMTAB          00000000 [0-9a-f]+ 0000d0 10      7   5  4
-  \[ 7\] \.strtab           STRTAB          00000000 [0-9a-f]+ 00001d 00      0   0  1
+  \[ 5\] \.symtab           SYMTAB          00000000 [0-9a-f]+ 0000d0 10      6   5  4
+  \[ 6\] \.strtab           STRTAB          00000000 [0-9a-f]+ 00001d 00      0   0  1
+  \[ 7\] \.shstrtab         STRTAB          00000000 [0-9a-f]+ 00003f 00      0   0  1
 Key to Flags:
 #...