OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* ld/testsuite/ld-arm/arm-merge-incompatible.d: New test. 

* ld/testsuite/ld-arm/arm-merge-incompatiblea.s: Likewise.
	* ld/testsuite/ld-arm/arm-merge-incompatibleb.s: Likewise.
	* ld/testsuite/ld-arm/arm-elf.exp: Run the new test.
	* bfd/elf32-arm.c (elf32_arm_merge_eabi_attributes): Add a check of the
	return value from the call to _bfd_elf_merge_object_attributes.
This commit is contained in:
Matthew Gretton-Dann 2010-03-02 11:40:24 +00:00
parent 772657e995
commit 5488d830ec
7 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2010-03-02 Matthew Gretton-Dann <matthew.gretton-dann@arm.com>
* elf32-arm.c (elf32_arm_merge_eabi_attributes): Add a check of the
return value from the call to _bfd_elf_merge_object_attributes.
2010-03-02 Christophe Lyon <christophe.lyon@st.com>
Alan Modra <amodra@gmail.com>

3
bfd/elf32-arm.c
View File

@ -10340,7 +10340,8 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd)
}
/* Merge Tag_compatibility attributes and any common GNU ones. */
_bfd_elf_merge_object_attributes (ibfd, obfd);
if (!_bfd_elf_merge_object_attributes (ibfd, obfd))
return FALSE;
/* Check for any attributes not known on ARM. */
in_list = elf_other_obj_attributes_proc (ibfd);

7
ld/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2010-03-02 Matthew Gretton-Dann <matthew.gretton-dann@arm.com>
* ld-arm/arm-merge-incompatible.d: New test.
* ld-arm/arm-merge-incompatiblea.s: Likewise.
* ld-arm/arm-merge-incompatibleb.s: Likewise.
* ld-arm/arm-elf.exp: Run the new test.
2010-03-02 Christophe Lyon <christophe.lyon@st.com>
Alan Modra <amodra@gmail.com>

1
ld/testsuite/ld-arm/arm-elf.exp
View File

@ -510,3 +510,4 @@ run_dump_test "attr-merge-vfp-4"
run_dump_test "attr-merge-vfp-4r"
run_dump_test "attr-merge-vfp-5"
run_dump_test "attr-merge-vfp-5r"
run_dump_test "attr-merge-incompatible"

5
ld/testsuite/ld-arm/attr-merge-incompatible.d Normal file
View File

@ -0,0 +1,5 @@
#source: attr-merge-incompatibleb.s
#source: attr-merge-incompatiblea.s
#as:
#ld:
#error: Object has vendor-specific contents that must be processed by the '.+' toolchain

1
ld/testsuite/ld-arm/attr-merge-incompatiblea.s Normal file
View File

@ -0,0 +1 @@
.eabi_attribute Tag_compatibility, 1, "Random Toolchain Vendor"

1
ld/testsuite/ld-arm/attr-merge-incompatibleb.s Normal file
View File

@ -0,0 +1 @@
.eabi_attribute Tag_compatibility, 1, "gnu"