diff options
| author | Artyom Skrobov <Artyom.Skrobov@arm.com> | 2015-11-16 14:05:32 +0000 |
|---|---|---|
| committer | Artyom Skrobov <Artyom.Skrobov@arm.com> | 2015-11-16 14:05:32 +0000 |
| commit | f187a65f99938da692caf99145d281754cf4dd45 (patch) | |
| tree | 4dba573e29425e07b419ad321af1e39589347e75 /llvm/lib/Support/Triple.cpp | |
| parent | 2f7f5e3535589a6c83a579a2fd2debae1d83f3f4 (diff) | |
| download | llvm-f187a65f99938da692caf99145d281754cf4dd45.zip llvm-f187a65f99938da692caf99145d281754cf4dd45.tar.gz llvm-f187a65f99938da692caf99145d281754cf4dd45.tar.bz2 | |
Handle ARMv6KZ naming
Summary:
* ARMv6KZ is the "canonical" name, given in the ARMARM
* ARMv6Z is an "official abbreviation" for it, mentioned in the ARMARM
* ARMv6ZK is a popular misspelling, which we should support as an alias.
The patch corrects the handling of the names.
Functional changes:
* ARMv6Z no longer treated as an architecture in its own right
* ARMv6ZK renamed to ARMv6KZ, accepting ARMv6ZK as an alias
* arm1176jz-s and arm1176jzf-s recognized as ARMv6ZK, instead of ARMv6K
* default ARMv6K CPU changed to arm1176j-s
Reviewers: rengolin, logan, compnerd
Subscribers: aemerson, llvm-commits, rengolin
Differential Revision: http://reviews.llvm.org/D14568
llvm-svn: 253206
Diffstat (limited to 'llvm/lib/Support/Triple.cpp')
| -rw-r--r-- | llvm/lib/Support/Triple.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp index 71bca75..b036433 100644 --- a/llvm/lib/Support/Triple.cpp +++ b/llvm/lib/Support/Triple.cpp @@ -497,10 +497,9 @@ static Triple::SubArchType parseSubArch(StringRef SubArchName) { return Triple::ARMSubArch_v5te; case ARM::AK_ARMV6: case ARM::AK_ARMV6J: - case ARM::AK_ARMV6Z: return Triple::ARMSubArch_v6; case ARM::AK_ARMV6K: - case ARM::AK_ARMV6ZK: + case ARM::AK_ARMV6KZ: return Triple::ARMSubArch_v6k; case ARM::AK_ARMV6T2: return Triple::ARMSubArch_v6t2; |