diff options
| author | Renato Golin <renato.golin@linaro.org> | 2015-05-12 10:34:10 +0000 |
|---|---|---|
| committer | Renato Golin <renato.golin@linaro.org> | 2015-05-12 10:34:10 +0000 |
| commit | cb3b0c6eeb850fd55398ea92aef38777f33e172b (patch) | |
| tree | 76e918eda59c4b1c9bbc477781854381df75c86f /clang/lib/Driver/Tools.cpp | |
| parent | 35de35d03fdd94ad119e296d1ff58a9607abd513 (diff) | |
| download | bcm5719-llvm-cb3b0c6eeb850fd55398ea92aef38777f33e172b.tar.gz bcm5719-llvm-cb3b0c6eeb850fd55398ea92aef38777f33e172b.zip | |
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
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index c1b51583a30..ac35a09e1e2 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/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; |
