summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/Tools.cpp
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2012-03-15 04:50:32 +0000
committerDavid Blaikie <dblaikie@gmail.com>2012-03-15 04:50:32 +0000
commitebcbe4b6aaee94d3a1104f86d5771cee151da4bd (patch)
tree44e9a26ba1a9f7a9c9ec4b2d0769bc156cc0b360 /clang/lib/Driver/Tools.cpp
parente059c124a8dc649ebcd8e602a71dd6f31635d7d0 (diff)
downloadbcm5719-llvm-ebcbe4b6aaee94d3a1104f86d5771cee151da4bd.tar.gz
bcm5719-llvm-ebcbe4b6aaee94d3a1104f86d5771cee151da4bd.zip
Reapply r152745 (reverted in 152765) now that compiler-rt is fixed.
Original commit message: Provide -Wnull-conversion separately from -Wconversion. Like GCC, provide a NULL conversion to non-pointer conversion as a separate flag, on by default. GCC's flag is "conversion-null" which we provide for cross compatibility, but in the interests of consistency (with -Wint-conversion, -Wbool-conversion, etc) the canonical Clang flag is called -Wnull-conversion. Patch by Lubos Lunak. Review feedback by myself, Chandler Carruth, and Chad Rosier. llvm-svn: 152774
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
-rw-r--r--clang/lib/Driver/Tools.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 780016a8b86..536897f8792 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -3168,6 +3168,7 @@ void darwin::CC1::RemoveCC1UnsupportedArgs(ArgStringList &CmdArgs) const {
.Case("c++11-narrowing", true)
.Case("conditional-uninitialized", true)
.Case("constant-conversion", true)
+ .Case("conversion-null", true)
.Case("CFString-literal", true)
.Case("constant-logical-operand", true)
.Case("custom-atomic-properties", true)
OpenPOWER on IntegriCloud