This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
powerpc linker provided syms
- From: Alan Modra <amodra at bigpond dot net dot au>
- To: binutils at sources dot redhat dot com
- Date: Sat, 16 Jul 2005 13:01:19 +0930
- Subject: powerpc linker provided syms
This changes the powerpc linker code that provides special section
symbols to work similarly to the init/fini section sym code.
bfd/
* elf32-ppc.c (ppc_elf_set_sdata_syms): Return void. Remove hack
for zero size sections. Don't set .sbss syms here.
* elf32-ppc.h (ppc_elf_set_sdata_syms): Adjust prototype.
ld/
* emultempl/elf32.em (gld*_provide_init_fini_syms): Prototype.
(gld*_before_allocation): Call ldemul_do_assignments rather than
gld*_provide_init_fini_syms directly.
* emultempl/ppc32elf.em (gld*_after_allocation): Delete.
(ppc_do_assignments): New function.
(LDEMUL_AFTER_ALLOCATION): Don't define.
(LDEMUL_DO_ASSIGNMENTS): Define.
Index: bfd/elf32-ppc.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-ppc.c,v
retrieving revision 1.173
diff -u -p -r1.173 elf32-ppc.c
--- bfd/elf32-ppc.c 14 Jul 2005 13:54:16 -0000 1.173
+++ bfd/elf32-ppc.c 16 Jul 2005 02:28:27 -0000
@@ -5261,7 +5294,7 @@ ppc_elf_relax_section (bfd *abfd,
statement runs the risk of section alignment affecting where the
section starts. */
-bfd_boolean
+void
ppc_elf_set_sdata_syms (bfd *obfd, struct bfd_link_info *info)
{
struct ppc_elf_link_hash_table *htab;
@@ -5286,16 +5319,9 @@ ppc_elf_set_sdata_syms (bfd *obfd, struc
if (s)
{
/* VxWorks executables are relocatable, so the sdata base symbols
- must be section-relative. If the section is zero sized leave
- them as absolute symbols to avoid creationg an unused
- output section. */
+ must be section-relative. */
val = 32768;
lsect->sym_val = val + s->vma;
- if (s->size == 0)
- {
- val += s->vma;
- s = NULL;
- }
}
else
{
@@ -5305,13 +5331,6 @@ ppc_elf_set_sdata_syms (bfd *obfd, struc
_bfd_elf_provide_symbol (info, lsect->sym_name, val, s);
}
-
- s = bfd_get_section_by_name (obfd, ".sbss");
- _bfd_elf_provide_section_bound_symbols (info, s,
- "__sbss_start", "__sbss_end");
- _bfd_elf_provide_section_bound_symbols (info, s,
- "___sbss_start", "___sbss_end");
- return TRUE;
}
/* Fill in the address for a pointer generated in a linker section. */
Index: bfd/elf32-ppc.h
===================================================================
RCS file: /cvs/src/src/bfd/elf32-ppc.h,v
retrieving revision 1.7
diff -u -p -r1.7 elf32-ppc.h
--- bfd/elf32-ppc.h 11 May 2005 14:09:43 -0000 1.7
+++ bfd/elf32-ppc.h 16 Jul 2005 02:28:27 -0000
@@ -20,4 +20,4 @@ Foundation, Inc., 51 Franklin Street - F
int ppc_elf_select_plt_layout (bfd *, struct bfd_link_info *, int);
asection *ppc_elf_tls_setup (bfd *, struct bfd_link_info *);
bfd_boolean ppc_elf_tls_optimize (bfd *, struct bfd_link_info *);
-bfd_boolean ppc_elf_set_sdata_syms (bfd *, struct bfd_link_info *);
+void ppc_elf_set_sdata_syms (bfd *, struct bfd_link_info *);
Index: ld/emultempl/elf32.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/elf32.em,v
retrieving revision 1.152
diff -u -p -r1.152 elf32.em
--- ld/emultempl/elf32.em 15 Jul 2005 12:19:14 -0000 1.152
+++ ld/emultempl/elf32.em 16 Jul 2005 02:28:54 -0000
@@ -57,6 +57,7 @@ Foundation, Inc., 51 Franklin Street - F
/* Declare functions used by various EXTRA_EM_FILEs. */
static void gld${EMULATION_NAME}_before_parse (void);
static void gld${EMULATION_NAME}_after_open (void);
+static void gld${EMULATION_NAME}_provide_init_fini_syms (void);
static void gld${EMULATION_NAME}_before_allocation (void);
static bfd_boolean gld${EMULATION_NAME}_place_orphan
(lang_input_statement_type *file, asection *s);
@@ -1097,7 +1098,7 @@ gld${EMULATION_NAME}_before_allocation (
referred to by dynamic objects. */
lang_for_each_statement (gld${EMULATION_NAME}_find_statement_assignment);
- gld${EMULATION_NAME}_provide_init_fini_syms ();
+ ldemul_do_assignments ();
/* Let the ELF backend work out the sizes of any sections required
by dynamic linking. */
Index: ld/emultempl/ppc32elf.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/ppc32elf.em,v
retrieving revision 1.8
diff -u -p -r1.8 ppc32elf.em
--- ld/emultempl/ppc32elf.em 5 Jul 2005 13:25:56 -0000 1.8
+++ ld/emultempl/ppc32elf.em 16 Jul 2005 02:28:54 -0000
@@ -118,13 +118,20 @@ ppc_before_allocation (void)
}
static void
-gld${EMULATION_NAME}_after_allocation (void)
+ppc_do_assignments (void)
{
+ asection *s;
+
if (is_ppc_elf32_vec (link_info.hash->creator))
- {
- if (!ppc_elf_set_sdata_syms (output_bfd, &link_info))
- einfo ("%X%P: cannot set sdata syms %E\n");
- }
+ ppc_elf_set_sdata_syms (output_bfd, &link_info);
+
+ s = bfd_get_section_by_name (output_bfd, ".sbss");
+ _bfd_elf_provide_section_bound_symbols (&link_info, s,
+ "__sbss_start", "__sbss_end");
+ _bfd_elf_provide_section_bound_symbols (&link_info, s,
+ "___sbss_start", "___sbss_end");
+
+ gld${EMULATION_NAME}_provide_init_fini_syms ();
}
EOF
@@ -170,4 +177,4 @@ PARSE_AND_LIST_ARGS_CASES='
#
LDEMUL_AFTER_OPEN=ppc_after_open
LDEMUL_BEFORE_ALLOCATION=ppc_before_allocation
-LDEMUL_AFTER_ALLOCATION=gld${EMULATION_NAME}_after_allocation
+LDEMUL_DO_ASSIGNMENTS=ppc_do_assignments
--
Alan Modra
IBM OzLabs - Linux Technology Centre