maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

llvm-svn: 237113
This commit is contained in:
Renato Golin 2015-05-12 10:34:10 +00:00
parent 35de35d03f
commit cb3b0c6eeb
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
clang/lib/Driver/Tools.cpp
View File

@ -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;