diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2007-06-26 13:55:04 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2007-06-26 13:55:04 +0000 |
| commit | 3d3e6f9a7c84090b7955feddb458bab21314714d (patch) | |
| tree | 2b87df84d6d154008ab72730670aa8d6634692c7 /bfd | |
| parent | a46ed97fe4659094a3835a3909813b6ee1ff02c9 (diff) | |
| download | gdb-3d3e6f9a7c84090b7955feddb458bab21314714d.zip gdb-3d3e6f9a7c84090b7955feddb458bab21314714d.tar.gz gdb-3d3e6f9a7c84090b7955feddb458bab21314714d.tar.bz2 | |
bfd:
* elf32-arm.c (copy_eabi_attributes): Copy type of attributes.
ld/testsuite:
* ld-arm/attr-merge.s, ld-arm/attr-merge.attr: New.
* ld-arm/arm-elf.exp (armelftests): Add new test.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/elf32-arm.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 6b396db..a18f205 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2007-06-26 Joseph Myers <joseph@codesourcery.com> + + * elf32-arm.c (copy_eabi_attributes): Copy type of attributes. + 2007-06-25 Richard Sandiford <richard@codesourcery.com> * elfxx-mips.c (mips_elf_calculate_relocation): Allow local stubs diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index 6c85e52..bf4f49f 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -6969,6 +6969,7 @@ copy_eabi_attributes (bfd *ibfd, bfd *obfd) out_attr = &elf32_arm_tdata (obfd)->known_eabi_attributes[4]; for (i = 4; i < NUM_KNOWN_ATTRIBUTES; i++) { + out_attr->type = in_attr->type; out_attr->i = in_attr->i; if (in_attr->s && *in_attr->s) out_attr->s = attr_strdup (obfd, in_attr->s); |