diff options
author | Terry Guo <terry.guo@arm.com> | 2015-02-26 14:11:41 +0800 |
---|---|---|
committer | Terry Guo <terry.guo@arm.com> | 2015-02-26 14:11:41 +0800 |
commit | 99654aaf360c38a7bff69be8c175a78b83a7d263 (patch) | |
tree | 45ebe020964fc5a8d84bbc4ce6f57b5d86b7d0da /ld | |
parent | a127494f2dcad834743e613be4cfea39511ad5ec (diff) | |
download | gdb-99654aaf360c38a7bff69be8c175a78b83a7d263.zip gdb-99654aaf360c38a7bff69be8c175a78b83a7d263.tar.gz gdb-99654aaf360c38a7bff69be8c175a78b83a7d263.tar.bz2 |
[ARM]Update for Tag_ABI_HardFP_use per EABI doc
Updated how we merge and display this attribute per the latest
EABI documents.
bfd/ChangeLog
* elf32-arm.c (elf32_arm_merge_eabi_attributes): Update how we
merge Tag_ABI_HardFP_use.
binutils/ChangeLog
* readelf.c (arm_attr_tag_ABI_HardFP_use): Update how we
display it.
ld/testsuite/ChangeLog
* ld-arm/attr-merge-3.attr: Remove Tag_ABI_HardFP_use.
* ld-arm/attr-merge-vfp-10.d: Likewise.
* ld-arm/attr-merge-vfp-10r.d: Likewise.
* ld-arm/attr-merge-vfp-12.d: Likewise.
* ld-arm/attr-merge-vfp-12r.d: Likewise.
* ld-arm/attr-merge-vfp-13.d: Likewise.
* ld-arm/attr-merge-vfp-13r.d: Likewise.
* ld-arm/attr-merge-vfp-14.d: Likewise.
* ld-arm/attr-merge-vfp-14r.d: Likewise.
* ld-arm/attr-merge-vfp-6.d: Likewise.
* ld-arm/attr-merge-vfp-6r.d: Likewise.
* ld-arm/attr-merge-vfp-7.d: Likewise.
* ld-arm/attr-merge-vfp-7r.d: Likewise.
* ld-arm/attr-merge-vfp-8.d: Likewise.
* ld-arm/attr-merge-vfp-8r.d: Likewise.
Diffstat (limited to 'ld')
23 files changed, 104 insertions, 15 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 3d7fcba..3235165 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,21 @@ +2015-02-26 Terry Guo <terry.guo@arm.com> + + * ld-arm/attr-merge-3.attr: Remove Tag_ABI_HardFP_use. + * ld-arm/attr-merge-vfp-10.d: Likewise. + * ld-arm/attr-merge-vfp-10r.d: Likewise. + * ld-arm/attr-merge-vfp-12.d: Likewise. + * ld-arm/attr-merge-vfp-12r.d: Likewise. + * ld-arm/attr-merge-vfp-13.d: Likewise. + * ld-arm/attr-merge-vfp-13r.d: Likewise. + * ld-arm/attr-merge-vfp-14.d: Likewise. + * ld-arm/attr-merge-vfp-14r.d: Likewise. + * ld-arm/attr-merge-vfp-6.d: Likewise. + * ld-arm/attr-merge-vfp-6r.d: Likewise. + * ld-arm/attr-merge-vfp-7.d: Likewise. + * ld-arm/attr-merge-vfp-7r.d: Likewise. + * ld-arm/attr-merge-vfp-8.d: Likewise. + * ld-arm/attr-merge-vfp-8r.d: Likewise. + 2015-02-25 Andrew Burgess <andrew.burgess@embecosm.com> * ld-avr/avr-prop-1.d: New file. diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp index 9d946e0..28b41ca 100644 --- a/ld/testsuite/ld-arm/arm-elf.exp +++ b/ld/testsuite/ld-arm/arm-elf.exp @@ -896,6 +896,8 @@ run_dump_test "attr-merge-vfp-14r" run_dump_test "attr-merge-incompatible" run_dump_test "attr-merge-arch-2" run_dump_test "attr-merge-nosection-1" +run_dump_test "attr-merge-hardfp-use-1" +run_dump_test "attr-merge-hardfp-use-2" run_dump_test "unresolved-1" if { ![istarget "arm*-*-nacl*"] } { run_dump_test "unresolved-1-dyn" diff --git a/ld/testsuite/ld-arm/attr-merge-3.attr b/ld/testsuite/ld-arm/attr-merge-3.attr index 8d7d1c3..0a3939c 100644 --- a/ld/testsuite/ld-arm/attr-merge-3.attr +++ b/ld/testsuite/ld-arm/attr-merge-3.attr @@ -22,7 +22,6 @@ File Attributes Tag_ABI_align_needed: 8-byte Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small - Tag_ABI_HardFP_use: SP and DP Tag_ABI_VFP_args: VFP registers Tag_CPU_unaligned_access: v6 Tag_FP_HP_extension: Allowed diff --git a/ld/testsuite/ld-arm/attr-merge-hardfp-use-1.d b/ld/testsuite/ld-arm/attr-merge-hardfp-use-1.d new file mode 100644 index 0000000..136ff41 --- /dev/null +++ b/ld/testsuite/ld-arm/attr-merge-hardfp-use-1.d @@ -0,0 +1,15 @@ +#source: attr-merge-hardfp-use-1a.s +#source: attr-merge-hardfp-use-1b.s +#as: +#ld: -e main +#readelf: -A +# This test is only valid on ELF based ports. +# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* + +Attribute Section: aeabi +File Attributes + Tag_CPU_name: "Cortex-M4" + Tag_CPU_arch: v7E-M + Tag_CPU_arch_profile: Microcontroller + Tag_THUMB_ISA_use: Thumb-2 + Tag_FP_arch: FPv5/FP-D16 for ARMv8 diff --git a/ld/testsuite/ld-arm/attr-merge-hardfp-use-1a.s b/ld/testsuite/ld-arm/attr-merge-hardfp-use-1a.s new file mode 100644 index 0000000..8a52860 --- /dev/null +++ b/ld/testsuite/ld-arm/attr-merge-hardfp-use-1a.s @@ -0,0 +1,12 @@ + .syntax unified + .cpu cortex-m4 + .fpu fpv4-sp-d16 + .thumb + .text + .align 2 + .global foo + .thumb + .thumb_func + .type foo, %function +foo: + bx lr diff --git a/ld/testsuite/ld-arm/attr-merge-hardfp-use-1b.s b/ld/testsuite/ld-arm/attr-merge-hardfp-use-1b.s new file mode 100644 index 0000000..3b3a05d --- /dev/null +++ b/ld/testsuite/ld-arm/attr-merge-hardfp-use-1b.s @@ -0,0 +1,16 @@ + .thumb + .syntax unified + .cpu cortex-m7 + .fpu fpv5-d16 + .eabi_attribute 27, 3 + .text + .align 2 + .global main + .thumb + .thumb_func + .type main, %function + + + +main: + bl foo diff --git a/ld/testsuite/ld-arm/attr-merge-hardfp-use-2.d b/ld/testsuite/ld-arm/attr-merge-hardfp-use-2.d new file mode 100644 index 0000000..b7975de --- /dev/null +++ b/ld/testsuite/ld-arm/attr-merge-hardfp-use-2.d @@ -0,0 +1,15 @@ +#source: attr-merge-hardfp-use-2a.s +#source: attr-merge-hardfp-use-2b.s +#as: +#ld: -e main +#readelf: -A +# This test is only valid on ELF based ports. +# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* + +Attribute Section: aeabi +File Attributes + Tag_CPU_name: "Cortex-M4" + Tag_CPU_arch: v7E-M + Tag_CPU_arch_profile: Microcontroller + Tag_THUMB_ISA_use: Thumb-2 + Tag_FP_arch: FPv5/FP-D16 for ARMv8 diff --git a/ld/testsuite/ld-arm/attr-merge-hardfp-use-2a.s b/ld/testsuite/ld-arm/attr-merge-hardfp-use-2a.s new file mode 100644 index 0000000..8a52860 --- /dev/null +++ b/ld/testsuite/ld-arm/attr-merge-hardfp-use-2a.s @@ -0,0 +1,12 @@ + .syntax unified + .cpu cortex-m4 + .fpu fpv4-sp-d16 + .thumb + .text + .align 2 + .global foo + .thumb + .thumb_func + .type foo, %function +foo: + bx lr diff --git a/ld/testsuite/ld-arm/attr-merge-hardfp-use-2b.s b/ld/testsuite/ld-arm/attr-merge-hardfp-use-2b.s new file mode 100644 index 0000000..59913a3 --- /dev/null +++ b/ld/testsuite/ld-arm/attr-merge-hardfp-use-2b.s @@ -0,0 +1,14 @@ + .thumb + .syntax unified + .cpu cortex-m7 + .fpu fpv5-d16 + .eabi_attribute 27, 2 + .text + .align 2 + .global main + .thumb + .thumb_func + .type main, %function + +main: + bl foo diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-10.d b/ld/testsuite/ld-arm/attr-merge-vfp-10.d index f32f119..a7e2fff 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-10.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-10.d @@ -11,4 +11,3 @@ File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 Tag_FP_arch: FPv5/FP-D16 for ARMv8 - Tag_ABI_HardFP_use: SP and DP diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-10r.d b/ld/testsuite/ld-arm/attr-merge-vfp-10r.d index 35e0f77..581d1b0 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-10r.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-10r.d @@ -11,4 +11,3 @@ File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 Tag_FP_arch: FPv5/FP-D16 for ARMv8 - Tag_ABI_HardFP_use: SP and DP diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-12.d b/ld/testsuite/ld-arm/attr-merge-vfp-12.d index f6dff81..c97b9cd 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-12.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-12.d @@ -11,4 +11,3 @@ File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 Tag_FP_arch: FP for ARMv8 - Tag_ABI_HardFP_use: SP and DP diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-12r.d b/ld/testsuite/ld-arm/attr-merge-vfp-12r.d index 1ce719d..139c608 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-12r.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-12r.d @@ -11,4 +11,3 @@ File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 Tag_FP_arch: FP for ARMv8 - Tag_ABI_HardFP_use: SP and DP diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-13.d b/ld/testsuite/ld-arm/attr-merge-vfp-13.d index b79f606..4724cf4 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-13.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-13.d @@ -11,4 +11,3 @@ File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 Tag_FP_arch: FP for ARMv8 - Tag_ABI_HardFP_use: SP and DP diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-13r.d b/ld/testsuite/ld-arm/attr-merge-vfp-13r.d index 4633d4e..cc192bb 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-13r.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-13r.d @@ -11,4 +11,3 @@ File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 Tag_FP_arch: FP for ARMv8 - Tag_ABI_HardFP_use: SP and DP diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-14.d b/ld/testsuite/ld-arm/attr-merge-vfp-14.d index b93ef50..865351a 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-14.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-14.d @@ -11,4 +11,3 @@ File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 Tag_FP_arch: FP for ARMv8 - Tag_ABI_HardFP_use: SP and DP diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-14r.d b/ld/testsuite/ld-arm/attr-merge-vfp-14r.d index 2563938..c9e1354 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-14r.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-14r.d @@ -11,4 +11,3 @@ File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 Tag_FP_arch: FP for ARMv8 - Tag_ABI_HardFP_use: SP and DP diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-6.d b/ld/testsuite/ld-arm/attr-merge-vfp-6.d index 54d063f..2e37b47 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-6.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-6.d @@ -11,4 +11,3 @@ File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 Tag_FP_arch: VFPv3 - Tag_ABI_HardFP_use: SP and DP diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-6r.d b/ld/testsuite/ld-arm/attr-merge-vfp-6r.d index f32d4fc..8c68442 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-6r.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-6r.d @@ -11,4 +11,3 @@ File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 Tag_FP_arch: VFPv3 - Tag_ABI_HardFP_use: SP and DP diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-7.d b/ld/testsuite/ld-arm/attr-merge-vfp-7.d index 6b1f9c9..760a82f 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-7.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-7.d @@ -11,4 +11,3 @@ File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 Tag_FP_arch: FP for ARMv8 - Tag_ABI_HardFP_use: SP and DP diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-7r.d b/ld/testsuite/ld-arm/attr-merge-vfp-7r.d index 6b1f9c9..760a82f 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-7r.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-7r.d @@ -11,4 +11,3 @@ File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 Tag_FP_arch: FP for ARMv8 - Tag_ABI_HardFP_use: SP and DP diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-8.d b/ld/testsuite/ld-arm/attr-merge-vfp-8.d index 78b74af..22dee2a 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-8.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-8.d @@ -11,4 +11,3 @@ File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 Tag_FP_arch: FPv5/FP-D16 for ARMv8 - Tag_ABI_HardFP_use: SP and DP diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-8r.d b/ld/testsuite/ld-arm/attr-merge-vfp-8r.d index 1fd5d63..7a21318 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-8r.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-8r.d @@ -11,4 +11,3 @@ File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 Tag_FP_arch: FPv5/FP-D16 for ARMv8 - Tag_ABI_HardFP_use: SP and DP |