maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Remove the -ccc-echo option that is now unused. 

llvm-svn: 186970
This commit is contained in:
Rafael Espindola 2013-07-23 17:58:53 +00:00
parent 555575c32b
commit 8c4245455a
5 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/include/clang/Driver/Driver.h
View File

@ -129,9 +129,6 @@ public:
/// Whether the driver is just the preprocessor.
bool CCCIsCPP() const { return Mode == CPPMode; }
/// Echo commands while executing (in -v style).
unsigned CCCEcho : 1;
/// Only print tool bindings, don't build any jobs.
unsigned CCCPrintBindings : 1;

2
clang/include/clang/Driver/Options.td
View File

@ -114,8 +114,6 @@ def ccc_debug_Group : OptionGroup<"<clang debug/development internal options>">,
class CCCDriverOpt : Group<ccc_driver_Group>, Flags<[DriverOption, HelpHidden]>;
def driver_mode : Joined<["--"], "driver-mode=">, CCCDriverOpt,
HelpText<"Set the driver mode to either 'gcc', 'g++' or 'cpp'">;
def ccc_echo : Flag<["-"], "ccc-echo">, CCCDriverOpt,
HelpText<"Echo commands before running them">;
def ccc_gcc_name : Separate<["-"], "ccc-gcc-name">, CCCDriverOpt,
HelpText<"Name for native GCC compiler">,
MetaVarName<"<gcc-path>">;

2
clang/lib/Driver/Compilation.cpp
View File

@ -266,7 +266,7 @@ int Compilation::ExecuteCommand(const Command &C,
std::copy(C.getArguments().begin(), C.getArguments().end(), Argv+1);
Argv[C.getArguments().size() + 1] = 0;
if ((getDriver().CCCEcho || getDriver().CCPrintOptions ||
if ((getDriver().CCPrintOptions ||
getArgs().hasArg(options::OPT_v)) && !getDriver().CCGenDiagnostics) {
raw_ostream *OS = &llvm::errs();

3
clang/lib/Driver/Driver.cpp
View File

@ -55,7 +55,7 @@ Driver::Driver(StringRef ClangExecutable,
DriverTitle("clang LLVM compiler"),
CCPrintOptionsFilename(0), CCPrintHeadersFilename(0),
CCLogDiagnosticsFilename(0),
CCCEcho(false), CCCPrintBindings(false),
CCCPrintBindings(false),
CCPrintOptions(false), CCPrintHeaders(false), CCLogDiagnostics(false),
CCGenDiagnostics(false), CCCGenericGCCName(""), CheckInputsExist(true),
CCCUsePCH(true), SuppressMissingInputWarning(false) {
@ -300,7 +300,6 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
CCCPrintOptions = Args->hasArg(options::OPT_ccc_print_options);
CCCPrintActions = Args->hasArg(options::OPT_ccc_print_phases);
CCCPrintBindings = Args->hasArg(options::OPT_ccc_print_bindings);
CCCEcho = Args->hasArg(options::OPT_ccc_echo);
if (const Arg *A = Args->getLastArg(options::OPT_ccc_gcc_name))
CCCGenericGCCName = A->getValue();
CCCUsePCH = Args->hasFlag(options::OPT_ccc_pch_is_pch,

9
clang/test/Driver/ccc-add-args.c
View File

@ -1,5 +1,4 @@
// RUN: env CCC_ADD_ARGS="-ccc-echo,-ccc-print-options,,-v" %clang -### 2>&1 | FileCheck %s
// CHECK: Option 0 - Name: "-ccc-echo", Values: {}
// CHECK: Option 1 - Name: "-ccc-print-options", Values: {}
// CHECK: Option 2 - Name: "-v", Values: {}
// CHECK: Option 3 - Name: "-###", Values: {}
// RUN: env CCC_ADD_ARGS="-ccc-print-options,,-v" %clang -### 2>&1 | FileCheck %s
// CHECK: Option 0 - Name: "-ccc-print-options", Values: {}
// CHECK: Option 1 - Name: "-v", Values: {}
// CHECK: Option 2 - Name: "-###", Values: {}