r237113 - Change TargetParser enum names to avoid macro conflicts (clang)

[Renato Golin]

Author: rengolin
Date: Tue May 12 05:34:10 2015
New Revision: 237113

URL: http://llvm.org/viewvc/llvm-project?rev=237113&view=rev
Log:
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

Modified:
    cfe/trunk/lib/Driver/Tools.cpp

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=237113&r1=237112&r2=237113&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Tue May 12 05:34:10 2015
@@ -562,53 +562,53 @@ static void getARMFPUFeatures(const Driv
 
   // 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;