diff options
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf32-ppc.c | 18 | ||||
| -rw-r--r-- | bfd/elf32-ppc.h | 2 | ||||
| -rw-r--r-- | ld/ChangeLog | 10 | ||||
| -rw-r--r-- | ld/emultempl/elf32.em | 3 | ||||
| -rw-r--r-- | ld/emultempl/ppc32elf.em | 19 |
6 files changed, 34 insertions, 24 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 56319a32c1..7870c6005f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,11 @@ 2005-07-16 Alan Modra <amodra@bigpond.net.au> + * 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. + +2005-07-16 Alan Modra <amodra@bigpond.net.au> + * Makefile.am: Run "make dep-am". * Makefile.in: Regenerate. diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index d4ef6120d2..16d11c40f0 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -5261,7 +5261,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 +5286,9 @@ ppc_elf_set_sdata_syms (bfd *obfd, struct bfd_link_info *info) 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 +5298,6 @@ ppc_elf_set_sdata_syms (bfd *obfd, struct bfd_link_info *info) _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. */ diff --git a/bfd/elf32-ppc.h b/bfd/elf32-ppc.h index fa8ffc44dc..2bec595392 100644 --- a/bfd/elf32-ppc.h +++ b/bfd/elf32-ppc.h @@ -20,4 +20,4 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. 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 *); diff --git a/ld/ChangeLog b/ld/ChangeLog index 04e6d1a4d5..7cdf1147da 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,15 @@ 2005-07-16 Alan Modra <amodra@bigpond.net.au> + * 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. + +2005-07-16 Alan Modra <amodra@bigpond.net.au> + * Makefile.am: Run "make dep-am". (emipsidt.c, emipsidtl.c): Depend on generic.em. * Makefile.in: Regenerate. diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index 3899a02df6..b04d624ade 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em @@ -57,6 +57,7 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. /* 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 (void) 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. */ diff --git a/ld/emultempl/ppc32elf.em b/ld/emultempl/ppc32elf.em index 9a64da26c8..ba59b80a97 100644 --- a/ld/emultempl/ppc32elf.em +++ b/ld/emultempl/ppc32elf.em @@ -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 |