commit 875565e55931704ae51c0011e7fb55b80c6d0c7f
author Juergen Ributzka <juergen@ributzka.de> Thu Apr 04 22:56:50 2019 +0000
committer Juergen Ributzka <juergen@ributzka.de> Thu Apr 04 22:56:50 2019 +0000
tree 2f37d256b6726a15ed93827224fc572529f98415
parent b2504035901865106680d7edd9d470c031bd7c5c

[TextAPI] Prefix all architecture enums to fix the build on i386.

Summary: This changes the Architecture enum to use a prefix (AK_) to prevent the
preprocessor from replacing i386 with 1 when building llvm/clang for i386.

Reviewers: steven_wu, lhames, mstorsjo

Reviewed By: mstorsjo

Subscribers: hiraditya, jkorous, dexonsmith, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D60241

llvm-svn: 357733

llvm/lib/TextAPI/MachO/Architecture.cpp

diff --git a/llvm/lib/TextAPI/MachO/Architecture.cpp b/llvm/lib/TextAPI/MachO/Architecture.cpp
index e9d3e9e..a66a982 100644
--- a/llvm/lib/TextAPI/MachO/Architecture.cpp
+++ b/llvm/lib/TextAPI/MachO/Architecture.cpp
@@ -21,29 +21,29 @@
 #define ARCHINFO(Arch, Type, Subtype)                                          \
   if (CPUType == (Type) &&                                                     \
       (CPUSubType & ~MachO::CPU_SUBTYPE_MASK) == (Subtype))                    \
-    return Architecture::Arch;
+    return AK_##Arch;
 #include "llvm/TextAPI/MachO/Architecture.def"
 #undef ARCHINFO
 
-  return Architecture::unknown;
+  return AK_unknown;
 }
 
 Architecture getArchitectureFromName(StringRef Name) {
   return StringSwitch<Architecture>(Name)
-#define ARCHINFO(Arch, Type, Subtype) .Case(#Arch, Architecture::Arch)
+#define ARCHINFO(Arch, Type, Subtype) .Case(#Arch, AK_##Arch)
 #include "llvm/TextAPI/MachO/Architecture.def"
 #undef ARCHINFO
-      .Default(Architecture::unknown);
+      .Default(AK_unknown);
 }
 
 StringRef getArchitectureName(Architecture Arch) {
   switch (Arch) {
 #define ARCHINFO(Arch, Type, Subtype)                                          \
-  case Architecture::Arch:                                                     \
+  case AK_##Arch:                                                              \
     return #Arch;
 #include "llvm/TextAPI/MachO/Architecture.def"
 #undef ARCHINFO
-  case Architecture::unknown:
+  case AK_unknown:
     return "unknown";
   }
 
@@ -55,11 +55,11 @@
 std::pair<uint32_t, uint32_t> getCPUTypeFromArchitecture(Architecture Arch) {
   switch (Arch) {
 #define ARCHINFO(Arch, Type, Subtype)                                          \
-  case Architecture::Arch:                                                     \
+  case AK_##Arch:                                                              \
     return std::make_pair(Type, Subtype);
 #include "llvm/TextAPI/MachO/Architecture.def"
 #undef ARCHINFO
-  case Architecture::unknown:
+  case AK_unknown:
     return std::make_pair(0, 0);
   }
 

llvm/lib/TextAPI/MachO/ArchitectureSet.cpp

diff --git a/llvm/lib/TextAPI/MachO/ArchitectureSet.cpp b/llvm/lib/TextAPI/MachO/ArchitectureSet.cpp
index 882305c..c589671 100644
--- a/llvm/lib/TextAPI/MachO/ArchitectureSet.cpp
+++ b/llvm/lib/TextAPI/MachO/ArchitectureSet.cpp
@@ -18,7 +18,7 @@
 ArchitectureSet::ArchitectureSet(const std::vector<Architecture> &Archs)
     : ArchitectureSet() {
   for (auto Arch : Archs) {
-    if (Arch == Architecture::unknown)
+    if (Arch == AK_unknown)
       continue;
     set(Arch);
   }
@@ -51,7 +51,7 @@
 ArchitectureSet::operator std::vector<Architecture>() const {
   std::vector<Architecture> archs;
   for (auto arch : *this) {
-    if (arch == Architecture::unknown)
+    if (arch == AK_unknown)
       continue;
     archs.emplace_back(arch);
   }

llvm/lib/TextAPI/MachO/TextStubCommon.cpp

diff --git a/llvm/lib/TextAPI/MachO/TextStubCommon.cpp b/llvm/lib/TextAPI/MachO/TextStubCommon.cpp
index 805a900..00382cd 100644
--- a/llvm/lib/TextAPI/MachO/TextStubCommon.cpp
+++ b/llvm/lib/TextAPI/MachO/TextStubCommon.cpp
@@ -85,7 +85,7 @@
 void ScalarBitSetTraits<ArchitectureSet>::bitset(IO &IO,
                                                  ArchitectureSet &Archs) {
 #define ARCHINFO(arch, type, subtype)                                          \
-  IO.bitSetCase(Archs, #arch, 1U << static_cast<int>(Architecture::arch));
+  IO.bitSetCase(Archs, #arch, 1U << static_cast<int>(AK_##arch));
 #include "llvm/TextAPI/MachO/Architecture.def"
 #undef ARCHINFO
 }