From 3530682558e75978fb90f3277d175433be339d65 Mon Sep 17 00:00:00 2001 From: Chad Rosier Date: Tue, 9 Oct 2012 19:43:33 +0000 Subject: [PATCH] [driver] Remove the -W[no-][int-conversion|constant-conversion|enum-conversion] options when clang invokes cc1plus for i386 kexts. rdar://12459188 llvm-svn: 165534 --- clang/lib/Driver/Tools.cpp | 2 ++ clang/test/Driver/apple-kext-i386.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 462354a..468a362 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -3595,6 +3595,7 @@ void darwin::CC1::RemoveCC1UnsupportedArgs(ArgStringList &CmdArgs) const { .Case("constant-conversion", true) .Case("conversion-null", true) .Case("CFString-literal", true) + .Case("constant-conversion", true) .Case("constant-logical-operand", true) .Case("custom-atomic-properties", true) .Case("default-arg-special-member", true) @@ -3618,6 +3619,7 @@ void darwin::CC1::RemoveCC1UnsupportedArgs(ArgStringList &CmdArgs) const { .Case("incomplete-implementation", true) .Case("int-conversion", true) .Case("initializer-overrides", true) + .Case("int-conversion", true) .Case("invalid-noreturn", true) .Case("invalid-token-paste", true) .Case("language-extension-token", true) diff --git a/clang/test/Driver/apple-kext-i386.cpp b/clang/test/Driver/apple-kext-i386.cpp index eb9f957..db7a080 100644 --- a/clang/test/Driver/apple-kext-i386.cpp +++ b/clang/test/Driver/apple-kext-i386.cpp @@ -18,6 +18,7 @@ // RUN: %clang -target i386-apple-darwin10 \ // RUN: -Wno-self-assign -Wc++11-extensions -Wno-microsoft -Wmicrosoft -Wvla \ // RUN: -faltivec -mthumb -mcpu=G4 -mlongcall -mno-longcall -msoft-float \ +// RUN: -Wno-int-conversion -Wconstant-conversion -Wenum-conversion \ // RUN: -fapple-kext -### -fsyntax-only %s 2> %t // RUN: FileCheck --check-prefix=CHECK-UNSUPPORTED < %t %s @@ -32,6 +33,9 @@ // CHECK-UNSUPPORTED-NOT: "-mlongcall" // CHECK-UNSUPPORTED: "-mno-longcall" // CHECK-UNSUPPORTED: "-msoft-float" +// CHECK-UNSUPPORTED-NOT: "-Wno-int-conversion" +// CHECK-UNSUPPORTED-NOT: "-Wconstant-conversion" +// CHECK-UNSUPPORTED-NOT: "-Wenum-conversion" // RUN: %clang -target i386-apple-darwin10 \ // RUN: -Wconstant-logical-operand -save-temps \ -- 2.7.4