summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Lorenz <arphaman@gmail.com>2019-07-12 22:06:08 +0000
committerAlex Lorenz <arphaman@gmail.com>2019-07-12 22:06:08 +0000
commit6d187f0eff662a50057dfb379aeb5e9111239bf0 (patch)
tree4f0aa94cfc78f9d653b0e68aa7c62d0fc4ff181f
parente4b4f994d2f6a090694276b40d433dc1a58beb24 (diff)
downloadbcm5719-llvm-6d187f0eff662a50057dfb379aeb5e9111239bf0.tar.gz
bcm5719-llvm-6d187f0eff662a50057dfb379aeb5e9111239bf0.zip
[macCatalyst] Use macCatalyst pretty name in .build_version darwin
assembly command 'macCatalyst' is more readable than 'maccatalyst'. I renamed the objdump output, but the assembly should match it as well. llvm-svn: 365964
-rw-r--r--llvm/lib/MC/MCAsmStreamer.cpp2
-rw-r--r--llvm/lib/MC/MCParser/DarwinAsmParser.cpp2
-rw-r--r--llvm/test/CodeGen/X86/macCatalyst.ll2
-rw-r--r--llvm/test/MC/MachO/build-version-maccatalyst.s4
4 files changed, 5 insertions, 5 deletions
diff --git a/llvm/lib/MC/MCAsmStreamer.cpp b/llvm/lib/MC/MCAsmStreamer.cpp
index a78092ec458..7e8f02e3a1a 100644
--- a/llvm/lib/MC/MCAsmStreamer.cpp
+++ b/llvm/lib/MC/MCAsmStreamer.cpp
@@ -541,7 +541,7 @@ static const char *getPlatformName(MachO::PlatformType Type) {
case MachO::PLATFORM_TVOS: return "tvos";
case MachO::PLATFORM_WATCHOS: return "watchos";
case MachO::PLATFORM_BRIDGEOS: return "bridgeos";
- case MachO::PLATFORM_MACCATALYST: return "maccatalyst";
+ case MachO::PLATFORM_MACCATALYST: return "macCatalyst";
case MachO::PLATFORM_IOSSIMULATOR: return "iossimulator";
case MachO::PLATFORM_TVOSSIMULATOR: return "tvossimulator";
case MachO::PLATFORM_WATCHOSSIMULATOR: return "watchossimulator";
diff --git a/llvm/lib/MC/MCParser/DarwinAsmParser.cpp b/llvm/lib/MC/MCParser/DarwinAsmParser.cpp
index 1b5b0126734..1160934dc62 100644
--- a/llvm/lib/MC/MCParser/DarwinAsmParser.cpp
+++ b/llvm/lib/MC/MCParser/DarwinAsmParser.cpp
@@ -1169,7 +1169,7 @@ bool DarwinAsmParser::parseBuildVersion(StringRef Directive, SMLoc Loc) {
.Case("ios", MachO::PLATFORM_IOS)
.Case("tvos", MachO::PLATFORM_TVOS)
.Case("watchos", MachO::PLATFORM_WATCHOS)
- .Case("maccatalyst", MachO::PLATFORM_MACCATALYST)
+ .Case("macCatalyst", MachO::PLATFORM_MACCATALYST)
.Default(0);
if (Platform == 0)
return Error(PlatformLoc, "unknown platform name");
diff --git a/llvm/test/CodeGen/X86/macCatalyst.ll b/llvm/test/CodeGen/X86/macCatalyst.ll
index 7a126f1665d..fbf3af54771 100644
--- a/llvm/test/CodeGen/X86/macCatalyst.ll
+++ b/llvm/test/CodeGen/X86/macCatalyst.ll
@@ -1,3 +1,3 @@
; RUN: llc %s -o - | FileCheck %s
target triple="x86_64-apple-ios13.0-macabi"
-; CHECK: .build_version maccatalyst, 13, 0
+; CHECK: .build_version macCatalyst, 13, 0
diff --git a/llvm/test/MC/MachO/build-version-maccatalyst.s b/llvm/test/MC/MachO/build-version-maccatalyst.s
index 9056780810d..aff5589264e 100644
--- a/llvm/test/MC/MachO/build-version-maccatalyst.s
+++ b/llvm/test/MC/MachO/build-version-maccatalyst.s
@@ -1,4 +1,4 @@
// RUN: llvm-mc -triple x86_64-apple-ios %s | FileCheck %s
-.build_version maccatalyst,13,0
-// CHECK: .build_version maccatalyst, 13, 0
+.build_version macCatalyst,13,0
+// CHECK: .build_version macCatalyst, 13, 0
OpenPOWER on IntegriCloud