From 046183de0ebe379c1ec11188000bb6e0f64a9e0e Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Thu, 4 Aug 2005 06:22:14 +0000
Subject: bfd/ 	* elf32-ppc.c (struct elf_linker_section): Replace sym_val
 field 	with sym. 	(ppc_elf_relocate_section): Adjust for above. 
 (create_sdata_sym): New function. 	(ppc_elf_create_linker_section): Call
 it. 	(ppc_elf_check_relocs): Correct has_sda_refs and non_got_refs. 	Create
 sdata syms for all SDA relocs. 	(ppc_elf_adjust_dynamic_symbol): Don't
 special case _SDA_BASE_ 	and _SDA2_BASE_. 
 (ppc_elf_set_sdata_syms): Delete. 	* elflink.c
 (bfd_elf_size_dynamic_sections): Don't create DT_INIT 	and DT_FINI tags
 unless associated section has input. 	(bfd_elf_set_symbol,
 _bfd_elf_provide_symbol): Delete. 
 (_bfd_elf_provide_section_bound_symbols): Delete. 	* bfd-in.h
 (_bfd_elf_provide_symbol): Delete. 
 (_bfd_elf_provide_section_bound_symbols): Delete. 	* bfd-in2.h:
 Regenerate. ld/ 	* ldemul.c (ldemul_do_assignments,
 do_assignments_default): Delete. 	* ldemul.h (ldemul_do_assignments,
 do_assignments_default): Delete. 	(struct ld_emulation_xfer_struct):
 Remove do_assignments field. 	* ldlang.c (lang_do_assignments): Don't call
 ldemul_do_assignments. 	* emulparams/elf32ppc.sh
 (SDATA_START_SYMBOLS): New. 	(SDATA2_START_SYMBOLS, SBSS_START_SYMBOLS,
 SBSS_END_SYMBOLS): New. 	* emultempl/aix.em (ld_*_emulation): Delete
 do_assignments init. 	* emultempl/armcoff.em: Likewise. 	*
 emultempl/beos.em: Likewise. 	* emultempl/generic.em: Likewise. 	*
 emultempl/gld960.em: Likewise. 	* emultempl/gld960c.em: Likewise. 
 * emultempl/linux.em: Likewise. 	* emultempl/lnk960.em: Likewise. 
 * emultempl/m68kcoff.em: Likewise. 	* emultempl/pe.em: Likewise. 	*
 emultempl/sunos.em: Likewise. 	* emultempl/ticoff.em: Likewise. 	*
 emultempl/vanilla.em: Likewise. 	* emultempl/elf32.em: Likewise. 
 (gld*_provide_bound_symbols): Delete. 	(gld*_provide_init_fini_syms): Delete.
 	(gld*_before_allocation): Don't call ldemul_do_assignments. 	*
 emultempl/ppc32elf.em (ppc_do_assignments): Delete. 
 (LDEMUL_DO_ASSIGNMENTS): Delete. 	* scripttempl/elf.sc: Provide
 init/fini syms.  Add SBSS_START_SYMBOLS, 	SBSS_END_SYMBOLS,
 SDATA2_START_SYMBOLS.

---
 ld/scripttempl/elf.sc | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

(limited to 'ld/scripttempl')

diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
index 741d529..3ee8b43 100644
--- a/ld/scripttempl/elf.sc
+++ b/ld/scripttempl/elf.sc
@@ -123,10 +123,12 @@ STACKNOTE="/DISCARD/ : { *(.note.GNU-stack) }"
 if test -z "${NO_SMALL_DATA}"; then
   SBSS=".sbss         ${RELOCATING-0} :
   {
+    ${RELOCATING+${SBSS_START_SYMBOLS}}
     ${CREATE_SHLIB+*(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)}
     *(.dynsbss)
     *(.sbss${RELOCATING+ .sbss.* .gnu.linkonce.sb.*})
     *(.scommon)
+    ${RELOCATING+${SBSS_END_SYMBOLS}}
   }"
   SBSS2=".sbss2        ${RELOCATING-0} : { *(.sbss2${RELOCATING+ .sbss2.* .gnu.linkonce.sb2.*}) }"
   SDATA="/* We want the small data sections together, so single-instruction offsets
@@ -138,7 +140,11 @@ if test -z "${NO_SMALL_DATA}"; then
     ${CREATE_SHLIB+*(.sdata2 .sdata2.* .gnu.linkonce.s2.*)}
     *(.sdata${RELOCATING+ .sdata.* .gnu.linkonce.s.*})
   }"
-  SDATA2=".sdata2       ${RELOCATING-0} : { *(.sdata2${RELOCATING+ .sdata2.* .gnu.linkonce.s2.*}) }"
+  SDATA2=".sdata2       ${RELOCATING-0} :
+  {
+    ${RELOCATING+${SDATA2_START_SYMBOLS}}
+    *(.sdata2${RELOCATING+ .sdata2.* .gnu.linkonce.s2.*})
+  }"
   REL_SDATA=".rel.sdata    ${RELOCATING-0} : { *(.rel.sdata${RELOCATING+ .rel.sdata.* .rel.gnu.linkonce.s.*}) }
   .rela.sdata   ${RELOCATING-0} : { *(.rela.sdata${RELOCATING+ .rela.sdata.* .rela.gnu.linkonce.s.*}) }"
   REL_SBSS=".rel.sbss     ${RELOCATING-0} : { *(.rel.sbss${RELOCATING+ .rel.sbss.* .rel.gnu.linkonce.sb.*}) }
@@ -376,10 +382,24 @@ cat <<EOF
   .tdata	${RELOCATING-0} : { *(.tdata${RELOCATING+ .tdata.* .gnu.linkonce.td.*}) }
   .tbss		${RELOCATING-0} : { *(.tbss${RELOCATING+ .tbss.* .gnu.linkonce.tb.*})${RELOCATING+ *(.tcommon)} }
 
-  .preinit_array   ${RELOCATING-0} : { KEEP (*(.preinit_array)) }
-  .init_array   ${RELOCATING-0} : { KEEP (*(.init_array)) }
-  .fini_array   ${RELOCATING-0} : { KEEP (*(.fini_array)) }
-
+  .preinit_array   ${RELOCATING-0} :
+  {
+    ${RELOCATING+${CREATE_SHLIB-PROVIDE (__preinit_array_start = .);}}
+    KEEP (*(.preinit_array))
+    ${RELOCATING+${CREATE_SHLIB-PROVIDE (__preinit_array_end = .);}}
+  }
+  .init_array   ${RELOCATING-0} :
+  {
+     ${RELOCATING+${CREATE_SHLIB-PROVIDE (__init_array_start = .);}}
+     KEEP (*(.init_array))
+     ${RELOCATING+${CREATE_SHLIB-PROVIDE (__init_array_end = .);}}
+  }
+  .fini_array   ${RELOCATING-0} :
+  {
+    ${RELOCATING+${CREATE_SHLIB-PROVIDE (__fini_array_start = .);}}
+    KEEP (*(.fini_array))
+    ${RELOCATING+${CREATE_SHLIB-PROVIDE (__fini_array_end = .);}}
+  }
   ${SMALL_DATA_CTOR-${RELOCATING+${CTOR}}}
   ${SMALL_DATA_DTOR-${RELOCATING+${DTOR}}}
   .jcr          ${RELOCATING-0} : { KEEP (*(.jcr)) }
-- 
cgit v1.1