From: Renato Golin <renato.golin@linaro.org>
Date: Tue, 12 May 2015 10:34:10 +0000 (+0000)
Subject: Change TargetParser enum names to avoid macro conflicts (clang)
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36a485732adb084fd34117e6ba7881b005733988;p=clang

Change TargetParser enum names to avoid macro conflicts (clang)

sys/time.h on Solaris (and possibly other systems) defines "SEC" as "1"
using a cpp macro.  The result is that this fails to compile.

Fixes https://llvm.org/PR23482

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@237113 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index c1b51583a3..ac35a09e1e 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -562,53 +562,53 @@ static void getARMFPUFeatures(const Driver &D, const Arg *A,
 
   // All other FPU types, valid or invalid.
   switch(llvm::ARMTargetParser::parseFPU(FPU)) {
-  case llvm::ARM::INVALID_FPU:
-  case llvm::ARM::SOFTVFP:
+  case llvm::ARM::FK_INVALID:
+  case llvm::ARM::FK_SOFTVFP:
     Features.push_back("-vfp2");
     Features.push_back("-vfp3");
     Features.push_back("-neon");
     break;
-  case llvm::ARM::VFP:
-  case llvm::ARM::VFPV2:
+  case llvm::ARM::FK_VFP:
+  case llvm::ARM::FK_VFPV2:
     Features.push_back("+vfp2");
     Features.push_back("-neon");
     break;
-  case llvm::ARM::VFPV3_D16:
+  case llvm::ARM::FK_VFPV3_D16:
     Features.push_back("+d16");
     // fall-through
-  case llvm::ARM::VFPV3:
+  case llvm::ARM::FK_VFPV3:
     Features.push_back("+vfp3");
     Features.push_back("-neon");
     break;
-  case llvm::ARM::VFPV4_D16:
+  case llvm::ARM::FK_VFPV4_D16:
     Features.push_back("+d16");
     // fall-through
-  case llvm::ARM::VFPV4:
+  case llvm::ARM::FK_VFPV4:
     Features.push_back("+vfp4");
     Features.push_back("-neon");
     break;
-  case llvm::ARM::FPV5_D16:
+  case llvm::ARM::FK_FPV5_D16:
     Features.push_back("+d16");
     // fall-through
-  case llvm::ARM::FP_ARMV8:
+  case llvm::ARM::FK_FP_ARMV8:
     Features.push_back("+fp-armv8");
     Features.push_back("-neon");
     Features.push_back("-crypto");
     break;
-  case llvm::ARM::NEON_FP_ARMV8:
+  case llvm::ARM::FK_NEON_FP_ARMV8:
     Features.push_back("+fp-armv8");
     Features.push_back("+neon");
     Features.push_back("-crypto");
     break;
-  case llvm::ARM::CRYPTO_NEON_FP_ARMV8:
+  case llvm::ARM::FK_CRYPTO_NEON_FP_ARMV8:
     Features.push_back("+fp-armv8");
     Features.push_back("+neon");
     Features.push_back("+crypto");
     break;
-  case llvm::ARM::NEON:
+  case llvm::ARM::FK_NEON:
     Features.push_back("+neon");
     break;
-  case llvm::ARM::NEON_VFPV4:
+  case llvm::ARM::FK_NEON_VFPV4:
     Features.push_back("+neon");
     Features.push_back("+vfp4");
     break;