Summary: (This is a move-only refactoring patch. There are no functionality changes.) This patch splits apart the Clang driver's tool and toolchain implementation files. Each target platform toolchain is moved to its own file, along with the closest-related tools. Each target platform toolchain has separate headers and implementation files, so the hierarchy of classes is unchanged. There are some remaining shared free functions, mostly from Tools.cpp. Several of these move to their own architecture-specific files, similar to r296056. Some of them are only used by a single target platform; since the tools and toolchains are now together, some helpers now live in a platform-specific file. The balance are helpers related to manipulating argument lists, so they are now in a new file pair, CommonArgs.h and .cpp. I've tried to cluster the code logically, which is fairly straightforward for most of the target platforms and shared architectures. I think I've made reasonable choices for these, as well as the various shared helpers; but of course, I'm happy to hear feedback in the review. There are some particular things I don't like about this patch, but haven't been able to find a better overall solution. The first is the proliferation of files: there are several files that are tiny because the toolchain is not very different from its base (usually the Gnu tools/toolchain). I think this is mostly a reflection of the true complexity, though, so it may not be "fixable" in any reasonable sense. The second thing I don't like are the includes like "../Something.h". I've avoided this largely by clustering into the current file structure. However, a few of these includes remain, and in those cases it doesn't make sense to me to sink an existing file any deeper. Reviewers: rsmith, mehdi_amini, compnerd, rnk, javed.absar Subscribers: emaste, jfb, danalbert, srhines, dschuff, jyknight, nemanjai, nhaehnle, mgorny, cfe-commits Differential Revision: https://reviews.llvm.org/D30372 llvm-svn: 297250
293 lines
7.8 KiB
C++
293 lines
7.8 KiB
C++
//===--- Multilib.cpp - Multilib Implementation ---------------------------===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "clang/Driver/Multilib.h"
|
|
#include "ToolChains/CommonArgs.h"
|
|
#include "clang/Driver/Options.h"
|
|
#include "llvm/ADT/StringMap.h"
|
|
#include "llvm/ADT/StringRef.h"
|
|
#include "llvm/ADT/StringSet.h"
|
|
#include "llvm/Option/Arg.h"
|
|
#include "llvm/Option/ArgList.h"
|
|
#include "llvm/Option/OptTable.h"
|
|
#include "llvm/Option/Option.h"
|
|
#include "llvm/Support/Path.h"
|
|
#include "llvm/Support/Regex.h"
|
|
#include "llvm/Support/YAMLParser.h"
|
|
#include "llvm/Support/YAMLTraits.h"
|
|
#include "llvm/Support/raw_ostream.h"
|
|
#include <algorithm>
|
|
|
|
using namespace clang::driver;
|
|
using namespace clang;
|
|
using namespace llvm::opt;
|
|
using namespace llvm::sys;
|
|
|
|
/// normalize Segment to "/foo/bar" or "".
|
|
static void normalizePathSegment(std::string &Segment) {
|
|
StringRef seg = Segment;
|
|
|
|
// Prune trailing "/" or "./"
|
|
while (1) {
|
|
StringRef last = path::filename(seg);
|
|
if (last != ".")
|
|
break;
|
|
seg = path::parent_path(seg);
|
|
}
|
|
|
|
if (seg.empty() || seg == "/") {
|
|
Segment = "";
|
|
return;
|
|
}
|
|
|
|
// Add leading '/'
|
|
if (seg.front() != '/') {
|
|
Segment = "/" + seg.str();
|
|
} else {
|
|
Segment = seg;
|
|
}
|
|
}
|
|
|
|
Multilib::Multilib(StringRef GCCSuffix, StringRef OSSuffix,
|
|
StringRef IncludeSuffix)
|
|
: GCCSuffix(GCCSuffix), OSSuffix(OSSuffix), IncludeSuffix(IncludeSuffix) {
|
|
normalizePathSegment(this->GCCSuffix);
|
|
normalizePathSegment(this->OSSuffix);
|
|
normalizePathSegment(this->IncludeSuffix);
|
|
}
|
|
|
|
Multilib &Multilib::gccSuffix(StringRef S) {
|
|
GCCSuffix = S;
|
|
normalizePathSegment(GCCSuffix);
|
|
return *this;
|
|
}
|
|
|
|
Multilib &Multilib::osSuffix(StringRef S) {
|
|
OSSuffix = S;
|
|
normalizePathSegment(OSSuffix);
|
|
return *this;
|
|
}
|
|
|
|
Multilib &Multilib::includeSuffix(StringRef S) {
|
|
IncludeSuffix = S;
|
|
normalizePathSegment(IncludeSuffix);
|
|
return *this;
|
|
}
|
|
|
|
void Multilib::print(raw_ostream &OS) const {
|
|
assert(GCCSuffix.empty() || (StringRef(GCCSuffix).front() == '/'));
|
|
if (GCCSuffix.empty())
|
|
OS << ".";
|
|
else {
|
|
OS << StringRef(GCCSuffix).drop_front();
|
|
}
|
|
OS << ";";
|
|
for (StringRef Flag : Flags) {
|
|
if (Flag.front() == '+')
|
|
OS << "@" << Flag.substr(1);
|
|
}
|
|
}
|
|
|
|
bool Multilib::isValid() const {
|
|
llvm::StringMap<int> FlagSet;
|
|
for (unsigned I = 0, N = Flags.size(); I != N; ++I) {
|
|
StringRef Flag(Flags[I]);
|
|
llvm::StringMap<int>::iterator SI = FlagSet.find(Flag.substr(1));
|
|
|
|
assert(StringRef(Flag).front() == '+' || StringRef(Flag).front() == '-');
|
|
|
|
if (SI == FlagSet.end())
|
|
FlagSet[Flag.substr(1)] = I;
|
|
else if (Flags[I] != Flags[SI->getValue()])
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool Multilib::operator==(const Multilib &Other) const {
|
|
// Check whether the flags sets match
|
|
// allowing for the match to be order invariant
|
|
llvm::StringSet<> MyFlags;
|
|
for (const auto &Flag : Flags)
|
|
MyFlags.insert(Flag);
|
|
|
|
for (const auto &Flag : Other.Flags)
|
|
if (MyFlags.find(Flag) == MyFlags.end())
|
|
return false;
|
|
|
|
if (osSuffix() != Other.osSuffix())
|
|
return false;
|
|
|
|
if (gccSuffix() != Other.gccSuffix())
|
|
return false;
|
|
|
|
if (includeSuffix() != Other.includeSuffix())
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
raw_ostream &clang::driver::operator<<(raw_ostream &OS, const Multilib &M) {
|
|
M.print(OS);
|
|
return OS;
|
|
}
|
|
|
|
MultilibSet &MultilibSet::Maybe(const Multilib &M) {
|
|
Multilib Opposite;
|
|
// Negate any '+' flags
|
|
for (StringRef Flag : M.flags()) {
|
|
if (Flag.front() == '+')
|
|
Opposite.flags().push_back(("-" + Flag.substr(1)).str());
|
|
}
|
|
return Either(M, Opposite);
|
|
}
|
|
|
|
MultilibSet &MultilibSet::Either(const Multilib &M1, const Multilib &M2) {
|
|
return Either({M1, M2});
|
|
}
|
|
|
|
MultilibSet &MultilibSet::Either(const Multilib &M1, const Multilib &M2,
|
|
const Multilib &M3) {
|
|
return Either({M1, M2, M3});
|
|
}
|
|
|
|
MultilibSet &MultilibSet::Either(const Multilib &M1, const Multilib &M2,
|
|
const Multilib &M3, const Multilib &M4) {
|
|
return Either({M1, M2, M3, M4});
|
|
}
|
|
|
|
MultilibSet &MultilibSet::Either(const Multilib &M1, const Multilib &M2,
|
|
const Multilib &M3, const Multilib &M4,
|
|
const Multilib &M5) {
|
|
return Either({M1, M2, M3, M4, M5});
|
|
}
|
|
|
|
static Multilib compose(const Multilib &Base, const Multilib &New) {
|
|
SmallString<128> GCCSuffix;
|
|
llvm::sys::path::append(GCCSuffix, "/", Base.gccSuffix(), New.gccSuffix());
|
|
SmallString<128> OSSuffix;
|
|
llvm::sys::path::append(OSSuffix, "/", Base.osSuffix(), New.osSuffix());
|
|
SmallString<128> IncludeSuffix;
|
|
llvm::sys::path::append(IncludeSuffix, "/", Base.includeSuffix(),
|
|
New.includeSuffix());
|
|
|
|
Multilib Composed(GCCSuffix, OSSuffix, IncludeSuffix);
|
|
|
|
Multilib::flags_list &Flags = Composed.flags();
|
|
|
|
Flags.insert(Flags.end(), Base.flags().begin(), Base.flags().end());
|
|
Flags.insert(Flags.end(), New.flags().begin(), New.flags().end());
|
|
|
|
return Composed;
|
|
}
|
|
|
|
MultilibSet &MultilibSet::Either(ArrayRef<Multilib> MultilibSegments) {
|
|
multilib_list Composed;
|
|
|
|
if (Multilibs.empty())
|
|
Multilibs.insert(Multilibs.end(), MultilibSegments.begin(),
|
|
MultilibSegments.end());
|
|
else {
|
|
for (const Multilib &New : MultilibSegments) {
|
|
for (const Multilib &Base : *this) {
|
|
Multilib MO = compose(Base, New);
|
|
if (MO.isValid())
|
|
Composed.push_back(MO);
|
|
}
|
|
}
|
|
|
|
Multilibs = Composed;
|
|
}
|
|
|
|
return *this;
|
|
}
|
|
|
|
MultilibSet &MultilibSet::FilterOut(FilterCallback F) {
|
|
filterInPlace(F, Multilibs);
|
|
return *this;
|
|
}
|
|
|
|
MultilibSet &MultilibSet::FilterOut(const char *Regex) {
|
|
llvm::Regex R(Regex);
|
|
#ifndef NDEBUG
|
|
std::string Error;
|
|
if (!R.isValid(Error)) {
|
|
llvm::errs() << Error;
|
|
llvm_unreachable("Invalid regex!");
|
|
}
|
|
#endif
|
|
|
|
filterInPlace([&R](const Multilib &M) { return R.match(M.gccSuffix()); },
|
|
Multilibs);
|
|
return *this;
|
|
}
|
|
|
|
void MultilibSet::push_back(const Multilib &M) { Multilibs.push_back(M); }
|
|
|
|
void MultilibSet::combineWith(const MultilibSet &Other) {
|
|
Multilibs.insert(Multilibs.end(), Other.begin(), Other.end());
|
|
}
|
|
|
|
static bool isFlagEnabled(StringRef Flag) {
|
|
char Indicator = Flag.front();
|
|
assert(Indicator == '+' || Indicator == '-');
|
|
return Indicator == '+';
|
|
}
|
|
|
|
bool MultilibSet::select(const Multilib::flags_list &Flags, Multilib &M) const {
|
|
llvm::StringMap<bool> FlagSet;
|
|
|
|
// Stuff all of the flags into the FlagSet such that a true mappend indicates
|
|
// the flag was enabled, and a false mappend indicates the flag was disabled.
|
|
for (StringRef Flag : Flags)
|
|
FlagSet[Flag.substr(1)] = isFlagEnabled(Flag);
|
|
|
|
multilib_list Filtered = filterCopy([&FlagSet](const Multilib &M) {
|
|
for (StringRef Flag : M.flags()) {
|
|
llvm::StringMap<bool>::const_iterator SI = FlagSet.find(Flag.substr(1));
|
|
if (SI != FlagSet.end())
|
|
if (SI->getValue() != isFlagEnabled(Flag))
|
|
return true;
|
|
}
|
|
return false;
|
|
}, Multilibs);
|
|
|
|
if (Filtered.size() == 0)
|
|
return false;
|
|
if (Filtered.size() == 1) {
|
|
M = Filtered[0];
|
|
return true;
|
|
}
|
|
|
|
// TODO: pick the "best" multlib when more than one is suitable
|
|
assert(false);
|
|
return false;
|
|
}
|
|
|
|
void MultilibSet::print(raw_ostream &OS) const {
|
|
for (const Multilib &M : *this)
|
|
OS << M << "\n";
|
|
}
|
|
|
|
MultilibSet::multilib_list MultilibSet::filterCopy(FilterCallback F,
|
|
const multilib_list &Ms) {
|
|
multilib_list Copy(Ms);
|
|
filterInPlace(F, Copy);
|
|
return Copy;
|
|
}
|
|
|
|
void MultilibSet::filterInPlace(FilterCallback F, multilib_list &Ms) {
|
|
Ms.erase(std::remove_if(Ms.begin(), Ms.end(), F), Ms.end());
|
|
}
|
|
|
|
raw_ostream &clang::driver::operator<<(raw_ostream &OS, const MultilibSet &MS) {
|
|
MS.print(OS);
|
|
return OS;
|
|
}
|