r276831 - Fix for compiling with clang <= 3.7 and g++6 headers
Vedant Kumar via cfe-commits
cfe-commits at lists.llvm.org
Tue Jul 26 20:43:34 PDT 2016
Author: vedantk
Date: Tue Jul 26 22:43:34 2016
New Revision: 276831
URL: http://llvm.org/viewvc/llvm-project?rev=276831&view=rev
Log:
Fix for compiling with clang <= 3.7 and g++6 headers
Make integers explicitly unsigned, so the tuple constructor will resolve
properly when but with clang 3.6, 3.7 and gcc 6.1.1 libstdc++ headers.
Patch by Frederich Munch!
Differential Revision: https://reviews.llvm.org/D22798
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=276831&r1=276830&r2=276831&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Tue Jul 26 22:43:34 2016
@@ -3819,13 +3819,13 @@ ParsePICArgs(const ToolChain &ToolChain,
// match that of llvm-gcc and Apple GCC before that.
PIC = ToolChain.isPICDefault() && ToolChain.isPICDefaultForced();
- return std::make_tuple(llvm::Reloc::DynamicNoPIC, PIC ? 2 : 0, false);
+ return std::make_tuple(llvm::Reloc::DynamicNoPIC, PIC ? 2U : 0U, false);
}
if (PIC)
- return std::make_tuple(llvm::Reloc::PIC_, IsPICLevelTwo ? 2 : 1, PIE);
+ return std::make_tuple(llvm::Reloc::PIC_, IsPICLevelTwo ? 2U : 1U, PIE);
- return std::make_tuple(llvm::Reloc::Static, 0, false);
+ return std::make_tuple(llvm::Reloc::Static, 0U, false);
}
static const char *RelocationModelName(llvm::Reloc::Model Model) {
More information about the cfe-commits
mailing list