diff options
| author |   Andrew Stubbs <andrew.stubbs@st.com> | 2009-01-15 13:03:05 +0000 |
|---|---|---|
| committer | Andrew Stubbs <andrew.stubbs@st.com> | 2009-01-15 13:03:05 +0000 |
| commit | 7b86a9faa6465b353dd45db5cc9f37b2e6bb7ce8 (patch) | |
| tree | 31002800a9c7f034808bfaa380be692268b97a0f /bfd/elf32-arm.c | |
| parent | * configure.ac (ia64*-*-*vms*): Add case with no gdb or ld support. (diff) | |
| download | binutils-gdb-7b86a9faa6465b353dd45db5cc9f37b2e6bb7ce8.tar.gz binutils-gdb-7b86a9faa6465b353dd45db5cc9f37b2e6bb7ce8.tar.bz2 binutils-gdb-7b86a9faa6465b353dd45db5cc9f37b2e6bb7ce8.zip | |
2009-01-15 Andrew Stubbs <ams@codesourcery.com>
bfd/
* elf-attrs.c (bfd_elf_add_obj_attr_compat): Rename to
bfd_elf_add_obj_attr_int_string.
Read Tag_compatibility from its new location in the attribute array,
rather than the attribute list.
(_bfd_elf_copy_obj_attributes): bfd_elf_add_obj_attr_compat ->
bfd_elf_add_obj_attr_int_string.
(_bfd_elf_parse_attributes): Likewise.
(_bfd_elf_merge_object_attributes): There's now only one
Tag_compatibility, and it's in the array, not the list.
* elf-bfd.h (NUM_KNOWN_OBJ_ATTRIBUTES): Set to 33 to include
Tag_compatibility.
(bfd_elf_add_obj_attr_compat): Rename to
bfd_elf_add_obj_attr_int_string.
(bfd_elf_add_proc_attr_compat): Rename to
bfd_elf_add_proc_attr_int_string.
* elf32-arm.c (elf32_arm_merge_eabi_attributes): Explicitly don't handle
Tag_compatibility.
gas/
* read.c (s_vendor_attribute): bfd_elf_add_obj_attr_compat ->
bfd_elf_add_obj_attr_int_string.
Diffstat (limited to 'bfd/elf32-arm.c')
| -rw-r--r-- | bfd/elf32-arm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index 8b65dfc0456..705d4fc3882 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -8375,6 +8375,10 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd) } break; + case Tag_compatibility: + /* Merged in target-independent code. */ + break; + default: /* All known attributes should be explicitly covered. */ abort (); } @@ -8402,12 +8406,7 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd) /* Check for any attributes not known on ARM. */ in_list = elf_other_obj_attributes_proc (ibfd); - while (in_list && in_list->tag == Tag_compatibility) - in_list = in_list->next; - out_list = elf_other_obj_attributes_proc (obfd); - while (out_list && out_list->tag == Tag_compatibility) - out_list = out_list->next; for (; in_list != NULL; ) { |