diff options
| author | Alan Modra <amodra@gmail.com> | 2004-05-25 06:33:51 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2004-05-25 06:33:51 +0000 |
| commit | 57ceae9483c03910f7ee7ac66f3cb118c9d7d657 (patch) | |
| tree | a5653edf9e28f48685a159531cb5d8dc82fedda5 /bfd/libbfd-in.h | |
| parent | 81bb3443544bff4a3cc386acc5d4f1a6339967da (diff) | |
| download | fsf-binutils-gdb-57ceae9483c03910f7ee7ac66f3cb118c9d7d657.zip fsf-binutils-gdb-57ceae9483c03910f7ee7ac66f3cb118c9d7d657.tar.gz fsf-binutils-gdb-57ceae9483c03910f7ee7ac66f3cb118c9d7d657.tar.bz2 | |
bfd/
* elflink.c (elf_link_add_object_symbols): Don't set up merge
section data here..
* elf.c (_bfd_elf_merge_sections): .. Do it here instead.
* merge.c: Formatting. Remove unnecessary casts. Expand
bfd_get_section_alignment macro.
(struct sec_merge_sec_info): Rename "first" to "first_str". Update
use throughout file.
(_bfd_add_merge_section): Rename from _bfd_merge_section. Update
comment. Abort on dynamic or non-SEC_MERGE input. Don't test
section name to determine sinfo group, instead test output section
and alignment.
(_bfd_merge_sections): Add struct bfd_link_info param. Call
_bfd_strip_section_from_output rather than just twiddling flags.
* libbfd-in.h (_bfd_add_merge_section): Rename, update comment.
(_bfd_merge_sections): Update prototype.
* libbfd.h: Regenerate.
ld/
* ldlang.c (lang_process): Call bfd_merge_sections later, and
only when not a relocatable link.
(print_input_section): Handle SEC_EXCLUDE sections.
(size_input_section): Don't update dot on SEC_EXCLUDE sections.
(lang_do_assignments_1): Likewise.
* ldwrite.c (build_link_order): Ignore SEC_EXCLUDE input sections.
* emultempl/armelf.em (arm_elf_set_bfd_for_interworking): Likewise.
* emultempl/hppaelf.em (build_section_lists): Likewise.
* emultempl/ppc64elf.em (build_toc_list): Likewise.
(build_section_lists): Likewise.
Diffstat (limited to 'bfd/libbfd-in.h')
| -rw-r--r-- | bfd/libbfd-in.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h index 956727d..fd7f296 100644 --- a/bfd/libbfd-in.h +++ b/bfd/libbfd-in.h @@ -520,15 +520,15 @@ extern bfd_boolean _bfd_write_stab_strings extern bfd_vma _bfd_stab_section_offset (bfd *, void **, asection *, void **, bfd_vma); -/* Attempt to merge a SEC_MERGE section. */ +/* Register a SEC_MERGE section as a candidate for merging. */ -extern bfd_boolean _bfd_merge_section +extern bfd_boolean _bfd_add_merge_section (bfd *, void **, asection *, void **); /* Attempt to merge SEC_MERGE sections. */ extern bfd_boolean _bfd_merge_sections - (bfd *, void *, void (*) (bfd *, asection *)); + (bfd *, struct bfd_link_info *, void *, void (*) (bfd *, asection *)); /* Write out a merged section. */ |