From 957c6e41daa2c75e9e88c85d0076f475a5810d49 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 8 Aug 2005 11:06:16 +0000 Subject: [PATCH] PR 1147 elf32-arm.c (bfd_elf32_close_and_cleanup): Define. (elf32_arm_close_and_cleanup): New function - walk over the sections in the bfd that is being closed removing them from the list of recorded sections. (unrecord_section_via_map_over_sections): New helper function. (record_section_with_arm_elf_section_data): Call bfd_malloc instead of bfd_alloc. Remove unneeded abfd parameter. (elf32_arm_new_section_hook): Do not pass bfd to record_section_with_arm_elf_section_data. elfxx-target.h (bfd_elfNN_close_and_cleanup): Only define if not already defined by the target. --- bfd/ChangeLog | 17 +++++++++++++++++ bfd/elf32-arm.c | 23 ++++++++++++++++++++--- bfd/elfxx-target.h | 2 ++ 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 2b797d4e4b3..c9366e8d2b4 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,20 @@ +2005-08-07 Nick Clifton + Paul Brook + + PR 1147 + * elf32-arm.c (bfd_elf32_close_and_cleanup): Define. + (elf32_arm_close_and_cleanup): New function - walk over the + sections in the bfd that is being closed removing them from the + list of recorded sections. + (unrecord_section_via_map_over_sections): New helper function. + (record_section_with_arm_elf_section_data): Call bfd_malloc + instead of bfd_alloc. Remove unneeded abfd parameter. + (elf32_arm_new_section_hook): Do not pass bfd to + record_section_with_arm_elf_section_data. + + * elfxx-target.h (bfd_elfNN_close_and_cleanup): Only define if not + already defined by the target. + 2005-08-05 Fred Fish * dwarf2.c (read_rangelist): Use addr_size instead of offset_size diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index 147a7a55774..ae57dd26d3c 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -6532,11 +6532,11 @@ section_list; static section_list * sections_with_arm_elf_section_data = NULL; static void -record_section_with_arm_elf_section_data (bfd * abfd, asection * sec) +record_section_with_arm_elf_section_data (asection * sec) { struct section_list * entry; - entry = bfd_alloc (abfd, sizeof (* entry)); + entry = bfd_malloc (sizeof (* entry)); if (entry == NULL) return; entry->sec = sec; @@ -6642,7 +6642,7 @@ elf32_arm_new_section_hook (bfd *abfd, asection *sec) return FALSE; sec->used_by_bfd = sdata; - record_section_with_arm_elf_section_data (abfd, sec); + record_section_with_arm_elf_section_data (sec); return _bfd_elf_new_section_hook (abfd, sec); } @@ -6739,6 +6739,22 @@ elf32_arm_write_section (bfd *output_bfd ATTRIBUTE_UNUSED, asection *sec, return FALSE; } +static void +unrecord_section_via_map_over_sections (bfd * abfd ATTRIBUTE_UNUSED, + asection * sec, + void * ignore ATTRIBUTE_UNUSED) +{ + unrecord_section_with_arm_elf_section_data (sec); +} + +static bfd_boolean +elf32_arm_close_and_cleanup (bfd * abfd) +{ + bfd_map_over_sections (abfd, unrecord_section_via_map_over_sections, NULL); + + return _bfd_elf_close_and_cleanup (abfd); +} + /* Display STT_ARM_TFUNC symbols as functions. */ static void @@ -6897,6 +6913,7 @@ const struct elf_size_info elf32_arm_size_info = { #define bfd_elf32_find_inliner_info elf32_arm_find_inliner_info #define bfd_elf32_new_section_hook elf32_arm_new_section_hook #define bfd_elf32_bfd_is_target_special_symbol elf32_arm_is_target_special_symbol +#define bfd_elf32_close_and_cleanup elf32_arm_close_and_cleanup #define elf_backend_get_symbol_type elf32_arm_get_symbol_type #define elf_backend_gc_mark_hook elf32_arm_gc_mark_hook diff --git a/bfd/elfxx-target.h b/bfd/elfxx-target.h index 624b31ce79f..2c9aa197dbb 100644 --- a/bfd/elfxx-target.h +++ b/bfd/elfxx-target.h @@ -26,7 +26,9 @@ There are two such structures here: one for big-endian machines and one for little-endian machines. */ +#ifndef bfd_elfNN_close_and_cleanup #define bfd_elfNN_close_and_cleanup _bfd_elf_close_and_cleanup +#endif #define bfd_elfNN_bfd_free_cached_info _bfd_generic_bfd_free_cached_info #ifndef bfd_elfNN_get_section_contents #define bfd_elfNN_get_section_contents _bfd_generic_get_section_contents -- 2.30.2