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.

2 files changed, 4 insertions, 4 deletions

diff --git a/ld/testsuite/ld-aarch64/emit-relocs-local-addend.d b/ld/testsuite/ld-aarch64/emit-relocs-local-addend.d
index 9d652c2..a5ce63d 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-local-addend.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-local-addend.d
@@ -3,14 +3,14 @@
 #ld: -T relocs.ld -e0 --emit-relocs
 #readelf: -r
 
-Relocation section '\.rela\.text' at offset 0x102f8 contains 4 entries:
+Relocation section '\.rela\.text' at offset .* contains 4 entries:
   Offset          Info           Type           Sym\. Value    Sym\. Name \+ Addend
 000000010000  000200000113 R_AARCH64_ADR_PRE 0000000000010018 \.rodata \+ 0
 000000010004  000200000115 R_AARCH64_ADD_ABS 0000000000010018 \.rodata \+ 0
 00000001000c  000200000113 R_AARCH64_ADR_PRE 0000000000010018 \.rodata \+ 10
 000000010010  000200000115 R_AARCH64_ADD_ABS 0000000000010018 \.rodata \+ 10
 
-Relocation section '\.rela\.rodata' at offset 0x10358 contains 2 entries:
+Relocation section '\.rela\.rodata' at offset .* contains 2 entries:
   Offset          Info           Type           Sym\. Value    Sym. Name \+ Addend
 000000010020  000200000101 R_AARCH64_ABS64   0000000000010018 \.rodata \+ 0
 000000010030  000200000101 R_AARCH64_ABS64   0000000000010018 \.rodata \+ 10
diff --git a/ld/testsuite/ld-aarch64/local-addend-r.d b/ld/testsuite/ld-aarch64/local-addend-r.d
index c8c2777..eb81404 100644
--- a/ld/testsuite/ld-aarch64/local-addend-r.d
+++ b/ld/testsuite/ld-aarch64/local-addend-r.d
@@ -3,14 +3,14 @@
 #ld: -e0 -r
 #readelf: -r
 
-Relocation section '\.rela\.text' at offset 0x338 contains 4 entries:
+Relocation section '\.rela\.text' at offset .* contains 4 entries:
   Offset          Info           Type           Sym\. Value    Sym\. Name \+ Addend
 000000000000  000200000113 R_AARCH64_ADR_PRE 0000000000000000 \.rodata \+ 0
 000000000004  000200000115 R_AARCH64_ADD_ABS 0000000000000000 \.rodata \+ 0
 00000000000c  000200000113 R_AARCH64_ADR_PRE 0000000000000000 \.rodata \+ 10
 000000000010  000200000115 R_AARCH64_ADD_ABS 0000000000000000 \.rodata \+ 10
 
-Relocation section '\.rela\.rodata' at offset 0x398 contains 2 entries:
+Relocation section '\.rela\.rodata' at offset .* contains 2 entries:
   Offset          Info           Type           Sym\. Value    Sym. Name \+ Addend
 000000000008  000200000101 R_AARCH64_ABS64   0000000000000000 \.rodata \+ 0
 000000000018  000200000101 R_AARCH64_ABS64   0000000000000000 \.rodata \+ 10