Move ELF section headers to end of object file

Currently, section ordering differs a little for non-loaded reloc
sections output by ld -emit-relocs or ld -r and that after passing
such objects through objcopy.  Not that it really matters, but it
would be better for a simple objcopy to produce an unchanged output
object file.  Also, section headers are put somewhere in the middle of
the non-loaded sections, again slightly differently for ld and
objcopy.  This patch fixes these discrepancies and puts section
headers last, which is where gold puts them, and is where
bfd_from_remote_memory wrongly assumed they will be found.

bfd/
	* elf.c (assign_file_positions_except_relocs): Move section header
	placement to..
	(_bfd_elf_assign_file_positions_for_relocs): ..here.  Make static.
	* elf-bfd.h (_bfd_elf_assign_file_positions_for_relocs): Delete.
	* elflink.c (bfd_elf_final_link): Don't call above function.
gas/testsuite/
	* gas/arm/got_prel.d: Adjust for changed section header placement.
	* gas/i386/ilp32/x86-64-size-1.d: Likewise.
	* gas/i386/ilp32/x86-64-size-3.d: Likewise.
	* gas/i386/ilp32/x86-64-size-5.d: Likewise.
	* gas/i386/ilp32/x86-64-unwind.d: Likewise.
	* gas/i386/size-1.d: Likewise.
	* gas/i386/size-3.d: Likewise.
	* gas/i386/x86-64-size-1.d: Likewise.
	* gas/i386/x86-64-size-3.d: Likewise.
	* gas/i386/x86-64-size-5.d: Likewise.
	* gas/i386/x86-64-unwind.d: Likewise.
	* gas/ia64/alias-ilp32.d: Likewise.
	* gas/ia64/alias.d: Likewise.
	* gas/ia64/group-1.d: Likewise.
	* gas/ia64/group-2.d: Likewise.
	* gas/ia64/secname-ilp32.d: Likewise.
	* gas/ia64/secname.d: Likewise.
	* gas/ia64/unwind-ilp32.d: Likewise.
	* gas/ia64/unwind.d: Likewise.
	* gas/mmix/bspec-1.d: Likewise.
	* gas/mmix/bspec-2.d: Likewise.
	* gas/mmix/byte-1.d: Likewise.
	* gas/mmix/loc-1.d: Likewise.
	* gas/mmix/loc-2.d: Likewise.
	* gas/mmix/loc-3.d: Likewise.
	* gas/mmix/loc-4.d: Likewise.
	* gas/mmix/loc-5.d: Likewise.
	* gas/tic6x/scomm-directive-4.d: Likewise.
ld/testsuite/
	* ld-aarch64/emit-relocs-local-addend.d: Adjust for changed
	section header placement.
	* ld-aarch64/local-addend-r.d: Likewise.
	* ld-mmix/bspec1.d: Likewise.
	* ld-mmix/bspec2.d: Likewise.
	* ld-mmix/local1.d: Likewise.
	* ld-mmix/local3.d: Likewise.
	* ld-mmix/local5.d: Likewise.
	* ld-mmix/local7.d: Likewise.
	* ld-mmix/undef-3.d: Likewise.
	* ld-sh/sh64/crange3-cmpct.rd: Likewise.
	* ld-sh/sh64/crange3-media.rd: Likewise.
	* ld-sh/sh64/crangerel1.rd: Likewise.
	* ld-sh/sh64/crangerel2.rd: Likewise.
	* ld-tic6x/common.d: Likewise.
	* ld-tic6x/shlib-1.rd: Likewise.
	* ld-tic6x/shlib-1b.rd: Likewise.
	* ld-tic6x/shlib-1r.rd: Likewise.
	* ld-tic6x/shlib-1rb.rd: Likewise.
	* ld-tic6x/shlib-app-1.rd: Likewise.
	* ld-tic6x/shlib-app-1b.rd: Likewise.
	* ld-tic6x/shlib-app-1r.rd: Likewise.
	* ld-tic6x/shlib-app-1rb.rd: Likewise.
	* ld-tic6x/shlib-noindex.rd: Likewise.
	* ld-tic6x/static-app-1.rd: Likewise.
	* ld-tic6x/static-app-1b.rd: Likewise.
	* ld-tic6x/static-app-1r.rd: Likewise.
	* ld-tic6x/static-app-1rb.rd: Likewise.
	* ld-x86-64/ilp32-4.d: Likewise.
	* ld-x86-64/split-by-file-nacl.rd: Likewise.
	* ld-x86-64/split-by-file.rd: Likewise.

29 files changed, 107 insertions, 76 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 534b1f3..d705f8a 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,34 @@
+2014-09-10  Alan Modra  <amodra@gmail.com>
+
+	* gas/arm/got_prel.d: Adjust for changed section header placement.
+	* gas/i386/ilp32/x86-64-size-1.d: Likewise.
+	* gas/i386/ilp32/x86-64-size-3.d: Likewise.
+	* gas/i386/ilp32/x86-64-size-5.d: Likewise.
+	* gas/i386/ilp32/x86-64-unwind.d: Likewise.
+	* gas/i386/size-1.d: Likewise.
+	* gas/i386/size-3.d: Likewise.
+	* gas/i386/x86-64-size-1.d: Likewise.
+	* gas/i386/x86-64-size-3.d: Likewise.
+	* gas/i386/x86-64-size-5.d: Likewise.
+	* gas/i386/x86-64-unwind.d: Likewise.
+	* gas/ia64/alias-ilp32.d: Likewise.
+	* gas/ia64/alias.d: Likewise.
+	* gas/ia64/group-1.d: Likewise.
+	* gas/ia64/group-2.d: Likewise.
+	* gas/ia64/secname-ilp32.d: Likewise.
+	* gas/ia64/secname.d: Likewise.
+	* gas/ia64/unwind-ilp32.d: Likewise.
+	* gas/ia64/unwind.d: Likewise.
+	* gas/mmix/bspec-1.d: Likewise.
+	* gas/mmix/bspec-2.d: Likewise.
+	* gas/mmix/byte-1.d: Likewise.
+	* gas/mmix/loc-1.d: Likewise.
+	* gas/mmix/loc-2.d: Likewise.
+	* gas/mmix/loc-3.d: Likewise.
+	* gas/mmix/loc-4.d: Likewise.
+	* gas/mmix/loc-5.d: Likewise.
+	* gas/tic6x/scomm-directive-4.d: Likewise.
+
 2014-09-06  Matthew Fortune  <matthew.fortune@imgtec.com>
 
 	* gas/mips/attr-gnu-abi-fp-1.d: Relax expected output.
diff --git a/gas/testsuite/gas/arm/got_prel.d b/gas/testsuite/gas/arm/got_prel.d
index 16ffe78..880a6db 100644
--- a/gas/testsuite/gas/arm/got_prel.d
+++ b/gas/testsuite/gas/arm/got_prel.d
@@ -4,11 +4,11 @@
 # readelf: -x 4 -r
 # target: *-*-*eabi* *-*-symbianelf *-*-linux-* *-*-elf *-*-nacl*
 
-Relocation section '.rel.text.foo' at offset 0x3f0 contains 1 entries:
+Relocation section '.rel.text.foo' at offset .* contains 1 entries:
  Offset     Info    Type            Sym.Value  Sym. Name
 00000010  00000c60 R_ARM_GOT_PREL    00000000   i
 
-Relocation section '.rel.ARM.exidx.text.foo' at offset 0x3f8 contains 2 entries:
+Relocation section '.rel.ARM.exidx.text.foo' at offset .* contains 2 entries:
  Offset     Info    Type            Sym.Value  Sym. Name
 00000000  0000042a R_ARM_PREL31      00000000   .text.foo
 00000000  00000d00 R_ARM_NONE        00000000   __aeabi_unwind_cpp_pr0
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-size-1.d b/gas/testsuite/gas/i386/ilp32/x86-64-size-1.d
index d3e5a13f..0b956d9 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-size-1.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-size-1.d
@@ -3,7 +3,7 @@
 #readelf: -r
 
 
-Relocation section '.rela.text' at offset 0x2dc contains 9 entries:
+Relocation section '.rela.text' at offset .* contains 9 entries:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
 0+1  00000420 R_X86_64_SIZE32   00000000   xxx \+ 0
 0+6  00000420 R_X86_64_SIZE32   00000000   xxx - 8
@@ -15,7 +15,7 @@ Relocation section '.rela.text' at offset 0x2dc contains 9 entries:
 0+24  00000620 R_X86_64_SIZE32   00000020   zzz - 20
 0+29  00000620 R_X86_64_SIZE32   00000020   zzz \+ 20
 
-Relocation section '.rela.data' at offset 0x348 contains 3 entries:
+Relocation section '.rela.data' at offset .* contains 3 entries:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
 0+50  00000420 R_X86_64_SIZE32   00000000   xxx - 1
 0+54  00000520 R_X86_64_SIZE32   00000000   yyy \+ 2
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-size-3.d b/gas/testsuite/gas/i386/ilp32/x86-64-size-3.d
index 044c1e2..a1169d6 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-size-3.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-size-3.d
@@ -3,7 +3,7 @@
 #readelf: -r
 
 
-Relocation section '.rela.text' at offset 0x334 contains 6 entries:
+Relocation section '.rela.text' at offset .* contains 6 entries:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
 0+1  00000620 R_X86_64_SIZE32   00000000   xxx \+ 0
 0+6  00000620 R_X86_64_SIZE32   00000000   xxx - 8
@@ -12,7 +12,7 @@ Relocation section '.rela.text' at offset 0x334 contains 6 entries:
 0+15  00000720 R_X86_64_SIZE32   00000000   yyy - 10
 0+1a  00000720 R_X86_64_SIZE32   00000000   yyy \+ 10
 
-Relocation section '.rela.tdata' at offset 0x37c contains 2 entries:
+Relocation section '.rela.tdata' at offset .* contains 2 entries:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
 0+50  00000620 R_X86_64_SIZE32   00000000   xxx - 1
 0+54  00000720 R_X86_64_SIZE32   00000000   yyy \+ 2
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-size-5.d b/gas/testsuite/gas/i386/ilp32/x86-64-size-5.d
index 46d38e6..f4eb0d6 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-size-5.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-size-5.d
@@ -3,13 +3,13 @@
 #readelf: -r
 
 
-Relocation section '.rela.text' at offset 0x2d8 contains 3 entries:
+Relocation section '.rela.text' at offset .* contains 3 entries:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
 0+2  00000421 R_X86_64_SIZE64   00000000   xxx \+ 0
 0+c  00000421 R_X86_64_SIZE64   00000000   xxx - 8
 0+16  00000421 R_X86_64_SIZE64   00000000   xxx \+ 8
 
-Relocation section '.rela.data' at offset 0x2fc contains 3 entries:
+Relocation section '.rela.data' at offset .* contains 3 entries:
  Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
 0+50  00000421 R_X86_64_SIZE64   00000000   xxx - 1
 0+58  00000621 R_X86_64_SIZE64   00000000   yyy \+ c8
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-unwind.d b/gas/testsuite/gas/i386/ilp32/x86-64-unwind.d
index d92f9c4..f2c045f 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-unwind.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-unwind.d
@@ -2,7 +2,7 @@
 #readelf: -S
 #name: x86-64 (ILP32) unwind
 
-There are 8 section headers, starting at offset 0x74:
+There are 8 section headers, starting at offset 0xc8:
 
 Section Headers:
   \[Nr\] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al
@@ -12,8 +12,8 @@ Section Headers:
   \[ 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 00003c 000036 00      0   0  1
-  \[ 6\] .symtab           SYMTAB          00000000 0001b4 000050 10      7   5  4
-  \[ 7\] .strtab           STRTAB          00000000 000204 000001 00      0   0  1
+  \[ 6\] .symtab           SYMTAB          00000000 000074 000050 10      7   5  4
+  \[ 7\] .strtab           STRTAB          00000000 0000c4 000001 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\), l \(large\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
diff --git a/gas/testsuite/gas/i386/size-1.d b/gas/testsuite/gas/i386/size-1.d
index ae10fdf..ba45fa7 100644
--- a/gas/testsuite/gas/i386/size-1.d
+++ b/gas/testsuite/gas/i386/size-1.d
@@ -2,7 +2,7 @@
 #readelf: -r
 
 
-Relocation section '.rel.text' at offset 0x2dc contains 9 entries:
+Relocation section '.rel.text' at offset .* contains 9 entries:
  Offset     Info    Type            Sym.Value  Sym. Name
 0+1  00000426 R_386_SIZE32      00000000   xxx
 0+6  00000426 R_386_SIZE32      00000000   xxx
@@ -14,7 +14,7 @@ Relocation section '.rel.text' at offset 0x2dc contains 9 entries:
 0+24  00000626 R_386_SIZE32      00000020   zzz
 0+29  00000626 R_386_SIZE32      00000020   zzz
 
-Relocation section '.rel.data' at offset 0x324 contains 3 entries:
+Relocation section '.rel.data' at offset .* contains 3 entries:
  Offset     Info    Type            Sym.Value  Sym. Name
 0+50  00000426 R_386_SIZE32      00000000   xxx
 0+54  00000526 R_386_SIZE32      00000000   yyy
diff --git a/gas/testsuite/gas/i386/size-3.d b/gas/testsuite/gas/i386/size-3.d
index 4f01766..042bfe7 100644
--- a/gas/testsuite/gas/i386/size-3.d
+++ b/gas/testsuite/gas/i386/size-3.d
@@ -2,7 +2,7 @@
 #readelf: -r
 
 
-Relocation section '.rel.text' at offset 0x330 contains 6 entries:
+Relocation section '.rel.text' at offset .* contains 6 entries:
  Offset     Info    Type            Sym.Value  Sym. Name
 0+1  00000626 R_386_SIZE32      00000000   xxx
 0+6  00000626 R_386_SIZE32      00000000   xxx
@@ -11,7 +11,7 @@ Relocation section '.rel.text' at offset 0x330 contains 6 entries:
 0+15  00000726 R_386_SIZE32      00000000   yyy
 0+1a  00000726 R_386_SIZE32      00000000   yyy
 
-Relocation section '.rel.tdata' at offset 0x360 contains 2 entries:
+Relocation section '.rel.tdata' at offset .* contains 2 entries:
  Offset     Info    Type            Sym.Value  Sym. Name
 0+50  00000626 R_386_SIZE32      00000000   xxx
 0+54  00000726 R_386_SIZE32      00000000   yyy
diff --git a/gas/testsuite/gas/i386/x86-64-size-1.d b/gas/testsuite/gas/i386/x86-64-size-1.d
index 798229e..d615bd3 100644
--- a/gas/testsuite/gas/i386/x86-64-size-1.d
+++ b/gas/testsuite/gas/i386/x86-64-size-1.d
@@ -3,7 +3,7 @@
 #readelf: -r
 
 
-Relocation section '.rela.text' at offset 0x3f8 contains 9 entries:
+Relocation section '.rela.text' at offset .* contains 9 entries:
   Offset          Info           Type           Sym. Value    Sym. Name \+ Addend
 0+1  000400000020 R_X86_64_SIZE32   0000000000000000 xxx \+ 0
 0+6  000400000020 R_X86_64_SIZE32   0000000000000000 xxx - 8
@@ -15,7 +15,7 @@ Relocation section '.rela.text' at offset 0x3f8 contains 9 entries:
 0+24  000600000020 R_X86_64_SIZE32   0000000000000020 zzz - 20
 0+29  000600000020 R_X86_64_SIZE32   0000000000000020 zzz \+ 20
 
-Relocation section '.rela.data' at offset 0x4d0 contains 3 entries:
+Relocation section '.rela.data' at offset .* contains 3 entries:
   Offset          Info           Type           Sym. Value    Sym. Name \+ Addend
 0+50  000400000020 R_X86_64_SIZE32   0000000000000000 xxx - 1
 0+54  000500000020 R_X86_64_SIZE32   0000000000000000 yyy \+ 2
diff --git a/gas/testsuite/gas/i386/x86-64-size-3.d b/gas/testsuite/gas/i386/x86-64-size-3.d
index 0ce908e..c28d695 100644
--- a/gas/testsuite/gas/i386/x86-64-size-3.d
+++ b/gas/testsuite/gas/i386/x86-64-size-3.d
@@ -3,7 +3,7 @@
 #readelf: -r
 
 
-Relocation section '.rela.text' at offset 0x490 contains 6 entries:
+Relocation section '.rela.text' at offset .* contains 6 entries:
   Offset          Info           Type           Sym. Value    Sym. Name \+ Addend
 0+1  000600000020 R_X86_64_SIZE32   0000000000000000 xxx \+ 0
 0+6  000600000020 R_X86_64_SIZE32   0000000000000000 xxx - 8
@@ -12,7 +12,7 @@ Relocation section '.rela.text' at offset 0x490 contains 6 entries:
 0+15  000700000020 R_X86_64_SIZE32   0000000000000000 yyy - 10
 0+1a  000700000020 R_X86_64_SIZE32   0000000000000000 yyy \+ 10
 
-Relocation section '.rela.tdata' at offset 0x520 contains 2 entries:
+Relocation section '.rela.tdata' at offset .* contains 2 entries:
   Offset          Info           Type           Sym. Value    Sym. Name \+ Addend
 0+50  000600000020 R_X86_64_SIZE32   0000000000000000 xxx - 1
 0+54  000700000020 R_X86_64_SIZE32   0000000000000000 yyy \+ 2
diff --git a/gas/testsuite/gas/i386/x86-64-size-5.d b/gas/testsuite/gas/i386/x86-64-size-5.d
index be7e90d..791fb56 100644
--- a/gas/testsuite/gas/i386/x86-64-size-5.d
+++ b/gas/testsuite/gas/i386/x86-64-size-5.d
@@ -2,13 +2,13 @@
 #readelf: -r
 
 
-Relocation section '.rela.text' at offset 0x3f8 contains 3 entries:
+Relocation section '.rela.text' at offset .* contains 3 entries:
   Offset          Info           Type           Sym. Value    Sym. Name \+ Addend
 0+2  000400000021 R_X86_64_SIZE64   0000000000000000 xxx \+ 0
 0+c  000400000021 R_X86_64_SIZE64   0000000000000000 xxx - 8
 0+16  000400000021 R_X86_64_SIZE64   0000000000000000 xxx \+ 8
 
-Relocation section '.rela.data' at offset 0x440 contains 3 entries:
+Relocation section '.rela.data' at offset .* contains 3 entries:
   Offset          Info           Type           Sym. Value    Sym. Name \+ Addend
 0+50  000400000021 R_X86_64_SIZE64   0000000000000000 xxx - 1
 0+58  000600000021 R_X86_64_SIZE64   0000000000000000 yyy \+ c8
diff --git a/gas/testsuite/gas/i386/x86-64-unwind.d b/gas/testsuite/gas/i386/x86-64-unwind.d
index fbfc580..7842597 100644
--- a/gas/testsuite/gas/i386/x86-64-unwind.d
+++ b/gas/testsuite/gas/i386/x86-64-unwind.d
@@ -1,7 +1,7 @@
 #readelf: -S
 #name: x86-64 unwind
 
-There are 8 section headers, starting at offset 0x80:
+There are 8 section headers, starting at offset 0x100:
 
 Section Headers:
   \[Nr\] Name              Type             Address           Offset
@@ -18,9 +18,9 @@ Section Headers:
        0000000000000008  0000000000000000   A       0     0     1
   \[ 5\] \.shstrtab         STRTAB           0000000000000000  00000048
        0000000000000036  0000000000000000           0     0     1
-  \[ 6\] \.symtab           SYMTAB           0000000000000000  00000280
+  \[ 6\] \.symtab           SYMTAB           0000000000000000  00000080
        0000000000000078  0000000000000018           7     5     8
-  \[ 7\] \.strtab           STRTAB           0000000000000000  000002f8
+  \[ 7\] \.strtab           STRTAB           0000000000000000  000000f8
        0000000000000001  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 691bce7..8dbb7d8 100644
--- a/gas/testsuite/gas/ia64/alias-ilp32.d
+++ b/gas/testsuite/gas/ia64/alias-ilp32.d
@@ -3,7 +3,7 @@
 #as: -milp32
 #source: alias.s
 
-There are 8 section headers, starting at offset 0x78:
+There are 8 section headers, starting at offset .*:
 
 Section Headers:
  +\[Nr\] +Name +Type +Addr +Off +Size +ES +Flg +Lk +Inf +Al
@@ -13,8 +13,8 @@ Section Headers:
  +\[ 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 000045 000031 00 +0 +0 +1
- +\[ 6\] .symtab +SYMTAB +00000000 0001b8 000060 10 +7 +6 +4
- +\[ 7\] .strtab +STRTAB +00000000 000218 000006 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
 Key to Flags:
 #...
 
diff --git a/gas/testsuite/gas/ia64/alias.d b/gas/testsuite/gas/ia64/alias.d
index 8566e01..833e07e 100644
--- a/gas/testsuite/gas/ia64/alias.d
+++ b/gas/testsuite/gas/ia64/alias.d
@@ -1,7 +1,7 @@
 #readelf: -Ss
 #name: ia64 alias and secalias
 
-There are 8 section headers, starting at offset 0x78:
+There are 8 section headers, starting at offset .*:
 
 Section Headers:
  +\[Nr\] +Name +Type +Address +Offset
@@ -18,9 +18,9 @@ Section Headers:
  +0000000000000005 +0000000000000000 +WA +0 +0 +1
  +\[ 5\] \.shstrtab +STRTAB +0000000000000000 +00000045
  +0000000000000031 +0000000000000000 +0 +0 +1
- +\[ 6\] \.symtab +SYMTAB +0000000000000000 +00000278
+ +\[ 6\] \.symtab +SYMTAB +0000000000000000 .*
  +0000000000000090 +0000000000000018 +7 +6 +8
- +\[ 7\] \.strtab +STRTAB +0000000000000000 +00000308
+ +\[ 7\] \.strtab +STRTAB +0000000000000000 .*
  +0000000000000006 +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 3c824a7..3a20e5a 100644
--- a/gas/testsuite/gas/ia64/group-1.d
+++ b/gas/testsuite/gas/ia64/group-1.d
@@ -1,7 +1,7 @@
 #readelf: -Sg
 #name: ia64 group
 
-There are 9 section headers, starting at offset 0x98:
+There are 9 section headers, starting at offset .*:
 
 Section Headers:
   \[Nr\] Name              Type             Address           Offset
@@ -20,9 +20,9 @@ Section Headers:
        0000000000000010  0000000000000000 AXG       0     0     16
   \[ 6\] \.shstrtab         STRTAB           0000000000000000  00000060
        0000000000000033  0000000000000000           0     0     1
-  \[ 7\] \.symtab           SYMTAB           0000000000000000  000002d8
+  \[ 7\] \.symtab           SYMTAB           0000000000000000  .*
        00000000000000c0  0000000000000018           8     8     8
-  \[ 8\] \.strtab           STRTAB           0000000000000000  00000398
+  \[ 8\] \.strtab           STRTAB           0000000000000000  .*
        000000000000000c  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 3b1579c..205bd6b 100644
--- a/gas/testsuite/gas/ia64/group-2.d
+++ b/gas/testsuite/gas/ia64/group-2.d
@@ -2,7 +2,7 @@
 #as: -x
 #name: ia64 unwind group
 
-There are 12 section headers, starting at offset 0x100:
+There are 12 section headers, starting at offset .*:
 
 Section Headers:
   \[Nr\] Name              Type             Address           Offset
@@ -23,13 +23,13 @@ Section Headers:
        0000000000000010  0000000000000000  AG       0     0     8
   \[ 7\] \.gnu\.linkonce\.ia6 IA_64_UNWIND     0000000000000000  00000060
        0000000000000018  0000000000000000 ALG       5     5     8
-  \[ 8\] \.rela\.gnu\.linkonc RELA             0000000000000000  000004e0
+  \[ 8\] \.rela\.gnu\.linkonc RELA             0000000000000000  .*
        0000000000000048  0000000000000018   I      10     7     8
   \[ 9\] \.shstrtab         STRTAB           0000000000000000  00000078
        0000000000000081  0000000000000000           0     0     1
-  \[10\] \.symtab           SYMTAB           0000000000000000  00000400
+  \[10\] \.symtab           SYMTAB           0000000000000000  .*
        00000000000000d8  0000000000000018          11     9     8
-  \[11\] \.strtab           STRTAB           0000000000000000  000004d8
+  \[11\] \.strtab           STRTAB           0000000000000000  .*
        0000000000000005  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 63fc749..e1cf066 100644
--- a/gas/testsuite/gas/ia64/secname-ilp32.d
+++ b/gas/testsuite/gas/ia64/secname-ilp32.d
@@ -3,7 +3,7 @@
 #as: -milp32
 #source: secname.s
 
-There are 8 section headers, starting at offset 0x7c:
+There are 8 section headers, starting at offset .*:
 
 Section Headers:
   \[Nr\] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al
@@ -13,7 +13,7 @@ Section Headers:
   \[ 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 000048 000031 00      0   0  1
-  \[ 6\] .symtab           SYMTAB          00000000 0001bc 000050 10      7   5  4
-  \[ 7\] .strtab           STRTAB          00000000 00020c 000001 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
 Key to Flags:
 #...
diff --git a/gas/testsuite/gas/ia64/secname.d b/gas/testsuite/gas/ia64/secname.d
index f198d44..d77ac52 100644
--- a/gas/testsuite/gas/ia64/secname.d
+++ b/gas/testsuite/gas/ia64/secname.d
@@ -1,7 +1,7 @@
 #readelf: -S
 #name: ia64 section name
 
-There are 8 section headers, starting at offset 0x80:
+There are 8 section headers, starting at offset .*:
 
 Section Headers:
   \[Nr\] Name              Type             Address           Offset
@@ -18,9 +18,9 @@ Section Headers:
        0000000000000008  0000000000000000  WA       0     0     8
   \[ 5\] \.shstrtab         STRTAB           0000000000000000  00000048
        0000000000000031  0000000000000000           0     0     1
-  \[ 6\] \.symtab           SYMTAB           0000000000000000  00000280
+  \[ 6\] \.symtab           SYMTAB           0000000000000000  .*
        0000000000000078  0000000000000018           7     5     8
-  \[ 7\] \.strtab           STRTAB           0000000000000000  000002f8
+  \[ 7\] \.strtab           STRTAB           0000000000000000  .*
        0000000000000001  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 577c505..b263756 100644
--- a/gas/testsuite/gas/ia64/unwind-ilp32.d
+++ b/gas/testsuite/gas/ia64/unwind-ilp32.d
@@ -3,7 +3,7 @@
 #as: -milp32
 #source: unwind.s
 
-There are 9 section headers, starting at offset 0xa0:
+There are 9 section headers, starting at offset .*:
 
 Section Headers:
   \[Nr\] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al
@@ -14,7 +14,7 @@ Section Headers:
   \[ 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 000050 00004d 00      0   0  1
-  \[ 7\] .symtab           SYMTAB          00000000 000208 000060 10      8   6  4
-  \[ 8\] .strtab           STRTAB          00000000 000268 000001 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
 Key to Flags:
 #...
diff --git a/gas/testsuite/gas/ia64/unwind.d b/gas/testsuite/gas/ia64/unwind.d
index b4888e7..e2bfdae 100644
--- a/gas/testsuite/gas/ia64/unwind.d
+++ b/gas/testsuite/gas/ia64/unwind.d
@@ -1,7 +1,7 @@
 #readelf: -S
 #name: ia64 unwind section
 
-There are 9 section headers, starting at offset 0xa0:
+There are 9 section headers, starting at offset .*:
 
 Section Headers:
   \[Nr\] Name              Type             Address           Offset
@@ -20,9 +20,9 @@ Section Headers:
        0000000000000008  0000000000000000  AL       1     1     8
   \[ 6\] \.shstrtab         STRTAB           0000000000000000  00000050
        000000000000004d  0000000000000000           0     0     1
-  \[ 7\] \.symtab           SYMTAB           0000000000000000  000002e0
+  \[ 7\] \.symtab           SYMTAB           0000000000000000  .*
        0000000000000090  0000000000000018           8     6     8
-  \[ 8\] \.strtab           STRTAB           0000000000000000  00000370
+  \[ 8\] \.strtab           STRTAB           0000000000000000  .*
        0000000000000001  0000000000000000           0     0     1
 Key to Flags:
 #...
diff --git a/gas/testsuite/gas/mmix/bspec-1.d b/gas/testsuite/gas/mmix/bspec-1.d
index 0030ca1..63d9d62 100644
--- a/gas/testsuite/gas/mmix/bspec-1.d
+++ b/gas/testsuite/gas/mmix/bspec-1.d
@@ -1,5 +1,5 @@
 #readelf: -Ssr -x1 -x4
-There are 9 section headers, starting at offset 0x..:
+There are 9 section headers, starting at offset .*:
 #...
  +\[ 4\] \.MMIX\.spec_data\.2 +PROGBITS +0+ +0+44
  +0+4 +0+ +0 +0 +4
diff --git a/gas/testsuite/gas/mmix/bspec-2.d b/gas/testsuite/gas/mmix/bspec-2.d
index 4e549ae..a9ce03d 100644
--- a/gas/testsuite/gas/mmix/bspec-2.d
+++ b/gas/testsuite/gas/mmix/bspec-2.d
@@ -1,21 +1,21 @@
 #readelf: -Sr -x1 -x4
-There are 11 section headers, starting at offset 0x..:
+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+4..
+  \[ 5\] \.rela\.MMIX\.spec_d RELA             0+  .*
  +0+30  0+18 +I +9 +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+4..
+  \[ 7\] \.rela\.MMIX\.spec_d RELA             0+  .*
  +0+18 +0+18 +I +9 +6 +8
 #...
-Relocation section '\.rela\.MMIX\.spec_data\.2' at offset 0x4.. contains 2 entries:
+Relocation section '\.rela\.MMIX\.spec_data\.2' at offset .* contains 2 entries:
 .*
 0+  0+600000004 R_MMIX_32 +0+ +forw +\+ 0
 0+8  0+700000005 R_MMIX_64 +0+ +other +\+ 0
 
-Relocation section '\.rela\.MMIX\.spec_data\.3' at offset 0x4.. contains 1 entries:
+Relocation section '\.rela\.MMIX\.spec_data\.3' at offset .* contains 1 entries:
 .*
 0+  0+700000005 R_MMIX_64 +0+ +other +\+ 0
 
diff --git a/gas/testsuite/gas/mmix/byte-1.d b/gas/testsuite/gas/mmix/byte-1.d
index 8b816ca..0882ba5 100644
--- a/gas/testsuite/gas/mmix/byte-1.d
+++ b/gas/testsuite/gas/mmix/byte-1.d
@@ -1,5 +1,5 @@
 #readelf: -Ssrx1
-There are 7 section headers, starting at offset 0x88:
+There are 7 section headers, starting at offset .*:
 
 Section Headers:
  +\[Nr\] +Name +Type +Address +Offset
@@ -14,9 +14,9 @@ Section Headers:
  +0000000000000000 +0000000000000000 +WA +0 +0 +1
  +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +00000056
  +000000000000002c +0000000000000000 +0 +0 +1
- +\[ 5\] \.symtab +SYMTAB +0000000000000000 +00000248
+ +\[ 5\] \.symtab +SYMTAB +0000000000000000 .*
  +00000000000000c0 +0000000000000018 +6 +7 +8
- +\[ 6\] \.strtab +STRTAB +0000000000000000 +00000308
+ +\[ 6\] \.strtab +STRTAB +0000000000000000 .*
  +0000000000000018 +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 34b20bf..31d6465 100644
--- a/gas/testsuite/gas/mmix/loc-1.d
+++ b/gas/testsuite/gas/mmix/loc-1.d
@@ -1,6 +1,6 @@
 #readelf: -Ssrx1 -x2
 
-There are 7 section headers, starting at offset 0x90:
+There are 7 section headers, starting at offset .*:
 
 Section Headers:
  +\[Nr\] +Name +Type +Address +Offset
@@ -15,9 +15,9 @@ Section Headers:
  +0000000000000000 +0000000000000000 +WA +0 +0 +1
  +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +00000064
  +000000000000002c +0000000000000000 +0 +0 +1
- +\[ 5\] \.symtab +SYMTAB +0000000000000000 +00000250
+ +\[ 5\] \.symtab +SYMTAB +0000000000000000 .*
  +00000000000000c0 +0000000000000018 +6 +6 +8
- +\[ 6\] \.strtab +STRTAB +0000000000000000 +00000310
+ +\[ 6\] \.strtab +STRTAB +0000000000000000 .*
  +000000000000002a +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 9c87474..de7e5c5 100644
--- a/gas/testsuite/gas/mmix/loc-2.d
+++ b/gas/testsuite/gas/mmix/loc-2.d
@@ -1,6 +1,6 @@
 #readelf: -Ssrx1
 
-There are 7 section headers, starting at offset 0x78:
+There are 7 section headers, starting at offset .*:
 
 Section Headers:
  +\[Nr\] +Name +Type +Address +Offset
@@ -15,9 +15,9 @@ Section Headers:
  +0000000000000000 +0000000000000000 +WA +0 +0 +1
  +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +00000048
  +000000000000002c +0000000000000000 +0 +0 +1
- +\[ 5\] \.symtab +SYMTAB +0000000000000000 +00000238
+ +\[ 5\] \.symtab +SYMTAB +0000000000000000 .*
  +0000000000000090 +0000000000000018 +6 +4 +8
- +\[ 6\] \.strtab +STRTAB +0000000000000000 +000002c8
+ +\[ 6\] \.strtab +STRTAB +0000000000000000 .*
  +000000000000001a +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 702e825..a481efd 100644
--- a/gas/testsuite/gas/mmix/loc-3.d
+++ b/gas/testsuite/gas/mmix/loc-3.d
@@ -1,5 +1,5 @@
 #readelf: -Ssrx1 -x2
-There are 7 section headers, starting at offset 0x80:
+There are 7 section headers, starting at offset .*:
 
 Section Headers:
  +\[Nr\] +Name +Type +Address +Offset
@@ -14,9 +14,9 @@ Section Headers:
  +0000000000000000 +0000000000000000 +WA +0 +0 +1
  +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +00000054
  +000000000000002c +0000000000000000 +0 +0 +1
- +\[ 5\] \.symtab +SYMTAB +0000000000000000 +00000240
+ +\[ 5\] \.symtab +SYMTAB +0000000000000000 .*
  +00000000000000c0 +0000000000000018 +6 +5 +8
- +\[ 6\] \.strtab +STRTAB +0000000000000000 +00000300
+ +\[ 6\] \.strtab +STRTAB +0000000000000000 .*
  +0000000000000030 +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 baa4eb3..2e74514 100644
--- a/gas/testsuite/gas/mmix/loc-4.d
+++ b/gas/testsuite/gas/mmix/loc-4.d
@@ -1,5 +1,5 @@
 #readelf: -Ssrx1 -x2
-There are 7 section headers, starting at offset 0x88:
+There are 7 section headers, starting at offset .*:
 
 Section Headers:
  +\[Nr\] +Name +Type +Address +Offset
@@ -14,9 +14,9 @@ Section Headers:
  +0000000000000000 +0000000000000000 +WA +0 +0 +1
  +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +0000005c
  +000000000000002c +0000000000000000 +0 +0 +1
- +\[ 5\] \.symtab +SYMTAB +0000000000000000 +00000248
+ +\[ 5\] \.symtab +SYMTAB +0000000000000000 .*
  +00000000000000c0 +0000000000000018 +6 +5 +8
- +\[ 6\] \.strtab +STRTAB +0000000000000000 +00000308
+ +\[ 6\] \.strtab +STRTAB +0000000000000000 .*
  +000000000000003b +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 cf66b05..c5abf78 100644
--- a/gas/testsuite/gas/mmix/loc-5.d
+++ b/gas/testsuite/gas/mmix/loc-5.d
@@ -1,5 +1,5 @@
 #readelf: -Ssrx1 -x2
-There are 7 section headers, starting at offset 0x98:
+There are 7 section headers, starting at offset .*:
 
 Section Headers:
  +\[Nr\] +Name +Type +Address +Offset
@@ -14,9 +14,9 @@ Section Headers:
  +0+ +0+ +WA +0 +0 +1
  +\[ 4\] \.shstrtab +STRTAB +0+ +0+6c
  +0+2c +0+ +0 +0 +1
- +\[ 5\] \.symtab +SYMTAB +0+ +0+258
+ +\[ 5\] \.symtab +SYMTAB +0+ .*
  +0+c0 +0+18 +6 +6 +8
- +\[ 6\] \.strtab +STRTAB +0+ +0+318
+ +\[ 6\] \.strtab +STRTAB +0+ .*
  +0+29 +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 9eba4fd..1be90d0 100644
--- a/gas/testsuite/gas/tic6x/scomm-directive-4.d
+++ b/gas/testsuite/gas/tic6x/scomm-directive-4.d
@@ -3,7 +3,7 @@
 #source: scomm-directive-4.s
 #readelf: -Ss
 
-There are 8 section headers, starting at offset 0x88:
+There are 8 section headers, starting at offset .*:
 
 Section Headers:
   \[Nr\] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al
@@ -13,8 +13,8 @@ Section Headers:
   \[ 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 000047 00003f 00      0   0  1
-  \[ 6\] \.symtab           SYMTAB          00000000 0001c8 0000d0 10      7   5  4
-  \[ 7\] \.strtab           STRTAB          00000000 000298 00001d 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
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)