X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=lib%2FSupport%2FTargetParser.cpp;fp=lib%2FSupport%2FTargetParser.cpp;h=a57b48f8a4eca365b0c2c06582a560c2bcc90341;hp=05b06fbae5ef5d70392a90adf7c1fb9200bbdf0b;hb=4c351fd4e8436df6bef759bc75d468785da72467;hpb=05400e9493fe6f8290516f854f911932835d34ef

diff --git a/lib/Support/TargetParser.cpp b/lib/Support/TargetParser.cpp
index 05b06fbae5e..a57b48f8a4e 100644
--- a/lib/Support/TargetParser.cpp
+++ b/lib/Support/TargetParser.cpp
@@ -382,6 +382,7 @@ static StringRef getArchSynonym(StringRef Arch) {
       .Case("v5e", "v5te")
       .Case("v6hl", "v6k")
       .Cases("v6m", "v6sm", "v6s-m", "v6-m")
+      .Cases("v6z", "v6zk", "v6kz")
       .Cases("v7", "v7a", "v7hl", "v7l", "v7-a")
       .Case("v7r", "v7-r")
       .Case("v7m", "v7-m")
@@ -561,8 +562,7 @@ unsigned llvm::ARM::parseArchVersion(StringRef Arch) {
   case ARM::AK_ARMV6J:
   case ARM::AK_ARMV6K:
   case ARM::AK_ARMV6T2:
-  case ARM::AK_ARMV6Z:
-  case ARM::AK_ARMV6ZK:
+  case ARM::AK_ARMV6KZ:
   case ARM::AK_ARMV6M:
     return 6;
   case ARM::AK_ARMV7A: