summaryrefslogtreecommitdiffstats
path: root/lib/Driver
diff options
context:
space:
mode:
authorChad Rosier <mcrosier@apple.com>2012-03-15 01:00:38 +0000
committerChad Rosier <mcrosier@apple.com>2012-03-15 01:00:38 +0000
commit9ca33fd56720112bcc4bccb8aa6107abbb68cae3 (patch)
tree5b059aa547b1b48a1ce20994614e0b91d6ac605f /lib/Driver
parentd75fb492f7616046797bfe5353e9478d8e25628e (diff)
Revert r152745 as it's breaking the internal buildbots.
Abbreviated commit message: Provide -Wnull-conversion separately from -Wconversion. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152765 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver')
-rw-r--r--lib/Driver/Tools.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 536897f879..780016a8b8 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -3168,7 +3168,6 @@ 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)