ELF ld -r scripts

"ld -r" generally should not combine object file sections with
different names.  For example, "ld -r" should not combine ".text",
".text.hot" and ".text.cold" into an output ".text" section.  An
exception needs to be made for linker created sections, for example,
branch trampoline sections that might be created even for ld -r.

"ld -r" also should not define symbols in linker scripts.  Any
definitions are likely to conflict with those defined at final link.

A MEMORY spec is also not needed for ld -r.

	* Makefile.am (eelf32btsmip_fbsd.c, eelf32btsmipn32_fbsd.c),
	(eelf32epiphany.c, eelf32epiphany_4x4.c, eelf32ltsmip_fbsd.c),
	(eelf32ltsmipn32_fbsd.c, eelf32xc16x.c, eelf32xc16xl.c),
	(eelf32xc16xs.c, emcorepe.c, enios2elf.c, enios2linux.c),
	(eelf64btsmip_fbsd.c, eelf64ltsmip_fbsd.c): Correct dependencies.
	* Makefile.in: Regenerate.
	* emulparams/aarch64cloudabi.sh, * emulparams/aarch64fbsd.sh,
	* emulparams/aarch64linux.sh, * emulparams/aarch64linux32.sh,
	* emulparams/arc-nps.sh, * emulparams/elf32_spu.sh,
	* emulparams/elf32_tic6x_le.sh, * emulparams/elf32bmip.sh,
	* emulparams/elf32btsmipn32.sh, * emulparams/elf32lr5900n32.sh,
	* emulparams/elf32mep.sh, * emulparams/elf32metag.sh,
	* emulparams/elf64btsmip.sh, * emulparams/shelf_vxworks.sh,
	* emulparams/shlelf_fd.sh, * scripttempl/DWARF.sc,
	* scripttempl/alpha.sc, * scripttempl/alphavms.sc,
	* scripttempl/arclinux.sc, * scripttempl/armbpabi.sc,
	* scripttempl/avr.sc, * scripttempl/dlx.sc, * scripttempl/elf.sc,
	* scripttempl/elf32cr16.sc, * scripttempl/elf32cr16c.sc,
	* scripttempl/elf32crx.sc, * scripttempl/elf32msp430.sc,
	* scripttempl/elf32msp430_3.sc, * scripttempl/elf32xc16x.sc,
	* scripttempl/elf32xc16xl.sc, * scripttempl/elf32xc16xs.sc,
	* scripttempl/elf64hppa.sc, * scripttempl/elf_chaos.sc,
	* scripttempl/elfarc.sc, * scripttempl/elfarcv2.sc,
	* scripttempl/elfd10v.sc, * scripttempl/elfd30v.sc,
	* scripttempl/elfm68hc11.sc, * scripttempl/elfm68hc12.sc,
	* scripttempl/elfm9s12z.sc, * scripttempl/elfmicroblaze.sc,
	* scripttempl/elfxgate.sc, * scripttempl/elfxtensa.sc,
	* scripttempl/epiphany_4x4.sc, * scripttempl/ft32.sc,
	* scripttempl/hppaelf.sc, * scripttempl/ia64vms.sc,
	* scripttempl/ip2k.sc, * scripttempl/iq2000.sc,
	* scripttempl/mep.sc, * scripttempl/mmo.sc,
	* scripttempl/nds32elf.sc, * scripttempl/pru.sc,
	* scripttempl/sh.sc, * scripttempl/v850.sc,
	* scripttempl/v850_rh850.sc, * scripttempl/visium.sc,
	* scripttempl/xstormy16.sc: Condition various parts of scripts on
	${RELOCATABLE} in order to prevent ld -r merging sections or
	defining symbols.  Remove MEMORY and VERSION definitions from
	ld -r scripts too.
	* testsuite/ld-elf/group2.d, * testsuite/ld-elf/group4.d,
	* testsuite/ld-elf/group5.d, * testsuite/ld-elf/group6.d,
	* testsuite/ld-elf/group7.d, * testsuite/ld-elf/group8a.d,
	* testsuite/ld-elf/group8b.d, * testsuite/ld-elf/group9a.d,
	* testsuite/ld-elf/group9b.d, * testsuite/ld-elf/pr17550a.d,
	* testsuite/ld-elf/pr17550b.d,
	* testsuite/ld-elf/pr17550d.d: Don't xfail cr16 and crx.
	* testsuite/ld-elf/init-fini-arrays.d,
	* testsuite/ld-elf/pr22677.d: Likewise, and dont' xfail mep.

1 files changed, 20 insertions, 21 deletions

diff --git a/ld/scripttempl/elfmicroblaze.sc b/ld/scripttempl/elfmicroblaze.sc
index d8f7569..4a7c196 100644
--- a/ld/scripttempl/elfmicroblaze.sc
+++ b/ld/scripttempl/elfmicroblaze.sc
@@ -63,9 +63,9 @@ ${RELOCATING+${LIB_SEARCH_DIRS}}
 
 ${RELOCATING+ENTRY (${ENTRY})}
 
-_TEXT_START_ADDR = DEFINED(_TEXT_START_ADDR) ? _TEXT_START_ADDR : 0x50;
+${RELOCATING+_TEXT_START_ADDR = DEFINED(_TEXT_START_ADDR) ? _TEXT_START_ADDR : 0x50;
 _HEAP_SIZE = DEFINED(_HEAP_SIZE) ? _HEAP_SIZE : 0x0;
-_STACK_SIZE = DEFINED(_STACK_SIZE) ? _STACK_SIZE : 0x400;
+_STACK_SIZE = DEFINED(_STACK_SIZE) ? _STACK_SIZE : 0x400;}
 
 SECTIONS
 {
@@ -79,7 +79,7 @@ SECTIONS
 
   ${RELOCATING+ _ftext  =  .;}
   .text : {
-    ${RELOCATING+*(.text)}
+    *(.text)
     ${RELOCATING+*(.text.*)}
     ${RELOCATING+*(.gnu.linkonce.t.*)}
   }
@@ -103,10 +103,10 @@ SECTIONS
   ${RELOCATING+ . = ALIGN(4);}
    ${RELOCATING+ _frodata = . ;}
   .rodata : {
-    ${RELOCATING+*(.rodata)}
+    *(.rodata)
     ${RELOCATING+*(.rodata.*)}
     ${RELOCATING+*(.gnu.linkonce.r.*)}
-    ${CONSTRUCTING+CONSTRUCTORS}; /* Is this needed? */
+    ${CONSTRUCTING+CONSTRUCTORS;} /* Is this needed? */
   }
   ${RELOCATING+ _erodata = .;}
 
@@ -115,14 +115,14 @@ SECTIONS
   ${RELOCATING+. = ALIGN(8);}
   ${RELOCATING+ _ssrw = .;}
   .sdata2 : {
-    ${RELOCATING+*(.sdata2)}
+    *(.sdata2)
     ${RELOCATING+*(.sdata2.*)}
     ${RELOCATING+*(.gnu.linkonce.s2.*)}
   }
   ${RELOCATING+. = ALIGN(4);}
   .sbss2 : {
     ${RELOCATING+PROVIDE (__sbss2_start = .);}
-    ${RELOCATING+*(.sbss2)}
+    *(.sbss2)
     ${RELOCATING+*(.sbss2.*)}
     ${RELOCATING+*(.gnu.linkonce.sb2.*)}
     ${RELOCATING+PROVIDE (__sbss2_end = .);}
@@ -135,36 +135,36 @@ SECTIONS
   ${RELOCATING+ . = ALIGN(4);}
   ${RELOCATING+ _fdata = .;}
   .data : {
-    ${RELOCATING+*(.data)}
+    *(.data)
     ${RELOCATING+*(.gnu.linkonce.d.*)}
-    ${CONSTRUCTING+CONSTRUCTORS}; /* Is this needed? */
+    ${CONSTRUCTING+CONSTRUCTORS;} /* Is this needed? */
   }
   ${RELOCATING+ _edata = . ;}
 
    /* Added to handle pic code */
   .got : {
-    ${RELOCATING+*(.got)}
+    *(.got)
   }
 
   .got1 : {
-    ${RELOCATING+*(.got1)}
+    *(.got1)
   }
 
   .got2 : {
-    ${RELOCATING+*(.got2)}
+    *(.got2)
   }
 
   /* Added by Sathya to handle C++ exceptions */
   .eh_frame : {
-    ${RELOCATING+*(.eh_frame)}
+    *(.eh_frame)
   }
 
   .jcr : {
-    ${RELOCATING+*(.jcr)}
+    *(.jcr)
   }
 
   .gcc_except_table : {
-    ${RELOCATING+*(.gcc_except_table)}
+    *(.gcc_except_table)
   }
 
   /* Alignments by 8 to ensure that _SDA_BASE_ on a word boundary */
@@ -172,14 +172,14 @@ SECTIONS
   ${RELOCATING+. = ALIGN(8);}
   ${RELOCATING+ _ssro = .;}
   .sdata : {
-    ${RELOCATING+*(.sdata)}
+    *(.sdata)
     ${RELOCATING+*(.sdata.*)}
     ${RELOCATING+*(.gnu.linkonce.s.*)}
   }
   ${RELOCATING+. = ALIGN(4);}
   .sbss : {
     ${RELOCATING+PROVIDE (__sbss_start = .);}
-    ${RELOCATING+*(.sbss)}
+    *(.sbss)
     ${RELOCATING+*(.sbss.*)}
     ${RELOCATING+*(.gnu.linkonce.sb.*)}
     ${RELOCATING+PROVIDE (__sbss_end = .);}
@@ -193,14 +193,13 @@ SECTIONS
   ${RELOCATING+ _fbss = .;}
   .bss : {
     ${RELOCATING+PROVIDE (__bss_start = .);}
-    ${RELOCATING+*(.bss)}
+    *(.bss)
     ${RELOCATING+*(.bss.*)}
     ${RELOCATING+*(.gnu.linkonce.b.*)}
     ${RELOCATING+*(COMMON)}
     ${RELOCATING+. = ALIGN(. != 0 ? 4 : 1);}
 
     ${RELOCATING+PROVIDE (__bss_end = .);}
-
   }
 
   ${RELOCATING+ . = ALIGN(4);}
@@ -223,12 +222,12 @@ SECTIONS
   }
 
   .tdata : {
-    ${RELOCATING+*(.tdata)}
+    *(.tdata)
     ${RELOCATING+*(.tdata.*)}
     ${RELOCATING+*(.gnu.linkonce.td.*)}
   }
   .tbss : {
-    ${RELOCATING+*(.tbss)}
+    *(.tbss)
     ${RELOCATING+*(.tbss.*)}
     ${RELOCATING+*(.gnu.linkonce.tb.*)}
   }