diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-arm.c | 84 |
2 files changed, 47 insertions, 42 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 9a28648..47fa7ae 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,10 @@ 2018-07-02 Thomas Preud'homme <thomas.preudhomme@arm.com> + * config/tc-arm.c (cpu_arch_ver): Use symbolic TAG_CPU_ARCH macros + rather than hardcode their values. + +2018-07-02 Thomas Preud'homme <thomas.preudhomme@arm.com> + * NEWS: Use command-line consistently when used in a compount word. * doc/as.texi: Likewise. * doc/c-aarch64.texi: Likewise. diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 6a9a655..ef814ff 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -26984,30 +26984,30 @@ typedef struct stable when new architectures are added. */ static const cpu_arch_ver_table cpu_arch_ver[] = { - {0, ARM_ARCH_V1}, - {0, ARM_ARCH_V2}, - {0, ARM_ARCH_V2S}, - {0, ARM_ARCH_V3}, - {0, ARM_ARCH_V3M}, - {1, ARM_ARCH_V4xM}, - {1, ARM_ARCH_V4}, - {2, ARM_ARCH_V4TxM}, - {2, ARM_ARCH_V4T}, - {3, ARM_ARCH_V5xM}, - {3, ARM_ARCH_V5}, - {3, ARM_ARCH_V5TxM}, - {3, ARM_ARCH_V5T}, - {4, ARM_ARCH_V5TExP}, - {4, ARM_ARCH_V5TE}, - {5, ARM_ARCH_V5TEJ}, - {6, ARM_ARCH_V6}, - {7, ARM_ARCH_V6Z}, - {7, ARM_ARCH_V6KZ}, - {9, ARM_ARCH_V6K}, - {8, ARM_ARCH_V6T2}, - {8, ARM_ARCH_V6KT2}, - {8, ARM_ARCH_V6ZT2}, - {8, ARM_ARCH_V6KZT2}, + {TAG_CPU_ARCH_PRE_V4, ARM_ARCH_V1}, + {TAG_CPU_ARCH_PRE_V4, ARM_ARCH_V2}, + {TAG_CPU_ARCH_PRE_V4, ARM_ARCH_V2S}, + {TAG_CPU_ARCH_PRE_V4, ARM_ARCH_V3}, + {TAG_CPU_ARCH_PRE_V4, ARM_ARCH_V3M}, + {TAG_CPU_ARCH_V4, ARM_ARCH_V4xM}, + {TAG_CPU_ARCH_V4, ARM_ARCH_V4}, + {TAG_CPU_ARCH_V4T, ARM_ARCH_V4TxM}, + {TAG_CPU_ARCH_V4T, ARM_ARCH_V4T}, + {TAG_CPU_ARCH_V5T, ARM_ARCH_V5xM}, + {TAG_CPU_ARCH_V5T, ARM_ARCH_V5}, + {TAG_CPU_ARCH_V5T, ARM_ARCH_V5TxM}, + {TAG_CPU_ARCH_V5T, ARM_ARCH_V5T}, + {TAG_CPU_ARCH_V5TE, ARM_ARCH_V5TExP}, + {TAG_CPU_ARCH_V5TE, ARM_ARCH_V5TE}, + {TAG_CPU_ARCH_V5TEJ, ARM_ARCH_V5TEJ}, + {TAG_CPU_ARCH_V6, ARM_ARCH_V6}, + {TAG_CPU_ARCH_V6KZ, ARM_ARCH_V6Z}, + {TAG_CPU_ARCH_V6KZ, ARM_ARCH_V6KZ}, + {TAG_CPU_ARCH_V6K, ARM_ARCH_V6K}, + {TAG_CPU_ARCH_V6T2, ARM_ARCH_V6T2}, + {TAG_CPU_ARCH_V6T2, ARM_ARCH_V6KT2}, + {TAG_CPU_ARCH_V6T2, ARM_ARCH_V6ZT2}, + {TAG_CPU_ARCH_V6T2, ARM_ARCH_V6KZT2}, /* When assembling a file with only ARMv6-M or ARMv6S-M instruction, GNU as always selected build attributes to match those of ARMv6-M @@ -27016,24 +27016,24 @@ static const cpu_arch_ver_table cpu_arch_ver[] = would be selected when fully respecting chronology of architectures. It is thus necessary to make a special case of ARMv6-M and ARMv6S-M and move them before ARMv7 architectures. */ - {11, ARM_ARCH_V6M}, - {12, ARM_ARCH_V6SM}, - - {10, ARM_ARCH_V7}, - {10, ARM_ARCH_V7A}, - {10, ARM_ARCH_V7R}, - {10, ARM_ARCH_V7M}, - {10, ARM_ARCH_V7VE}, - {13, ARM_ARCH_V7EM}, - {14, ARM_ARCH_V8A}, - {14, ARM_ARCH_V8_1A}, - {14, ARM_ARCH_V8_2A}, - {14, ARM_ARCH_V8_3A}, - {16, ARM_ARCH_V8M_BASE}, - {17, ARM_ARCH_V8M_MAIN}, - {15, ARM_ARCH_V8R}, - {14, ARM_ARCH_V8_4A}, - {-1, ARM_ARCH_NONE} + {TAG_CPU_ARCH_V6_M, ARM_ARCH_V6M}, + {TAG_CPU_ARCH_V6S_M, ARM_ARCH_V6SM}, + + {TAG_CPU_ARCH_V7, ARM_ARCH_V7}, + {TAG_CPU_ARCH_V7, ARM_ARCH_V7A}, + {TAG_CPU_ARCH_V7, ARM_ARCH_V7R}, + {TAG_CPU_ARCH_V7, ARM_ARCH_V7M}, + {TAG_CPU_ARCH_V7, ARM_ARCH_V7VE}, + {TAG_CPU_ARCH_V7E_M, ARM_ARCH_V7EM}, + {TAG_CPU_ARCH_V8, ARM_ARCH_V8A}, + {TAG_CPU_ARCH_V8, ARM_ARCH_V8_1A}, + {TAG_CPU_ARCH_V8, ARM_ARCH_V8_2A}, + {TAG_CPU_ARCH_V8, ARM_ARCH_V8_3A}, + {TAG_CPU_ARCH_V8M_BASE, ARM_ARCH_V8M_BASE}, + {TAG_CPU_ARCH_V8M_MAIN, ARM_ARCH_V8M_MAIN}, + {TAG_CPU_ARCH_V8R, ARM_ARCH_V8R}, + {TAG_CPU_ARCH_V8, ARM_ARCH_V8_4A}, + {-1, ARM_ARCH_NONE} }; /* Set an attribute if it has not already been set by the user. */ |