From 75375b3e00c282a6461d1a3df83582f624b18377 Mon Sep 17 00:00:00 2001 From: Matthew Gretton-Dann Date: Thu, 15 Apr 2010 10:56:39 +0000 Subject: [PATCH] * ld/testsuite/ld-arm/attr-merge-2.attr: Update for changes in attribute output. * ld/testsuite/ld-arm/attr-merge-3.attr: Likewise. * ld/testsuite/ld-arm/attr-merge-vfp-1.d: Likewise. * ld/testsuite/ld-arm/attr-merge-vfp-1r.d: Likewise. * ld/testsuite/ld-arm/attr-merge-vfp-2.d: Likewise. * ld/testsuite/ld-arm/attr-merge-vfp-2r.d: Likewise. * ld/testsuite/ld-arm/attr-merge-vfp-3.d: Likewise. * ld/testsuite/ld-arm/attr-merge-vfp-3r.d: Likewise. * ld/testsuite/ld-arm/attr-merge-vfp-4.d: Likeiwse. * ld/testsuite/ld-arm/attr-merge-vfp-4r.d: Likewise. * ld/testsuite/ld-arm/attr-merge-vfp-5.d: Likewise. * ld/testsuite/ld-arm/attr-merge-vfp-5r.d: Likewise. * ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d: Likewise. * ld/testsuite/ld-arm/attr-merge-wchar-00.d: Likewise. * ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d: Likewise. * ld/testsuite/ld-arm/attr-merge-wchar-02.d: Likewise. * ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d: Likewise. * ld/testsuite/ld-arm/attr-merge-wchar-04.d: Likewise. * ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d: Likewise. * ld/testsuite/ld-arm/attr-merge-wchar-20.d: Likewise. * ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d: Likewise. * ld/testsuite/ld-arm/attr-merge-wchar-22.d: Likewise. * ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d: Likewise. * ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d: Likewise. * ld/testsuite/ld-arm/attr-merge-wchar-40.d: Likewise. * ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d: Likewise. * ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d: Likewise. * ld/testsuite/ld-arm/attr-merge-wchar-44.d: Likewise. * ld/testsuite/ld-arm/attr-merge.attr: Likewise. * binutils/readelf.c (arm_attr_tag_FP_arch): Rename from arm_attr_tag_VFP_arch. (arm_attr_tag_ABI_align8_needed): Remove. (arm_attr_tag_ABI_align8_preserved): Remove. (arm_attr_tag_ABI_HardFP_use): Update text strings. (arm_attr_public_tags): Add strings for ABI v2.08 attribute tags. (display_arm_attribute): Add decoding of ABI v2.08 attributes. * include/elf/arm.h (Tag_FP_arch, Tag_ABI_align_needed, Tag_ABI_align_preserved, Tag_FP_HP_extension): Add new ABI attribute tags. * gas/config/tc-arm.c (arm_convert_symbolic_attribute): Add support for new tag names in v2.08 of ARM ABI. * gas/doc/c-arm.texi: Document new tag names in ABI. * gas/testsuite/gas/arm/attr-mcpu.d: Update for new attribute tag names. * gas/testsuite/gas/arm/attr-mfpu-arm1020e.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-arm1020t.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-neon.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-vfp.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-vfp10.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-vfp3.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-vfp9.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-vfpv2.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-vfpv3.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-vfpv4.d: Likewise. * gas/testsuite/gas/arm/attr-mfpu-vfpxd.d: Likewise. * gas/testsuite/gas/arm/attr-names.d: Add test to make sure all attribute names are recognised. * gas/testsuite/gas/arm/attr-names.s: Likewise. --- bfd/ChangeLog | 5 ++ bfd/elf32-arm.c | 34 ++++++++--- binutils/ChangeLog | 9 +++ binutils/readelf.c | 56 +++++++++++++++---- gas/ChangeLog | 6 ++ gas/config/tc-arm.c | 4 ++ gas/doc/c-arm.texi | 10 +++- gas/testsuite/ChangeLog | 25 +++++++++ gas/testsuite/gas/arm/attr-mcpu.d | 2 +- gas/testsuite/gas/arm/attr-mfpu-arm1020e.d | 2 +- gas/testsuite/gas/arm/attr-mfpu-arm1020t.d | 2 +- gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d | 2 +- gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d | 2 +- gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d | 4 +- gas/testsuite/gas/arm/attr-mfpu-neon.d | 2 +- gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d | 2 +- gas/testsuite/gas/arm/attr-mfpu-vfp.d | 2 +- gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d | 2 +- gas/testsuite/gas/arm/attr-mfpu-vfp10.d | 2 +- gas/testsuite/gas/arm/attr-mfpu-vfp3.d | 2 +- gas/testsuite/gas/arm/attr-mfpu-vfp9.d | 2 +- gas/testsuite/gas/arm/attr-mfpu-vfpv2.d | 2 +- gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d | 2 +- gas/testsuite/gas/arm/attr-mfpu-vfpv3.d | 2 +- gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d | 4 +- gas/testsuite/gas/arm/attr-mfpu-vfpv4.d | 4 +- gas/testsuite/gas/arm/attr-mfpu-vfpxd.d | 2 +- gas/testsuite/gas/arm/attr-names.d | 48 ++++++++++++++++ gas/testsuite/gas/arm/attr-names.s | 43 ++++++++++++++ include/elf/ChangeLog | 5 ++ include/elf/arm.h | 16 ++++-- ld/testsuite/ChangeLog | 32 +++++++++++ ld/testsuite/ld-arm/attr-merge-2.attr | 4 +- ld/testsuite/ld-arm/attr-merge-3.attr | 8 +-- ld/testsuite/ld-arm/attr-merge-vfp-1.d | 2 +- ld/testsuite/ld-arm/attr-merge-vfp-1r.d | 2 +- ld/testsuite/ld-arm/attr-merge-vfp-2.d | 2 +- ld/testsuite/ld-arm/attr-merge-vfp-2r.d | 2 +- ld/testsuite/ld-arm/attr-merge-vfp-3.d | 4 +- ld/testsuite/ld-arm/attr-merge-vfp-3r.d | 4 +- ld/testsuite/ld-arm/attr-merge-vfp-4.d | 4 +- ld/testsuite/ld-arm/attr-merge-vfp-4r.d | 4 +- ld/testsuite/ld-arm/attr-merge-vfp-5.d | 4 +- ld/testsuite/ld-arm/attr-merge-vfp-5r.d | 4 +- .../ld-arm/attr-merge-wchar-00-nowarn.d | 4 +- ld/testsuite/ld-arm/attr-merge-wchar-00.d | 4 +- .../ld-arm/attr-merge-wchar-02-nowarn.d | 4 +- ld/testsuite/ld-arm/attr-merge-wchar-02.d | 4 +- .../ld-arm/attr-merge-wchar-04-nowarn.d | 4 +- ld/testsuite/ld-arm/attr-merge-wchar-04.d | 4 +- .../ld-arm/attr-merge-wchar-20-nowarn.d | 4 +- ld/testsuite/ld-arm/attr-merge-wchar-20.d | 4 +- .../ld-arm/attr-merge-wchar-22-nowarn.d | 4 +- ld/testsuite/ld-arm/attr-merge-wchar-22.d | 4 +- .../ld-arm/attr-merge-wchar-24-nowarn.d | 4 +- .../ld-arm/attr-merge-wchar-40-nowarn.d | 4 +- ld/testsuite/ld-arm/attr-merge-wchar-40.d | 4 +- .../ld-arm/attr-merge-wchar-42-nowarn.d | 4 +- .../ld-arm/attr-merge-wchar-44-nowarn.d | 4 +- ld/testsuite/ld-arm/attr-merge-wchar-44.d | 4 +- ld/testsuite/ld-arm/attr-merge.attr | 4 +- 61 files changed, 346 insertions(+), 103 deletions(-) create mode 100644 gas/testsuite/gas/arm/attr-names.d create mode 100644 gas/testsuite/gas/arm/attr-names.s diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ed2cb3bca7..56f977b829 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2010-04-15 Matthew Gretton-Dann + + * elf32-arm.c (elf32_arm_merge_eabi_attributes): Support additions to + attributes in v2.08 of the ABI. + 2010-04-15 Alan Modra * config.bfd (vax*-*-*vms*): Delete. diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index cebb30228b..2ebbb791ba 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -10003,27 +10003,26 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd) case Tag_ABI_FP_exceptions: case Tag_ABI_FP_user_exceptions: case Tag_ABI_FP_number_model: - case Tag_VFP_HP_extension: + case Tag_FP_HP_extension: case Tag_CPU_unaligned_access: case Tag_T2EE_use: - case Tag_Virtualization_use: case Tag_MPextension_use: /* Use the largest value specified. */ if (in_attr[i].i > out_attr[i].i) out_attr[i].i = in_attr[i].i; break; - case Tag_ABI_align8_preserved: + case Tag_ABI_align_preserved: case Tag_ABI_PCS_RO_data: /* Use the smallest value specified. */ if (in_attr[i].i < out_attr[i].i) out_attr[i].i = in_attr[i].i; break; - case Tag_ABI_align8_needed: + case Tag_ABI_align_needed: if ((in_attr[i].i > 0 || out_attr[i].i > 0) - && (in_attr[Tag_ABI_align8_preserved].i == 0 - || out_attr[Tag_ABI_align8_preserved].i == 0)) + && (in_attr[Tag_ABI_align_preserved].i == 0 + || out_attr[Tag_ABI_align_preserved].i == 0)) { /* This error message should be enabled once all non-conformant binaries in the toolchain have had the attributes set @@ -10044,6 +10043,27 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd) out_attr[i].i = in_attr[i].i; break; + case Tag_Virtualization_use: + /* The virtualization tag effectively stores two bits of + information: the intended use of TrustZone (in bit 0), and the + intended use of Virtualization (in bit 1). */ + if (out_attr[i].i == 0) + out_attr[i].i = in_attr[i].i; + else if (in_attr[i].i != 0 + && in_attr[i].i != out_attr[i].i) + { + if (in_attr[i].i <= 3 && out_attr[i].i <= 3) + out_attr[i].i = 3; + else + { + _bfd_error_handler + (_("error: %B: unable to merge virtualization attributes " + "with %B"), + obfd, ibfd); + result = FALSE; + } + } + break; case Tag_CPU_arch_profile: if (out_attr[i].i != in_attr[i].i) @@ -10071,7 +10091,7 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd) } } break; - case Tag_VFP_arch: + case Tag_FP_arch: { static const struct { diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 72c4194714..96c77242dc 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,12 @@ +2010-04-15 Matthew Gretton-Dann + + * readelf.c (arm_attr_tag_FP_arch): Rename from arm_attr_tag_VFP_arch. + (arm_attr_tag_ABI_align8_needed): Remove. + (arm_attr_tag_ABI_align8_preserved): Remove. + (arm_attr_tag_ABI_HardFP_use): Update text strings. + (arm_attr_public_tags): Add strings for ABI v2.08 attribute tags. + (display_arm_attribute): Add decoding of ABI v2.08 attributes. + 2010-04-13 Nick Clifton PR binutils/11419 diff --git a/binutils/readelf.c b/binutils/readelf.c index 4435eff85b..f0867279be 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -9801,7 +9801,7 @@ static const char * arm_attr_tag_CPU_arch[] = static const char * arm_attr_tag_ARM_ISA_use[] = {"No", "Yes"}; static const char * arm_attr_tag_THUMB_ISA_use[] = {"No", "Thumb-1", "Thumb-2"}; -static const char * arm_attr_tag_VFP_arch[] = +static const char * arm_attr_tag_FP_arch[] = {"No", "VFPv1", "VFPv2", "VFPv3", "VFPv3-D16", "VFPv4", "VFPv4-D16"}; static const char * arm_attr_tag_WMMX_arch[] = {"No", "WMMXv1", "WMMXv2"}; static const char * arm_attr_tag_Advanced_SIMD_arch[] = @@ -9826,13 +9826,10 @@ static const char * arm_attr_tag_ABI_FP_exceptions[] = {"Unused", "Needed"}; static const char * arm_attr_tag_ABI_FP_user_exceptions[] = {"Unused", "Needed"}; static const char * arm_attr_tag_ABI_FP_number_model[] = {"Unused", "Finite", "RTABI", "IEEE 754"}; -static const char * arm_attr_tag_ABI_align8_needed[] = {"No", "Yes", "4-byte"}; -static const char * arm_attr_tag_ABI_align8_preserved[] = - {"No", "Yes, except leaf SP", "Yes"}; static const char * arm_attr_tag_ABI_enum_size[] = {"Unused", "small", "int", "forced to int"}; static const char * arm_attr_tag_ABI_HardFP_use[] = - {"As Tag_VFP_arch", "SP only", "DP only", "SP and DP"}; + {"As Tag_FP_arch", "SP only", "DP only", "SP and DP"}; static const char * arm_attr_tag_ABI_VFP_args[] = {"AAPCS", "VFP registers", "custom"}; static const char * arm_attr_tag_ABI_WMMX_args[] = @@ -9844,7 +9841,7 @@ static const char * arm_attr_tag_ABI_FP_optimization_goals[] = {"None", "Prefer Speed", "Aggressive Speed", "Prefer Size", "Aggressive Size", "Prefer Accuracy", "Aggressive Accuracy"}; static const char * arm_attr_tag_CPU_unaligned_access[] = {"None", "v6"}; -static const char * arm_attr_tag_VFP_HP_extension[] = +static const char * arm_attr_tag_FP_HP_extension[] = {"Not Allowed", "Allowed"}; static const char * arm_attr_tag_ABI_FP_16bit_format[] = {"None", "IEEE 754", "Alternative Format"}; @@ -9870,7 +9867,7 @@ static arm_attr_public_tag arm_attr_public_tags[] = {7, "CPU_arch_profile", 0, NULL}, LOOKUP(8, ARM_ISA_use), LOOKUP(9, THUMB_ISA_use), - LOOKUP(10, VFP_arch), + LOOKUP(10, FP_arch), LOOKUP(11, WMMX_arch), LOOKUP(12, Advanced_SIMD_arch), LOOKUP(13, PCS_config), @@ -9884,8 +9881,8 @@ static arm_attr_public_tag arm_attr_public_tags[] = LOOKUP(21, ABI_FP_exceptions), LOOKUP(22, ABI_FP_user_exceptions), LOOKUP(23, ABI_FP_number_model), - LOOKUP(24, ABI_align8_needed), - LOOKUP(25, ABI_align8_preserved), + {24, "ABI_align_needed", 0, NULL}, + {25, "ABI_align_preserved", 0, NULL}, LOOKUP(26, ABI_enum_size), LOOKUP(27, ABI_HardFP_use), LOOKUP(28, ABI_VFP_args), @@ -9894,7 +9891,7 @@ static arm_attr_public_tag arm_attr_public_tags[] = LOOKUP(31, ABI_FP_optimization_goals), {32, "compatibility", 0, NULL}, LOOKUP(34, CPU_unaligned_access), - LOOKUP(36, VFP_HP_extension), + LOOKUP(36, FP_HP_extension), LOOKUP(38, ABI_FP_16bit_format), LOOKUP(42, MPextension_use), LOOKUP(44, DIV_use), @@ -9946,10 +9943,49 @@ display_arm_attribute (unsigned char * p) case 'A': printf ("Application\n"); break; case 'R': printf ("Realtime\n"); break; case 'M': printf ("Microcontroller\n"); break; + case 'S': printf ("Application or Realtime\n"); break; default: printf ("??? (%d)\n", val); break; } break; + case 24: /* Tag_align_needed. */ + val = read_uleb128 (p, &len); + p += len; + switch (val) + { + case 0: printf ("None\n"); break; + case 1: printf ("8-byte\n"); break; + case 2: printf ("4-byte\n"); break; + case 3: printf ("??? 3\n"); break; + default: + if (val <= 12) + printf ("8-byte and up to %d-byte extended\n", + 1 << val); + else + printf ("??? (%d)\n", val); + break; + } + break; + + case 25: /* Tag_align_preserved. */ + val = read_uleb128 (p, &len); + p += len; + switch (val) + { + case 0: printf ("None\n"); break; + case 1: printf ("8-byte, except leaf SP\n"); break; + case 2: printf ("8-byte\n"); break; + case 3: printf ("??? 3\n"); break; + default: + if (val <= 12) + printf ("8-byte and up to %d-byte extended\n", + 1 << val); + else + printf ("??? (%d)\n", val); + break; + } + break; + case 32: /* Tag_compatibility. */ val = read_uleb128 (p, &len); p += len; diff --git a/gas/ChangeLog b/gas/ChangeLog index 0a92ca63b8..d2551db86e 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2010-04-15 Matthew Gretton-Dann + + * config/tc-arm.c (arm_convert_symbolic_attribute): Add support for + new tag names in v2.08 of ARM ABI. + * doc/c-arm.texi: Document new tag names in ABI. + 2010-04-14 Tristan Gingold * config/tc-alpha.c: Includes vms/egps.h on EVAX. diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 3a160c16b5..b7ea21b69c 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -23047,6 +23047,7 @@ arm_convert_symbolic_attribute (const char *name) T (Tag_CPU_arch_profile), T (Tag_ARM_ISA_use), T (Tag_THUMB_ISA_use), + T (Tag_FP_arch), T (Tag_VFP_arch), T (Tag_WMMX_arch), T (Tag_Advanced_SIMD_arch), @@ -23061,7 +23062,9 @@ arm_convert_symbolic_attribute (const char *name) T (Tag_ABI_FP_exceptions), T (Tag_ABI_FP_user_exceptions), T (Tag_ABI_FP_number_model), + T (Tag_ABI_align_needed), T (Tag_ABI_align8_needed), + T (Tag_ABI_align_preserved), T (Tag_ABI_align8_preserved), T (Tag_ABI_enum_size), T (Tag_ABI_HardFP_use), @@ -23071,6 +23074,7 @@ arm_convert_symbolic_attribute (const char *name) T (Tag_ABI_FP_optimization_goals), T (Tag_compatibility), T (Tag_CPU_unaligned_access), + T (Tag_FP_HP_extension), T (Tag_VFP_HP_extension), T (Tag_ABI_FP_16bit_format), T (Tag_MPextension_use), diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi index 60b453f20d..e33230caa3 100644 --- a/gas/doc/c-arm.texi +++ b/gas/doc/c-arm.texi @@ -575,19 +575,19 @@ Set the EABI object attribute @var{tag} to @var{value}. The @var{tag} is either an attribute number, or one of the following: @code{Tag_CPU_raw_name}, @code{Tag_CPU_name}, @code{Tag_CPU_arch}, @code{Tag_CPU_arch_profile}, @code{Tag_ARM_ISA_use}, -@code{Tag_THUMB_ISA_use}, @code{Tag_VFP_arch}, @code{Tag_WMMX_arch}, +@code{Tag_THUMB_ISA_use}, @code{Tag_FP_arch}, @code{Tag_WMMX_arch}, @code{Tag_Advanced_SIMD_arch}, @code{Tag_PCS_config}, @code{Tag_ABI_PCS_R9_use}, @code{Tag_ABI_PCS_RW_data}, @code{Tag_ABI_PCS_RO_data}, @code{Tag_ABI_PCS_GOT_use}, @code{Tag_ABI_PCS_wchar_t}, @code{Tag_ABI_FP_rounding}, @code{Tag_ABI_FP_denormal}, @code{Tag_ABI_FP_exceptions}, @code{Tag_ABI_FP_user_exceptions}, @code{Tag_ABI_FP_number_model}, -@code{Tag_ABI_align8_needed}, @code{Tag_ABI_align8_preserved}, +@code{Tag_ABI_align_needed}, @code{Tag_ABI_align_preserved}, @code{Tag_ABI_enum_size}, @code{Tag_ABI_HardFP_use}, @code{Tag_ABI_VFP_args}, @code{Tag_ABI_WMMX_args}, @code{Tag_ABI_optimization_goals}, @code{Tag_ABI_FP_optimization_goals}, @code{Tag_compatibility}, @code{Tag_CPU_unaligned_access}, -@code{Tag_VFP_HP_extension}, @code{Tag_ABI_FP_16bit_format}, +@code{Tag_FP_HP_extension}, @code{Tag_ABI_FP_16bit_format}, @code{Tag_MPextension_use}, @code{Tag_DIV_use}, @code{Tag_nodefaults}, @code{Tag_also_compatible_with}, @code{Tag_conformance}, @code{Tag_T2EE_use}, @@ -596,6 +596,10 @@ The @var{tag} is either an attribute number, or one of the following: The @var{value} is either a @code{number}, @code{"string"}, or @code{number, "string"} depending on the tag. +Note - the following legacy values are also accepted by @var{tag}: +@code{Tag_VFP_arch}, @code{Tag_ABI_align8_needed}, +@code{Tag_ABI_align8_preserved}, @code{Tag_VFP_HP_extension}, + @cindex @code{.even} directive, ARM @item .even This directive aligns to an even-numbered address. diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 1e9394396d..7056cc4c38 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,28 @@ +2010-04-15 Matthew Gretton-Dann + + * gas/arm/attr-mcpu.d: Update for new attribute tag names. + * gas/arm/attr-mfpu-arm1020e.d: Likewise. + * gas/arm/attr-mfpu-arm1020t.d: Likewise. + * gas/arm/attr-mfpu-arm1136jf-s.d: Likewise. + * gas/arm/attr-mfpu-arm1136jfs.d: Likewise. + * gas/arm/attr-mfpu-neon-fp16.d: Likewise. + * gas/arm/attr-mfpu-neon.d: Likewise. + * gas/arm/attr-mfpu-softvfp+vfp.d: Likewise. + * gas/arm/attr-mfpu-vfp.d: Likewise. + * gas/arm/attr-mfpu-vfp10-r0.d: Likewise. + * gas/arm/attr-mfpu-vfp10.d: Likewise. + * gas/arm/attr-mfpu-vfp3.d: Likewise. + * gas/arm/attr-mfpu-vfp9.d: Likewise. + * gas/arm/attr-mfpu-vfpv2.d: Likewise. + * gas/arm/attr-mfpu-vfpv3-d16.d: Likewise. + * gas/arm/attr-mfpu-vfpv3.d: Likewise. + * gas/arm/attr-mfpu-vfpv4-d16.d: Likewise. + * gas/arm/attr-mfpu-vfpv4.d: Likewise. + * gas/arm/attr-mfpu-vfpxd.d: Likewise. + * gas/arm/attr-names.d: Add test to make sure all attribute names + are recognised. + * gas/arm/attr-names.s: Likewise. + 2010-04-07 Jie Zhang * gas/arm/mapmisc.s: Test multiple mapping symbols have diff --git a/gas/testsuite/gas/arm/attr-mcpu.d b/gas/testsuite/gas/arm/attr-mcpu.d index 80cb168cff..4e8f321140 100644 --- a/gas/testsuite/gas/arm/attr-mcpu.d +++ b/gas/testsuite/gas/arm/attr-mcpu.d @@ -12,5 +12,5 @@ File Attributes Tag_CPU_arch_profile: Application Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-2 - Tag_VFP_arch: VFPv3 + Tag_FP_arch: VFPv3 Tag_Advanced_SIMD_arch: NEONv1 diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d b/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d index aba9948141..95ea725dd0 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d +++ b/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d @@ -9,4 +9,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv2 + Tag_FP_arch: VFPv2 diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d b/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d index 1fe1ab260d..19b001b926 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d +++ b/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d @@ -9,4 +9,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv1 + Tag_FP_arch: VFPv1 diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d b/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d index 78d546b941..f25aebe212 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d +++ b/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d @@ -9,4 +9,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv2 + Tag_FP_arch: VFPv2 diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d b/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d index e251d3e0fd..4b8fce6bdf 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d +++ b/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d @@ -9,4 +9,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv2 + Tag_FP_arch: VFPv2 diff --git a/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d b/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d index f04ad31c5c..3866572b28 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d +++ b/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d @@ -9,6 +9,6 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv3 + Tag_FP_arch: VFPv3 Tag_Advanced_SIMD_arch: NEONv1 - Tag_VFP_HP_extension: Allowed + Tag_FP_HP_extension: Allowed diff --git a/gas/testsuite/gas/arm/attr-mfpu-neon.d b/gas/testsuite/gas/arm/attr-mfpu-neon.d index 9de9886421..1d7d33b801 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-neon.d +++ b/gas/testsuite/gas/arm/attr-mfpu-neon.d @@ -9,5 +9,5 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv3 + Tag_FP_arch: VFPv3 Tag_Advanced_SIMD_arch: NEONv1 diff --git a/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d b/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d index 1fe6961279..d0524c29ae 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d +++ b/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d @@ -9,4 +9,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv2 + Tag_FP_arch: VFPv2 diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp.d b/gas/testsuite/gas/arm/attr-mfpu-vfp.d index e57218dfb0..331b81a180 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-vfp.d +++ b/gas/testsuite/gas/arm/attr-mfpu-vfp.d @@ -9,4 +9,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv2 + Tag_FP_arch: VFPv2 diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d b/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d index dd69345146..6f89e6abe0 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d +++ b/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d @@ -9,4 +9,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv1 + Tag_FP_arch: VFPv1 diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp10.d b/gas/testsuite/gas/arm/attr-mfpu-vfp10.d index 6c27fc5dbc..37af075817 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-vfp10.d +++ b/gas/testsuite/gas/arm/attr-mfpu-vfp10.d @@ -9,4 +9,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv2 + Tag_FP_arch: VFPv2 diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp3.d b/gas/testsuite/gas/arm/attr-mfpu-vfp3.d index f0549da552..f02d2cdb54 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-vfp3.d +++ b/gas/testsuite/gas/arm/attr-mfpu-vfp3.d @@ -9,4 +9,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv3 + Tag_FP_arch: VFPv3 diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp9.d b/gas/testsuite/gas/arm/attr-mfpu-vfp9.d index 1f7f996e67..57f5df7eb2 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-vfp9.d +++ b/gas/testsuite/gas/arm/attr-mfpu-vfp9.d @@ -9,4 +9,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv2 + Tag_FP_arch: VFPv2 diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d index befd88f10c..678eb9eeb6 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d +++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d @@ -9,4 +9,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv2 + Tag_FP_arch: VFPv2 diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d index 255e5523cf..36d9914bde 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d +++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d @@ -9,4 +9,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv3-D16 + Tag_FP_arch: VFPv3-D16 diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d index e5d443e498..b6cf496d7d 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d +++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d @@ -9,4 +9,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv3 + Tag_FP_arch: VFPv3 diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d index 6b3574de77..967e912a54 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d +++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d @@ -9,5 +9,5 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv4-D16 - Tag_VFP_HP_extension: Allowed + Tag_FP_arch: VFPv4-D16 + Tag_FP_HP_extension: Allowed diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d index a3b91a5e65..fd92773a6a 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d +++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d @@ -9,5 +9,5 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv4 - Tag_VFP_HP_extension: Allowed + Tag_FP_arch: VFPv4 + Tag_FP_HP_extension: Allowed diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d b/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d index b8002d1c22..735860e1c0 100644 --- a/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d +++ b/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d @@ -9,4 +9,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv1 + Tag_FP_arch: VFPv1 diff --git a/gas/testsuite/gas/arm/attr-names.d b/gas/testsuite/gas/arm/attr-names.d new file mode 100644 index 0000000000..1eddd93724 --- /dev/null +++ b/gas/testsuite/gas/arm/attr-names.d @@ -0,0 +1,48 @@ +# name: EABI attribute names +# source: attr-names.s +# as: +# readelf: -A +# This test is only valid on EABI based ports. +# target: *-*-*eabi + +Attribute Section: aeabi +File Attributes + Tag_conformance: "2.08" + Tag_nodefaults: True + Tag_CPU_raw_name: "random-cpu" + Tag_CPU_name: "cpu" + Tag_CPU_arch: v4 + Tag_CPU_arch_profile: Application or Realtime + Tag_ARM_ISA_use: Yes + Tag_THUMB_ISA_use: Thumb-1 + Tag_FP_arch: VFPv1 + Tag_WMMX_arch: WMMXv1 + Tag_Advanced_SIMD_arch: NEONv1 + Tag_PCS_config: Bare platform + Tag_ABI_PCS_R9_use: SB + Tag_ABI_PCS_RW_data: PC-relative + Tag_ABI_PCS_RO_data: PC-relative + Tag_ABI_PCS_GOT_use: direct + Tag_ABI_PCS_wchar_t: 2 + Tag_ABI_FP_rounding: Needed + Tag_ABI_FP_denormal: Needed + Tag_ABI_FP_exceptions: Needed + Tag_ABI_FP_user_exceptions: Needed + Tag_ABI_FP_number_model: Finite + 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 only + Tag_ABI_VFP_args: VFP registers + Tag_ABI_WMMX_args: WMMX registers + Tag_ABI_optimization_goals: Prefer Speed + Tag_ABI_FP_optimization_goals: Prefer Speed + Tag_compatibility: flag = 1, vendor = gnu + Tag_CPU_unaligned_access: v6 + Tag_FP_HP_extension: Allowed + Tag_ABI_FP_16bit_format: IEEE 754 + Tag_MPextension_use: Allowed + Tag_DIV_use: Not allowed + Tag_also_compatible_with: v6-M + Tag_T2EE_use: Allowed + Tag_Virtualization_use: TrustZone and Virtualization Extensions diff --git a/gas/testsuite/gas/arm/attr-names.s b/gas/testsuite/gas/arm/attr-names.s new file mode 100644 index 0000000000..c43fb88f67 --- /dev/null +++ b/gas/testsuite/gas/arm/attr-names.s @@ -0,0 +1,43 @@ +.eabi_attribute Tag_CPU_raw_name, "random-cpu" +.eabi_attribute Tag_CPU_name, "cpu" +.eabi_attribute Tag_CPU_arch, 1 +.eabi_attribute Tag_CPU_arch_profile, 'S' +.eabi_attribute Tag_ARM_ISA_use, 1 +.eabi_attribute Tag_THUMB_ISA_use, 1 +.eabi_attribute Tag_FP_arch, 1 +.eabi_attribute Tag_VFP_arch, 1 +.eabi_attribute Tag_WMMX_arch, 1 +.eabi_attribute Tag_Advanced_SIMD_arch, 1 +.eabi_attribute Tag_PCS_config, 1 +.eabi_attribute Tag_ABI_PCS_R9_use, 1 +.eabi_attribute Tag_ABI_PCS_RW_data, 1 +.eabi_attribute Tag_ABI_PCS_RO_data, 1 +.eabi_attribute Tag_ABI_PCS_GOT_use, 1 +.eabi_attribute Tag_ABI_PCS_wchar_t, 2 +.eabi_attribute Tag_ABI_FP_rounding, 1 +.eabi_attribute Tag_ABI_FP_denormal, 1 +.eabi_attribute Tag_ABI_FP_exceptions, 1 +.eabi_attribute Tag_ABI_FP_user_exceptions, 1 +.eabi_attribute Tag_ABI_FP_number_model, 1 +.eabi_attribute Tag_ABI_align_needed, 1 +.eabi_attribute Tag_ABI_align8_needed, 1 +.eabi_attribute Tag_ABI_align_preserved, 1 +.eabi_attribute Tag_ABI_align8_preserved, 1 +.eabi_attribute Tag_ABI_enum_size, 1 +.eabi_attribute Tag_ABI_HardFP_use, 1 +.eabi_attribute Tag_ABI_VFP_args, 1 +.eabi_attribute Tag_ABI_WMMX_args, 1 +.eabi_attribute Tag_ABI_optimization_goals, 1 +.eabi_attribute Tag_ABI_FP_optimization_goals, 1 +.eabi_attribute Tag_compatibility, 1, "gnu" +.eabi_attribute Tag_CPU_unaligned_access, 1 +.eabi_attribute Tag_FP_HP_extension, 1 +.eabi_attribute Tag_VFP_HP_extension, 1 +.eabi_attribute Tag_ABI_FP_16bit_format, 1 +.eabi_attribute Tag_MPextension_use, 1 +.eabi_attribute Tag_DIV_use, 1 +.eabi_attribute Tag_nodefaults, 0 +.eabi_attribute Tag_also_compatible_with, "\06\013" +.eabi_attribute Tag_conformance, "2.08" +.eabi_attribute Tag_T2EE_use, 1 +.eabi_attribute Tag_Virtualization_use, 3 diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index d461536c02..49be1e16b1 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -1,3 +1,8 @@ +2010-04-15 Matthew Gretton-Dann + + * arm.h (Tag_FP_arch, Tag_ABI_align_needed, Tag_ABI_align_preserved, + Tag_FP_HP_extension): Add new ABI attribute tags. + 2010-04-15 Nick Clifton * alpha.h: Update copyright notice to use GPLv3. diff --git a/include/elf/arm.h b/include/elf/arm.h index 703438a054..0a5c87d58b 100644 --- a/include/elf/arm.h +++ b/include/elf/arm.h @@ -258,7 +258,7 @@ enum Tag_CPU_arch_profile, Tag_ARM_ISA_use, Tag_THUMB_ISA_use, - Tag_VFP_arch, + Tag_FP_arch, Tag_WMMX_arch, Tag_Advanced_SIMD_arch, Tag_PCS_config, @@ -272,8 +272,8 @@ enum Tag_ABI_FP_exceptions, Tag_ABI_FP_user_exceptions, Tag_ABI_FP_number_model, - Tag_ABI_align8_needed, - Tag_ABI_align8_preserved, + Tag_ABI_align_needed, + Tag_ABI_align_preserved, Tag_ABI_enum_size, Tag_ABI_HardFP_use, Tag_ABI_VFP_args, @@ -284,7 +284,7 @@ enum Tag_undefined33 = 33, Tag_CPU_unaligned_access, Tag_undefined35, - Tag_VFP_HP_extension, + Tag_FP_HP_extension, Tag_undefined37, Tag_ABI_FP_16bit_format, Tag_undefined39, @@ -299,7 +299,13 @@ enum Tag_conformance, Tag_Virtualization_use, Tag_undefined69, - Tag_MPextension_use_legacy + Tag_MPextension_use_legacy, + + /* The following tags are legacy names for other tags. */ + Tag_VFP_arch = Tag_FP_arch, + Tag_ABI_align8_needed = Tag_ABI_align_needed, + Tag_ABI_align8_preserved = Tag_ABI_align_preserved, + Tag_VFP_HP_extension = Tag_FP_HP_extension }; #endif diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 4b15ef6d34..dbeb91b3d1 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,35 @@ +2010-04-15 Matthew Gretton-Dann + + * ld-arm/attr-merge-2.attr: Update for changes in attribute output. + * ld-arm/attr-merge-3.attr: Likewise. + * ld-arm/attr-merge-vfp-1.d: Likewise. + * ld-arm/attr-merge-vfp-1r.d: Likewise. + * ld-arm/attr-merge-vfp-2.d: Likewise. + * ld-arm/attr-merge-vfp-2r.d: Likewise. + * ld-arm/attr-merge-vfp-3.d: Likewise. + * ld-arm/attr-merge-vfp-3r.d: Likewise. + * ld-arm/attr-merge-vfp-4.d: Likeiwse. + * ld-arm/attr-merge-vfp-4r.d: Likewise. + * ld-arm/attr-merge-vfp-5.d: Likewise. + * ld-arm/attr-merge-vfp-5r.d: Likewise. + * ld-arm/attr-merge-wchar-00-nowarn.d: Likewise. + * ld-arm/attr-merge-wchar-00.d: Likewise. + * ld-arm/attr-merge-wchar-02-nowarn.d: Likewise. + * ld-arm/attr-merge-wchar-02.d: Likewise. + * ld-arm/attr-merge-wchar-04-nowarn.d: Likewise. + * ld-arm/attr-merge-wchar-04.d: Likewise. + * ld-arm/attr-merge-wchar-20-nowarn.d: Likewise. + * ld-arm/attr-merge-wchar-20.d: Likewise. + * ld-arm/attr-merge-wchar-22-nowarn.d: Likewise. + * ld-arm/attr-merge-wchar-22.d: Likewise. + * ld-arm/attr-merge-wchar-24-nowarn.d: Likewise. + * ld-arm/attr-merge-wchar-40-nowarn.d: Likewise. + * ld-arm/attr-merge-wchar-40.d: Likewise. + * ld-arm/attr-merge-wchar-42-nowarn.d: Likewise. + * ld-arm/attr-merge-wchar-44-nowarn.d: Likewise. + * ld-arm/attr-merge-wchar-44.d: Likewise. + * ld-arm/attr-merge.attr: Likewise. + 2010-04-06 David S. Miller * ld-elfvers/vers.exp: Pass -Av9a to assembler on sparc-*-* diff --git a/ld/testsuite/ld-arm/attr-merge-2.attr b/ld/testsuite/ld-arm/attr-merge-2.attr index 98faefa951..578333b263 100644 --- a/ld/testsuite/ld-arm/attr-merge-2.attr +++ b/ld/testsuite/ld-arm/attr-merge-2.attr @@ -8,7 +8,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge-3.attr b/ld/testsuite/ld-arm/attr-merge-3.attr index b8651815fb..b0f8ef97c6 100644 --- a/ld/testsuite/ld-arm/attr-merge-3.attr +++ b/ld/testsuite/ld-arm/attr-merge-3.attr @@ -5,7 +5,7 @@ File Attributes Tag_CPU_arch: v5T Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-2 - Tag_VFP_arch: VFPv3 + Tag_FP_arch: VFPv3 Tag_WMMX_arch: WMMXv2 Tag_Advanced_SIMD_arch: NEONv1 Tag_PCS_config: Linux application @@ -19,13 +19,13 @@ File Attributes Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_user_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + 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_VFP_HP_extension: Allowed + Tag_FP_HP_extension: Allowed Tag_MPextension_use: Allowed Tag_T2EE_use: Allowed Tag_Virtualization_use: TrustZone diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-1.d b/ld/testsuite/ld-arm/attr-merge-vfp-1.d index 01ffae5a37..8625735176 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-1.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-1.d @@ -10,4 +10,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv3-D16 + Tag_FP_arch: VFPv3-D16 diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-1r.d b/ld/testsuite/ld-arm/attr-merge-vfp-1r.d index 7494cc4ab3..d7a15d7bb6 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-1r.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-1r.d @@ -10,4 +10,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv3-D16 + Tag_FP_arch: VFPv3-D16 diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-2.d b/ld/testsuite/ld-arm/attr-merge-vfp-2.d index b81a9eb98d..6444bd00a3 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-2.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-2.d @@ -10,4 +10,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv3 + Tag_FP_arch: VFPv3 diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-2r.d b/ld/testsuite/ld-arm/attr-merge-vfp-2r.d index 47758d6410..1d36983304 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-2r.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-2r.d @@ -10,4 +10,4 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv3 + Tag_FP_arch: VFPv3 diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-3.d b/ld/testsuite/ld-arm/attr-merge-vfp-3.d index 36f8947e5d..ee89384a28 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-3.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-3.d @@ -10,5 +10,5 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv4-D16 - Tag_VFP_HP_extension: Allowed + Tag_FP_arch: VFPv4-D16 + Tag_FP_HP_extension: Allowed diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-3r.d b/ld/testsuite/ld-arm/attr-merge-vfp-3r.d index fa110e627d..d06bd2732c 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-3r.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-3r.d @@ -10,5 +10,5 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv4-D16 - Tag_VFP_HP_extension: Allowed + Tag_FP_arch: VFPv4-D16 + Tag_FP_HP_extension: Allowed diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-4.d b/ld/testsuite/ld-arm/attr-merge-vfp-4.d index c027883483..c18d672d19 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-4.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-4.d @@ -10,5 +10,5 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv4 - Tag_VFP_HP_extension: Allowed + Tag_FP_arch: VFPv4 + Tag_FP_HP_extension: Allowed diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-4r.d b/ld/testsuite/ld-arm/attr-merge-vfp-4r.d index 4247e7ee41..327e0c384f 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-4r.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-4r.d @@ -10,5 +10,5 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv4 - Tag_VFP_HP_extension: Allowed + Tag_FP_arch: VFPv4 + Tag_FP_HP_extension: Allowed diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-5.d b/ld/testsuite/ld-arm/attr-merge-vfp-5.d index a1c86318a6..cd55a86b74 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-5.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-5.d @@ -10,5 +10,5 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv4 - Tag_VFP_HP_extension: Allowed + Tag_FP_arch: VFPv4 + Tag_FP_HP_extension: Allowed diff --git a/ld/testsuite/ld-arm/attr-merge-vfp-5r.d b/ld/testsuite/ld-arm/attr-merge-vfp-5r.d index 6de0da67ed..505c31b36c 100644 --- a/ld/testsuite/ld-arm/attr-merge-vfp-5r.d +++ b/ld/testsuite/ld-arm/attr-merge-vfp-5r.d @@ -10,5 +10,5 @@ Attribute Section: aeabi File Attributes Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-1 - Tag_VFP_arch: VFPv4 - Tag_VFP_HP_extension: Allowed + Tag_FP_arch: VFPv4 + Tag_FP_HP_extension: Allowed diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d index 922ea4034a..8a01f2d210 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-00-nowarn.d @@ -15,7 +15,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-00.d b/ld/testsuite/ld-arm/attr-merge-wchar-00.d index af29687502..4242822c8d 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-00.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-00.d @@ -15,7 +15,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d index 09f815a057..f3935169d3 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-02-nowarn.d @@ -16,7 +16,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-02.d b/ld/testsuite/ld-arm/attr-merge-wchar-02.d index 1c48b00f87..f662120c56 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-02.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-02.d @@ -16,7 +16,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d index 2bdbab40ea..16cc469683 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-04-nowarn.d @@ -16,7 +16,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-04.d b/ld/testsuite/ld-arm/attr-merge-wchar-04.d index 8ea16469b3..41413b9d6b 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-04.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-04.d @@ -16,7 +16,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d index d0c8634f40..c0b12488a5 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-20-nowarn.d @@ -16,7 +16,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-20.d b/ld/testsuite/ld-arm/attr-merge-wchar-20.d index 6e02df9eec..b81fb15885 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-20.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-20.d @@ -16,7 +16,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d index 17b288d62d..e9a1e944e4 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-22-nowarn.d @@ -16,7 +16,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-22.d b/ld/testsuite/ld-arm/attr-merge-wchar-22.d index d1c790319a..bf756606de 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-22.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-22.d @@ -16,7 +16,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d index 48825e5447..0c9b33e574 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-24-nowarn.d @@ -16,7 +16,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d index 8b4b1811ad..54f0c54a44 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-40-nowarn.d @@ -16,7 +16,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-40.d b/ld/testsuite/ld-arm/attr-merge-wchar-40.d index e77c13b0b0..46be48c223 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-40.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-40.d @@ -16,7 +16,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d index dbd4e4d68c..cc72d3e4da 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-42-nowarn.d @@ -16,7 +16,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d b/ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d index 7e54473c22..35eb756e1c 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-44-nowarn.d @@ -16,7 +16,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-44.d b/ld/testsuite/ld-arm/attr-merge-wchar-44.d index c3c52f0283..c0fba85666 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-44.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-44.d @@ -16,7 +16,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug diff --git a/ld/testsuite/ld-arm/attr-merge.attr b/ld/testsuite/ld-arm/attr-merge.attr index 98faefa951..578333b263 100644 --- a/ld/testsuite/ld-arm/attr-merge.attr +++ b/ld/testsuite/ld-arm/attr-merge.attr @@ -8,7 +8,7 @@ File Attributes Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 - Tag_ABI_align8_needed: Yes - Tag_ABI_align8_preserved: Yes, except leaf SP + Tag_ABI_align_needed: 8-byte + Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: small Tag_ABI_optimization_goals: Aggressive Debug -- 2.34.1