diff options
author | Vedant Kumar <vsk@apple.com> | 2016-07-27 03:43:34 +0000 |
---|---|---|
committer | Vedant Kumar <vsk@apple.com> | 2016-07-27 03:43:34 +0000 |
commit | ae7e39a6e441cd6c129e0531d86a9834ca4bbe86 (patch) | |
tree | 77ff3b7864ee6a5f657745438eba4c09edd71972 /clang | |
parent | e5730a27f22f4eace6caf9a4cdd6a58ef95709c8 (diff) | |
download | bcm5719-llvm-ae7e39a6e441cd6c129e0531d86a9834ca4bbe86.tar.gz bcm5719-llvm-ae7e39a6e441cd6c129e0531d86a9834ca4bbe86.zip |
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
llvm-svn: 276831
Diffstat (limited to 'clang')
-rw-r--r-- | clang/lib/Driver/Tools.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 4038f0f5df4..e747149679c 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -3819,13 +3819,13 @@ ParsePICArgs(const ToolChain &ToolChain, const llvm::Triple &Triple, // 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) { |