diff options
| author | Terry Guo <terry.guo@arm.com> | 2014-09-16 13:08:22 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2014-09-16 13:08:22 +0100 |
| commit | 70e99720f9d558263756a482ae750b263ffd92ba (patch) | |
| tree | 893354caf187ada3cfa61d98392b320a99d324ea /ld/testsuite/ld-arm/attr-merge-arch-2.d | |
| parent | 428b16bd5a3947e3a608f0c6751a8be7dbd88959 (diff) | |
| download | gdb-70e99720f9d558263756a482ae750b263ffd92ba.zip gdb-70e99720f9d558263756a482ae750b263ffd92ba.tar.gz gdb-70e99720f9d558263756a482ae750b263ffd92ba.tar.bz2 | |
Make the linker return an error status if it fails to merge ARM binaries with
different architecture tags. Add a test case to make sure that this works,
and update readelf so that it will not seg-fault when trying to display the
attributes of binaries with invalid architecture tags.
* elf32-arm.c (elf32_arm_merge_eabi_attributes): Return false if
failed to merge.
* ld-arm/attr-merge-arch-2.d: New test case.
* ld-arm/attr-merge-arch-2a.s: New test case source file.
* ld-arm/attr-merge-arch-2b.s: Likewise.
* ld-arm/arm-elf.exp: Run new test case.
* readelf.c (display_arm_attribute): Use unsigned int type for
tag, val and type variables.
Diffstat (limited to 'ld/testsuite/ld-arm/attr-merge-arch-2.d')
| -rw-r--r-- | ld/testsuite/ld-arm/attr-merge-arch-2.d | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ld/testsuite/ld-arm/attr-merge-arch-2.d b/ld/testsuite/ld-arm/attr-merge-arch-2.d new file mode 100644 index 0000000..0e98edb --- /dev/null +++ b/ld/testsuite/ld-arm/attr-merge-arch-2.d @@ -0,0 +1,5 @@ +#source: attr-merge-arch-2a.s +#source: attr-merge-arch-2b.s +#as: +#ld: -e main +#error: Conflicting CPU architectures 13/0 |