From: Rafael Espindola Date: Tue, 30 Oct 2012 23:49:11 +0000 (+0000) Subject: Remove ccc-no-clang-cpp, which is also dead now. X-Git-Tag: llvmorg-3.2.0-rc1~570 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=74c5fd93b92f1e4a0acb74c5cd7877699bd411af;p=platform%2Fupstream%2Fllvm.git Remove ccc-no-clang-cpp, which is also dead now. llvm-svn: 167062 --- diff --git a/clang/include/clang/Basic/DiagnosticDriverKinds.td b/clang/include/clang/Basic/DiagnosticDriverKinds.td index 899c37b53374..401d46a7c130 100644 --- a/clang/include/clang/Basic/DiagnosticDriverKinds.td +++ b/clang/include/clang/Basic/DiagnosticDriverKinds.td @@ -119,8 +119,6 @@ def warn_drv_unused_argument : Warning< def warn_drv_empty_joined_argument : Warning< "joined argument expects additional value: '%0'">, InGroup>; -def warn_drv_not_using_clang_cpp : Warning< - "not using the clang preprocessor due to user override">; def warn_drv_clang_unsupported : Warning< "the clang compiler does not support '%0'">; def warn_drv_assuming_mfloat_abi_is : Warning< diff --git a/clang/include/clang/Driver/Driver.h b/clang/include/clang/Driver/Driver.h index 84add7cbd1f3..a55c4f0b1dfa 100644 --- a/clang/include/clang/Driver/Driver.h +++ b/clang/include/clang/Driver/Driver.h @@ -149,10 +149,6 @@ private: /// Use the clang compiler where possible. unsigned CCCUseClang : 1; - /// Use clang as a preprocessor (clang's preprocessor will still be - /// used where an integrated CPP would). - unsigned CCCUseClangCPP : 1; - /// \brief Force use of clang frontend. unsigned ForcedClangUse : 1; diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 81e35239f534..237bf4fc79e4 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -93,8 +93,6 @@ def ccc_gcc_name : Separate<["-"], "ccc-gcc-name">, CCCDriverOpt, MetaVarName<"">; def ccc_no_clang : Flag<["-"], "ccc-no-clang">, CCCDriverOpt, HelpText<"Disable the clang compiler">; -def ccc_no_clang_cpp : Flag<["-"], "ccc-no-clang-cpp">, CCCDriverOpt, - HelpText<"Disable the clang preprocessor">; def ccc_clang_archs : Separate<["-"], "ccc-clang-archs">, CCCDriverOpt, HelpText<"Comma separate list of architectures to use the clang compiler for">, MetaVarName<"">; diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index f8b923286e34..d2aacabac9b0 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -58,7 +58,7 @@ Driver::Driver(StringRef ClangExecutable, CCCIsCPP(false),CCCEcho(false), CCCPrintBindings(false), CCPrintOptions(false), CCPrintHeaders(false), CCLogDiagnostics(false), CCGenDiagnostics(false), CCCGenericGCCName(""), CheckInputsExist(true), - CCCUseClang(true), CCCUseClangCPP(true), + CCCUseClang(true), ForcedClangUse(false), CCCUsePCH(true), SuppressMissingInputWarning(false) { Name = llvm::sys::path::stem(ClangExecutable); @@ -278,7 +278,6 @@ Compilation *Driver::BuildCompilation(ArrayRef ArgList) { CCCUsePCH = Args->hasFlag(options::OPT_ccc_pch_is_pch, options::OPT_ccc_pch_is_pth); CCCUseClang = !Args->hasArg(options::OPT_ccc_no_clang); - CCCUseClangCPP = !Args->hasArg(options::OPT_ccc_no_clang_cpp); // FIXME: DefaultTargetTriple is used by the target-prefixed calls to as/ld // and getToolChain is const. if (const Arg *A = Args->getLastArg(options::OPT_target)) @@ -1786,12 +1785,8 @@ bool Driver::ShouldUseClangCompiler(const Compilation &C, const JobAction &JA, return false; // Otherwise make sure this is an action clang understands. - if (isa(JA)) { - if (!CCCUseClangCPP) { - Diag(clang::diag::warn_drv_not_using_clang_cpp); - return false; - } - } else if (!isa(JA) && !isa(JA)) + if (!isa(JA) && !isa(JA) && + !isa(JA)) return false; return true; diff --git a/clang/test/Driver/bindings.c b/clang/test/Driver/bindings.c index 4db155a22b78..8a6193516432 100644 --- a/clang/test/Driver/bindings.c +++ b/clang/test/Driver/bindings.c @@ -29,10 +29,6 @@ // RUN: %clang -target i386-unknown-unknown -ccc-print-bindings -fsyntax-only -x c++ %s 2>&1 | FileCheck %s --check-prefix=CHECK08 // CHECK08: "clang", inputs: ["{{.*}}bindings.c"], output: (nothing) -// RUN: %clang -target i386-unknown-unknown -ccc-print-bindings -ccc-no-clang-cpp -fsyntax-only -no-integrated-cpp %s 2>&1 | FileCheck %s --check-prefix=CHECK09 -// CHECK09: "gcc::Preprocess", inputs: ["{{.*}}bindings.c"], output: "{{.*}}.i" -// CHECK09: "clang", inputs: ["{{.*}}.i"], output: (nothing) - // RUN: %clang -target i386-apple-darwin9 -ccc-print-bindings %s -S -arch ppc 2>&1 | FileCheck %s --check-prefix=CHECK11 // CHECK11: "clang", inputs: ["{{.*}}bindings.c"], output: "bindings.s" diff --git a/clang/test/Misc/warning-flags.c b/clang/test/Misc/warning-flags.c index aa6c290f8469..c29f495bac1f 100644 --- a/clang/test/Misc/warning-flags.c +++ b/clang/test/Misc/warning-flags.c @@ -18,7 +18,7 @@ This test serves two purposes: The list of warnings below should NEVER grow. It should gradually shrink to 0. -CHECK: Warnings without flags (152): +CHECK: Warnings without flags (151): CHECK-NEXT: ext_delete_void_ptr_operand CHECK-NEXT: ext_enum_friend CHECK-NEXT: ext_expected_semi_decl_list @@ -68,7 +68,6 @@ CHECK-NEXT: warn_delete_array_type CHECK-NEXT: warn_double_const_requires_fp64 CHECK-NEXT: warn_drv_assuming_mfloat_abi_is CHECK-NEXT: warn_drv_clang_unsupported -CHECK-NEXT: warn_drv_not_using_clang_cpp CHECK-NEXT: warn_drv_objc_gc_unsupported CHECK-NEXT: warn_drv_pch_not_first_include CHECK-NEXT: warn_dup_category_def