diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 8 | ||||
| -rw-r--r-- | gas/NEWS | 3 | ||||
| -rw-r--r-- | gas/config/tc-arm.c | 14 | ||||
| -rw-r--r-- | gas/doc/c-arm.texi | 2 | ||||
| -rw-r--r-- | gas/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/attr-march-armv6kz.d | 14 | ||||
| -rw-r--r-- | gas/testsuite/gas/arm/attr-march-armv6kzt2.d | 14 |
7 files changed, 55 insertions, 5 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index d024f40..5ea9714 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,11 @@ +2015-07-20 Matthew Wahab <matthew.wahab@arm.com> + + * NEWS: Mention corrected spelling of armv6kz. + * config/tc-arm.c (arm_cpus): Replace ARM_ARCH_V6ZK with + ARM_ARCH_V6KZ. + (arm_archs): Likewise. Also add "armv6kz" and "armv6kzt2". + * doc/c-arm.texi: Replace "armv6zk" with "armv6kz". + 2015-07-16 Jiong Wang <jiong.wang@arm.com> * config/tc-aarch64.c (reloc_table): New relocation modifiers. @@ -2,6 +2,9 @@ Changes in 2.26: +* Added the correctly spelled -march=armv6kz, for ARMv6KZ support. The + previous spelling, -march=armv6zk, is still accepted. + * Support for the ARMv8.1 architecture has been added to the Aarch64 port. Support for the individual ARMv8.1 Adv.SIMD, LOR and PAN architecture extensions has also been added to the Aarch64 port. diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index a76b4ca..7b3b5c9 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -24748,8 +24748,8 @@ static const struct arm_cpu_option_table arm_cpus[] = ARM_CPU_OPT ("mpcorenovfp", ARM_ARCH_V6K, FPU_NONE, "MPCore"), ARM_CPU_OPT ("arm1156t2-s", ARM_ARCH_V6T2, FPU_NONE, NULL), ARM_CPU_OPT ("arm1156t2f-s", ARM_ARCH_V6T2, FPU_ARCH_VFP_V2, NULL), - ARM_CPU_OPT ("arm1176jz-s", ARM_ARCH_V6ZK, FPU_NONE, NULL), - ARM_CPU_OPT ("arm1176jzf-s", ARM_ARCH_V6ZK, FPU_ARCH_VFP_V2, NULL), + ARM_CPU_OPT ("arm1176jz-s", ARM_ARCH_V6KZ, FPU_NONE, NULL), + ARM_CPU_OPT ("arm1176jzf-s", ARM_ARCH_V6KZ, FPU_ARCH_VFP_V2, NULL), ARM_CPU_OPT ("cortex-a5", ARM_ARCH_V7A_MP_SEC, FPU_NONE, "Cortex-A5"), ARM_CPU_OPT ("cortex-a7", ARM_ARCH_V7VE, FPU_ARCH_NEON_VFP_V4, @@ -24851,11 +24851,17 @@ static const struct arm_arch_option_table arm_archs[] = ARM_ARCH_OPT ("armv6j", ARM_ARCH_V6, FPU_ARCH_VFP), ARM_ARCH_OPT ("armv6k", ARM_ARCH_V6K, FPU_ARCH_VFP), ARM_ARCH_OPT ("armv6z", ARM_ARCH_V6Z, FPU_ARCH_VFP), - ARM_ARCH_OPT ("armv6zk", ARM_ARCH_V6ZK, FPU_ARCH_VFP), + /* The official spelling of this variant is ARMv6KZ, the name "armv6zk" is + kept to preserve existing behaviour. */ + ARM_ARCH_OPT ("armv6kz", ARM_ARCH_V6KZ, FPU_ARCH_VFP), + ARM_ARCH_OPT ("armv6zk", ARM_ARCH_V6KZ, FPU_ARCH_VFP), ARM_ARCH_OPT ("armv6t2", ARM_ARCH_V6T2, FPU_ARCH_VFP), ARM_ARCH_OPT ("armv6kt2", ARM_ARCH_V6KT2, FPU_ARCH_VFP), ARM_ARCH_OPT ("armv6zt2", ARM_ARCH_V6ZT2, FPU_ARCH_VFP), - ARM_ARCH_OPT ("armv6zkt2", ARM_ARCH_V6ZKT2, FPU_ARCH_VFP), + /* The official spelling of this variant is ARMv6KZ, the name "armv6zkt2" is + kept to preserve existing behaviour. */ + ARM_ARCH_OPT ("armv6kzt2", ARM_ARCH_V6KZT2, FPU_ARCH_VFP), + ARM_ARCH_OPT ("armv6zkt2", ARM_ARCH_V6KZT2, FPU_ARCH_VFP), ARM_ARCH_OPT ("armv6-m", ARM_ARCH_V6M, FPU_ARCH_VFP), ARM_ARCH_OPT ("armv6s-m", ARM_ARCH_V6SM, FPU_ARCH_VFP), ARM_ARCH_OPT ("armv7", ARM_ARCH_V7, FPU_ARCH_VFP), diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi index 7fadd28..e41943b 100644 --- a/gas/doc/c-arm.texi +++ b/gas/doc/c-arm.texi @@ -210,7 +210,7 @@ names are recognized: @code{armv6j}, @code{armv6k}, @code{armv6z}, -@code{armv6zk}, +@code{armv6kz}, @code{armv6-m}, @code{armv6s-m}, @code{armv7}, diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 8b3d015..84eb9f2 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-07-20 Matthew Wahab <matthew.wahab@arm.com> + + * gas/arm/attr-march-armv6kz.d: New. + * gas/arm/attr-march-armv6kzt2.d: New. + 2015-07-16 Jiong Wang <jiong.wang@arm.com> * gas/aarch64/reloc-tlsldm-1.s: New testcase. diff --git a/gas/testsuite/gas/arm/attr-march-armv6kz.d b/gas/testsuite/gas/arm/attr-march-armv6kz.d new file mode 100644 index 0000000..fa0b5a0 --- /dev/null +++ b/gas/testsuite/gas/arm/attr-march-armv6kz.d @@ -0,0 +1,14 @@ +# name: attributes for -march=armv6kz +# source: blank.s +# as: -march=armv6kz +# readelf: -A +# This test is only valid on EABI based ports. +# target: *-*-*eabi* *-*-nacl* + +Attribute Section: aeabi +File Attributes + Tag_CPU_name: "6KZ" + Tag_CPU_arch: v6KZ + Tag_ARM_ISA_use: Yes + Tag_THUMB_ISA_use: Thumb-1 + Tag_Virtualization_use: TrustZone diff --git a/gas/testsuite/gas/arm/attr-march-armv6kzt2.d b/gas/testsuite/gas/arm/attr-march-armv6kzt2.d new file mode 100644 index 0000000..1672a1f --- /dev/null +++ b/gas/testsuite/gas/arm/attr-march-armv6kzt2.d @@ -0,0 +1,14 @@ +# name: attributes for -march=armv6kzt2 +# source: blank.s +# as: -march=armv6kzt2 +# readelf: -A +# This test is only valid on EABI based ports. +# target: *-*-*eabi* *-*-nacl* + +Attribute Section: aeabi +File Attributes + Tag_CPU_name: "6KZT2" + Tag_CPU_arch: v6T2 + Tag_ARM_ISA_use: Yes + Tag_THUMB_ISA_use: Thumb-2 + Tag_Virtualization_use: TrustZone |