Skip to content
This repository has been archived by the owner on Apr 23, 2020. It is now read-only.

Commit

Permalink
Driver: Start ripping out support for -pipe, which is worthless and c…
Browse files Browse the repository at this point in the history
…omplicates

too many other things.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@110007 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
ddunbar committed Aug 2, 2010
1 parent 95c0457 commit c19a12d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 23 deletions.
21 changes: 4 additions & 17 deletions lib/Driver/Driver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,9 @@ Compilation *Driver::BuildCompilation(int argc, const char **argv) {
// -no-canonical-prefixes is used very early in main.
Args->ClaimAllArgs(options::OPT_no_canonical_prefixes);

// Ignore -pipe.
Args->ClaimAllArgs(options::OPT_pipe);

// Extract -ccc args.
//
// FIXME: We need to figure out where this behavior should live. Most of it
Expand Down Expand Up @@ -884,16 +887,6 @@ Action *Driver::ConstructPhaseAction(const ArgList &Args, phases::ID Phase,

void Driver::BuildJobs(Compilation &C) const {
llvm::PrettyStackTraceString CrashInfo("Building compilation jobs");
bool SaveTemps = C.getArgs().hasArg(options::OPT_save_temps);
bool UsePipes = C.getArgs().hasArg(options::OPT_pipe);

// FIXME: Pipes are forcibly disabled until we support executing them.
if (!CCCPrintBindings)
UsePipes = false;

// -save-temps inhibits pipes.
if (SaveTemps && UsePipes)
Diag(clang::diag::warn_drv_pipe_ignored_with_save_temps);

Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o);

Expand Down Expand Up @@ -1037,11 +1030,6 @@ void Driver::BuildJobsForAction(Compilation &C,
InputInfo &Result) const {
llvm::PrettyStackTraceString CrashInfo("Building compilation jobs");

bool UsePipes = C.getArgs().hasArg(options::OPT_pipe);
// FIXME: Pipes are forcibly disabled until we support executing them.
if (!CCCPrintBindings)
UsePipes = false;

if (const InputAction *IA = dyn_cast<InputAction>(A)) {
// FIXME: It would be nice to not claim this here; maybe the old scheme of
// just using Args was better?
Expand Down Expand Up @@ -1101,8 +1089,7 @@ void Driver::BuildJobsForAction(Compilation &C,
if (AtTopLevel) {
if (isa<PreprocessJobAction>(A) && !C.getArgs().hasArg(options::OPT_o))
OutputToPipe = true;
} else if (UsePipes)
OutputToPipe = true;
}
}

// Figure out where to put the job (pipes).
Expand Down
6 changes: 0 additions & 6 deletions test/Driver/bindings.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@
// RUN: grep '"gcc::Assemble", inputs: \[".*\.s"\], output: ".*\.o"' %t
// RUN: grep '"gcc::Link", inputs: \[".*\.o"\], output: "a.out"' %t

// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -no-integrated-cpp -pipe %s 2> %t
// RUN: grep '"gcc::Preprocess", inputs: \[".*bindings.c"\], output: (pipe)' %t
// RUN: grep '"gcc::Compile", inputs: \[(pipe)\], output: (pipe)' %t
// RUN: grep '"gcc::Assemble", inputs: \[(pipe)\], output: ".*\.o"' %t
// RUN: grep '"gcc::Link", inputs: \[".*\.o"\], output: "a.out"' %t

// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -x c-header %s 2> %t
// RUN: grep '"gcc::Precompile", inputs: \[".*bindings.c"\], output: ".*bindings.c.gch' %t

Expand Down

0 comments on commit c19a12d

Please sign in to comment.