bfd:
commit1821882a8ee95068fce2e567af1454f6f223cf02
authorJoseph Myers <joseph@codesourcery.com>
Tue, 3 Jul 2007 15:21:30 +0000 (3 15:21 +0000)
committerJoseph Myers <joseph@codesourcery.com>
Tue, 3 Jul 2007 15:21:30 +0000 (3 15:21 +0000)
treee0e2885205a2ad77be4fdb2763aaa3b037d95f1f
parentdd915d2beab416917995a24a330e7a6a06a3a3a6
bfd:
* elf32-arm.c (elf32_arm_merge_eabi_attributes): Copy type from
input attributes if value has been copied.

ld/testsuite:
* ld-arm/attr-merge-2a.s, ld-arm/attr-merge-2b.s,
ld-arm/attr-merge-2.attr: New.
* ld-arm/arm-elf.exp (armelftests): Add new test.
bfd/ChangeLog
bfd/elf32-arm.c
ld/testsuite/ChangeLog
ld/testsuite/ld-arm/arm-elf.exp
ld/testsuite/ld-arm/attr-merge-2.attr [new file with mode: 0644]
ld/testsuite/ld-arm/attr-merge-2a.s [new file with mode: 0644]
ld/testsuite/ld-arm/attr-merge-2b.s [new file with mode: 0644]