diff options
| author | Alan Modra <amodra@gmail.com> | 2013-02-21 02:29:11 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2013-02-21 02:29:11 +0000 |
| commit | 12bd695738760b28c04dd34b3ff228247ec747c9 (patch) | |
| tree | 4b6d7393eada7903b839e2d842cbd47da3c863f8 /ld | |
| parent | 9f44fbc03496a470cf661d011d9bcdcf21859726 (diff) | |
| download | fsf-binutils-gdb-12bd695738760b28c04dd34b3ff228247ec747c9.zip fsf-binutils-gdb-12bd695738760b28c04dd34b3ff228247ec747c9.tar.gz fsf-binutils-gdb-12bd695738760b28c04dd34b3ff228247ec747c9.tar.bz2 | |
bfd/
* elf-bfd.h (struct elf_obj_tdata): Rename segment_map to seg_map.
Delete num_locals and num_globals.
(elf_num_locals, elf_num_globals): Don't define.
(elf_seg_map, elf_next_file_pos, elf_eh_frame_hdr, elf_linker,
elf_stack_flags, elf_strtab_sec, elf_shstrtab_sec): Define.
* bfd.c, * elf-eh-frame.c, * elf-nacl.c, * elf-vxworks.c, * elf.c,
* elf32-arm.c, * elf32-lm32.c, * elf32-ppc.c, * elf32-rx.c,
* elf32-spu.c, * elf64-hppa.c, * elfcode.h, * elflink.c,
* elfnn-ia64.c, * elfxx-mips.c: Use newly defined elf_obj_tdata
accessor macros.
* elf.c (elf_map_symbols): Add pnum_locals param. Return
number of locals syms via new param.
(swap_out_syms): Adjust to suit elf_map_symbols change.
ld/
* emultempl/elf-generic.em: Use newly defined elf_obj_tdata
accessor macros.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/emultempl/elf-generic.em | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index b4a9230..429e4da 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2013-02-21 Alan Modra <amodra@gmail.com> + + * emultempl/elf-generic.em: Use newly defined elf_obj_tdata + accessor macros. + 2013-02-20 Alan Modra <amodra@gmail.com> * Makefile.am: Use $(ELF_DEPS) on a number of eelf*.c rules. diff --git a/ld/emultempl/elf-generic.em b/ld/emultempl/elf-generic.em index cf4c2c8..2c850f1 100644 --- a/ld/emultempl/elf-generic.em +++ b/ld/emultempl/elf-generic.em @@ -39,29 +39,27 @@ gld${EMULATION_NAME}_map_segments (bfd_boolean need_layout) { bfd_size_type phdr_size; - phdr_size = elf_tdata (link_info.output_bfd)->program_header_size; + phdr_size = elf_program_header_size (link_info.output_bfd); /* If we don't have user supplied phdrs, throw away any previous linker generated program headers. */ if (lang_phdr_list == NULL) - elf_tdata (link_info.output_bfd)->segment_map = NULL; + elf_seg_map (link_info.output_bfd) = NULL; if (!_bfd_elf_map_sections_to_segments (link_info.output_bfd, &link_info)) einfo ("%F%P: map sections to segments failed: %E\n"); - if (phdr_size - != elf_tdata (link_info.output_bfd)->program_header_size) + if (phdr_size != elf_program_header_size (link_info.output_bfd)) { if (tries > 6) /* The first few times we allow any change to phdr_size . */ need_layout = TRUE; else if (phdr_size - < elf_tdata (link_info.output_bfd)->program_header_size) + < elf_program_header_size (link_info.output_bfd)) /* After that we only allow the size to grow. */ need_layout = TRUE; else - elf_tdata (link_info.output_bfd)->program_header_size - = phdr_size; + elf_program_header_size (link_info.output_bfd) = phdr_size; } } } |