summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Support
diff options
context:
space:
mode:
authorIsmail Donmez <ismail@donmez.ws>2015-05-05 09:29:43 +0000
committerIsmail Donmez <ismail@donmez.ws>2015-05-05 09:29:43 +0000
commit5eb52b74cb51e4e24998550a235bb2d73c3b18e7 (patch)
tree73041ccedb264bfa5059e65ab756f85517f27293 /llvm/lib/Support
parenta744ff58f32241ad263c7cff43fa698f98836aa9 (diff)
downloadbcm5719-llvm-5eb52b74cb51e4e24998550a235bb2d73c3b18e7.tar.gz
bcm5719-llvm-5eb52b74cb51e4e24998550a235bb2d73c3b18e7.zip
Fix regression in parsing armv{6,7}hl- triples. These are used by SUSE
and Redhat currently. Reviewed by Jonathan Roelofs. llvm-svn: 236492
Diffstat (limited to 'llvm/lib/Support')
-rw-r--r--llvm/lib/Support/Triple.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp
index b27feceb93d..0a10a48557e 100644
--- a/llvm/lib/Support/Triple.cpp
+++ b/llvm/lib/Support/Triple.cpp
@@ -279,9 +279,10 @@ static Triple::ArchType parseARMArch(StringRef ArchName) {
.Cases("v3", "v3m", isThumb ? Triple::UnknownArch : arch)
.Cases("v4", "v4t", arch)
.Cases("v5", "v5e", "v5t", "v5te", "v5tej", arch)
- .Cases("v6", "v6j", "v6k", "v6m", "v6sm", arch)
+ .Cases("v6", "v6hl", "v6j", "v6k", arch)
+ .Cases("v6m", "v6sm", arch)
.Cases("v6t2", "v6z", "v6zk", arch)
- .Cases("v7", "v7a", "v7em", "v7l", arch)
+ .Cases("v7", "v7a", "v7em", "v7hl", "v7l", arch)
.Cases("v7m", "v7r", "v7s", arch)
.Cases("v8", "v8a", arch)
.Cases("v8.1", "v8.1a", arch)
OpenPOWER on IntegriCloud