[cfe-commits] r66575 - in /cfe/trunk: include/clang/Driver/Driver.h lib/Driver/Driver.cpp tools/ccc/ccclib/Driver.py tools/driver/driver.cpp
Daniel Dunbar
daniel at zuster.org
Tue Mar 10 13:53:03 PDT 2009
Author: ddunbar
Date: Tue Mar 10 15:52:46 2009
New Revision: 66575
URL: http://llvm.org/viewvc/llvm-project?rev=66575&view=rev
Log:
Driver: Handle magic -ccc- options.
- Follows ccc currently, but this functionality should eventually be
outside the Driver lib.
Modified:
cfe/trunk/include/clang/Driver/Driver.h
cfe/trunk/lib/Driver/Driver.cpp
cfe/trunk/tools/ccc/ccclib/Driver.py
cfe/trunk/tools/driver/driver.cpp
Modified: cfe/trunk/include/clang/Driver/Driver.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Driver.h?rev=66575&r1=66574&r2=66575&view=diff
==============================================================================
--- cfe/trunk/include/clang/Driver/Driver.h (original)
+++ cfe/trunk/include/clang/Driver/Driver.h Tue Mar 10 15:52:46 2009
@@ -10,10 +10,15 @@
#ifndef CLANG_DRIVER_DRIVER_H_
#define CLANG_DRIVER_DRIVER_H_
+#include <list>
+#include <set>
+#include <string>
+
namespace clang {
namespace driver {
class ArgList;
class Compilation;
+ class HostInfo;
class OptTable;
/// Driver - Encapsulate logic for constructing compilation processes
@@ -25,15 +30,61 @@
/// ArgList.
ArgList *ParseArgStrings(const char **ArgBegin, const char **ArgEnd);
+ // FIXME: Privatize once interface is stable.
+public:
+ /// The name the driver was invoked as.
+ std::string Name;
+
+ /// The path the driver executable was in, as invoked from the
+ /// command line.
+ std::string Dir;
+
+ /// Host information for the platform the driver is running as. This
+ /// will generally be the actual host platform, but not always.
+ HostInfo *Host;
+
+ /// Information about the host which can be overriden by the user.
+ std::string HostBits, HostMachine, HostSystem, HostRelease;
+
+ /// Whether the driver should follow g++ like behavior.
+ bool CCCIsCXX : 1;
+
+ /// Echo commands while executing (in -v style).
+ bool CCCEcho : 1;
+
+ /// Don't use clang for any tasks.
+ bool CCCNoClang : 1;
+
+ /// Don't use clang for handling C++ and Objective-C++ inputs.
+ bool CCCNoClangCXX : 1;
+
+ /// Don't use clang as a preprocessor (clang's preprocessor will
+ /// still be used where an integrated CPP would).
+ bool CCCNoClangCPP : 1;
+
+ /// Only use clang for the given architectures. Only used when
+ /// non-empty.
+ std::set<std::string> CCCClangArchs;
+
+ /// Certain options suppress the 'no input files' warning.
+ bool SuppressMissingInputWarning : 1;
+
+ std::list<std::string> TempFiles;
+ std::list<std::string> ResultFiles;
+
public:
- Driver();
+ Driver(const char *_Name, const char *_Dir);
~Driver();
+
const OptTable &getOpts() const { return *Opts; }
/// BuildCompilation - Construct a compilation object for a command
/// line argument vector.
Compilation *BuildCompilation(int argc, const char **argv);
+
+ /// PrintOptions - Print the given list of arguments.
+ void PrintOptions(const ArgList *Args);
};
} // end namespace driver
Modified: cfe/trunk/lib/Driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=66575&r1=66574&r2=66575&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Driver.cpp (original)
+++ cfe/trunk/lib/Driver/Driver.cpp Tue Mar 10 15:52:46 2009
@@ -18,7 +18,12 @@
#include "llvm/Support/raw_ostream.h"
using namespace clang::driver;
-Driver::Driver() : Opts(new OptTable()) {
+Driver::Driver(const char *_Name, const char *_Dir)
+ : Opts(new OptTable()),
+ Name(_Name), Dir(_Dir), Host(0),
+ CCCIsCXX(false), CCCEcho(false),
+ CCCNoClang(false), CCCNoClangCXX(false), CCCNoClangCPP(false)
+{
}
@@ -43,11 +48,88 @@
}
Compilation *Driver::BuildCompilation(int argc, const char **argv) {
- ArgList *Args = ParseArgStrings(argv + 1, argv + argc);
+ // FIXME: This stuff needs to go into the Compilation, not the
+ // driver.
+ bool CCCPrintOptions = false, CCCPrintPhases = false;
+
+ const char **Start = argv + 1, **End = argv + argc;
+
+ // Read -ccc args.
+ //
+ // FIXME: We need to figure out where this behavior should
+ // live. Most of it should be outside in the client; the parts that
+ // aren't should have proper options, either by introducing new ones
+ // or by overloading gcc ones like -V or -b.
+ for (; Start != End && memcmp(*Start, "-ccc-", 5) == 0; ++Start) {
+ const char *Opt = *Start + 5;
+
+ if (!strcmp(Opt, "print-options")) {
+ CCCPrintOptions = true;
+ } else if (!strcmp(Opt, "print-phases")) {
+ CCCPrintPhases = true;
+ } else if (!strcmp(Opt, "cxx")) {
+ CCCIsCXX = true;
+ } else if (!strcmp(Opt, "echo")) {
+ CCCEcho = true;
+
+ } else if (!strcmp(Opt, "no-clang")) {
+ CCCNoClang = true;
+ } else if (!strcmp(Opt, "no-clang-cxx")) {
+ CCCNoClangCXX = true;
+ } else if (!strcmp(Opt, "no-clang-cpp")) {
+ CCCNoClangCPP = true;
+ } else if (!strcmp(Opt, "clang-archs")) {
+ assert(Start+1 < End && "FIXME: -ccc- argument handling.");
+ const char *Cur = *++Start;
+
+ for (;;) {
+ const char *Next = strchr(Cur, ',');
+
+ if (Next) {
+ CCCClangArchs.insert(std::string(Cur, Next));
+ Cur = Next + 1;
+ } else {
+ CCCClangArchs.insert(std::string(Cur));
+ break;
+ }
+ }
+
+ } else if (!strcmp(Opt, "host-bits")) {
+ assert(Start+1 < End && "FIXME: -ccc- argument handling.");
+ HostBits = *++Start;
+ } else if (!strcmp(Opt, "host-machine")) {
+ assert(Start+1 < End && "FIXME: -ccc- argument handling.");
+ HostMachine = *++Start;
+ } else if (!strcmp(Opt, "host-release")) {
+ assert(Start+1 < End && "FIXME: -ccc- argument handling.");
+ HostRelease = *++Start;
+ } else if (!strcmp(Opt, "host-system")) {
+ assert(Start+1 < End && "FIXME: -ccc- argument handling.");
+ HostSystem = *++Start;
+
+ } else {
+ // FIXME: Error handling.
+ llvm::errs() << "invalid option: " << *Start << "\n";
+ exit(1);
+ }
+ }
+
+ ArgList *Args = ParseArgStrings(Start, End);
+
+ // FIXME: This behavior shouldn't be here.
+ if (CCCPrintOptions) {
+ PrintOptions(Args);
+ exit(0);
+ }
+
+ assert(0 && "FIXME: Implement");
- // Hard coded to print-options behavior.
+ return new Compilation();
+}
+
+void Driver::PrintOptions(const ArgList *Args) {
unsigned i = 0;
- for (ArgList::iterator it = Args->begin(), ie = Args->end();
+ for (ArgList::const_iterator it = Args->begin(), ie = Args->end();
it != ie; ++it, ++i) {
Arg *A = *it;
llvm::errs() << "Option " << i << " - "
@@ -60,6 +142,4 @@
}
llvm::errs() << "}\n";
}
-
- return new Compilation();
}
Modified: cfe/trunk/tools/ccc/ccclib/Driver.py
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/ccc/ccclib/Driver.py?rev=66575&r1=66574&r2=66575&view=diff
==============================================================================
--- cfe/trunk/tools/ccc/ccclib/Driver.py (original)
+++ cfe/trunk/tools/ccc/ccclib/Driver.py Tue Mar 10 15:52:46 2009
@@ -30,7 +30,6 @@
self.cccHostSystem = self.cccHostRelease = None
self.cccCXX = False
self.cccEcho = False
- self.cccFallback = False
self.cccNoClang = self.cccNoClangCXX = self.cccNoClangPreprocessor = False
self.cccClangArchs = None
@@ -139,8 +138,6 @@
self.cccCXX = True
elif opt == 'echo':
self.cccEcho = True
- elif opt == 'fallback':
- self.cccFallback = True
elif opt == 'no-clang':
self.cccNoClang = True
Modified: cfe/trunk/tools/driver/driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/driver.cpp?rev=66575&r1=66574&r2=66575&view=diff
==============================================================================
--- cfe/trunk/tools/driver/driver.cpp (original)
+++ cfe/trunk/tools/driver/driver.cpp Tue Mar 10 15:52:46 2009
@@ -18,13 +18,20 @@
#include "clang/Driver/Options.h"
#include "llvm/ADT/OwningPtr.h"
+#include "llvm/System/Path.h"
#include "llvm/System/Signals.h"
using namespace clang::driver;
int main(int argc, const char **argv) {
llvm::sys::PrintStackTraceOnErrorSignal();
- llvm::OwningPtr<Driver> TheDriver(new Driver());
+ // FIXME: We should use GetMainExecutable here, probably, but we may
+ // want to handle symbolic links slightly differently. The problem
+ // is that the path derived from this will influence search paths.
+ llvm::sys::Path Path(argv[0]);
+
+ llvm::OwningPtr<Driver> TheDriver(new Driver(Path.getBasename().c_str(),
+ Path.getDirname().c_str()));
llvm::OwningPtr<Compilation> C(TheDriver->BuildCompilation(argc, argv));
More information about the cfe-commits
mailing list