Driver: Add host info.
- Replace assorted -ccc-host-* options by -ccc-host-triple which is
more sane.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@66600 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Driver/Driver.h b/include/clang/Driver/Driver.h
index 61ec549..38451c6 100644
--- a/include/clang/Driver/Driver.h
+++ b/include/clang/Driver/Driver.h
@@ -38,6 +38,9 @@
/// The path the driver executable was in, as invoked from the
/// command line.
std::string Dir;
+
+ /// Default host triple.
+ std::string DefaultHostTriple;
/// Host information for the platform the driver is running as. This
/// will generally be the actual host platform, but not always.
@@ -73,7 +76,8 @@
std::list<std::string> ResultFiles;
public:
- Driver(const char *_Name, const char *_Dir);
+ Driver(const char *_Name, const char *_Dir,
+ const char *_DefaultHostTriple);
~Driver();
@@ -85,6 +89,10 @@
/// PrintOptions - Print the given list of arguments.
void PrintOptions(const ArgList *Args);
+
+ /// GetHostInfo - Construct a new host info object for the given
+ /// host triple.
+ static HostInfo *GetHostInfo(const char *HostTriple);
};
} // end namespace driver
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index 6b1d44e..4b29ae3 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -12,15 +12,18 @@
#include "clang/Driver/Arg.h"
#include "clang/Driver/ArgList.h"
#include "clang/Driver/Compilation.h"
+#include "clang/Driver/HostInfo.h"
#include "clang/Driver/Option.h"
#include "clang/Driver/Options.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang::driver;
-Driver::Driver(const char *_Name, const char *_Dir)
+Driver::Driver(const char *_Name, const char *_Dir,
+ const char *_DefaultHostTriple)
: Opts(new OptTable()),
- Name(_Name), Dir(_Dir), Host(0),
+ Name(_Name), Dir(_Dir), DefaultHostTriple(_DefaultHostTriple),
+ Host(0),
CCCIsCXX(false), CCCEcho(false),
CCCNoClang(false), CCCNoClangCXX(false), CCCNoClangCPP(false)
{
@@ -53,6 +56,7 @@
bool CCCPrintOptions = false, CCCPrintPhases = false;
const char **Start = argv + 1, **End = argv + argc;
+ const char *HostTriple = DefaultHostTriple.c_str();
// Read -ccc args.
//
@@ -94,18 +98,9 @@
}
}
- } else if (!strcmp(Opt, "host-bits")) {
+ } else if (!strcmp(Opt, "host-triple")) {
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;
+ HostTriple = *++Start;
} else {
// FIXME: Error handling.
@@ -113,7 +108,9 @@
exit(1);
}
}
-
+
+ Host = Driver::GetHostInfo(HostTriple);
+
ArgList *Args = ParseArgStrings(Start, End);
// FIXME: This behavior shouldn't be here.
@@ -121,7 +118,7 @@
PrintOptions(Args);
exit(0);
}
-
+
assert(0 && "FIXME: Implement");
return new Compilation();
@@ -143,3 +140,26 @@
llvm::errs() << "}\n";
}
}
+
+HostInfo *Driver::GetHostInfo(const char *Triple) {
+ // Dice into arch, platform, and OS. This matches
+ // arch,platform,os = '(.*?)-(.*?)-(.*?)'
+ // and missing fields are left empty.
+ std::string Arch, Platform, OS;
+
+ if (const char *ArchEnd = strchr(Triple, '-')) {
+ Arch = std::string(Triple, ArchEnd);
+
+ if (const char *PlatformEnd = strchr(ArchEnd+1, '-')) {
+ Platform = std::string(ArchEnd+1, PlatformEnd);
+ OS = PlatformEnd+1;
+ } else
+ Platform = ArchEnd+1;
+ } else
+ Arch = Triple;
+
+ if (memcmp(&Platform[0], "darwin", 6) == 0)
+ return new DarwinHostInfo(Arch.c_str(), Platform.c_str(), OS.c_str());
+
+ return new UnknownHostInfo(Arch.c_str(), Platform.c_str(), OS.c_str());
+}
diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
index ad6c807..b9e94b2 100644
--- a/tools/driver/driver.cpp
+++ b/tools/driver/driver.cpp
@@ -18,6 +18,7 @@
#include "clang/Driver/Options.h"
#include "llvm/ADT/OwningPtr.h"
+#include "llvm/Config/config.h"
#include "llvm/System/Path.h"
#include "llvm/System/Signals.h"
using namespace clang::driver;
@@ -30,8 +31,11 @@
// is that the path derived from this will influence search paths.
llvm::sys::Path Path(argv[0]);
+ // FIXME: Use the triple of the host, not the triple that we were
+ // compiled on.
llvm::OwningPtr<Driver> TheDriver(new Driver(Path.getBasename().c_str(),
- Path.getDirname().c_str()));
+ Path.getDirname().c_str(),
+ LLVM_HOSTTRIPLE));
llvm::OwningPtr<Compilation> C(TheDriver->BuildCompilation(argc, argv));