head 1.1; branch 1.1.1; access; symbols netbsd-9-5-RELEASE:1.1.1.7 netbsd-11-0-RELEASE:1.1.1.8 netbsd-11-0-RC7:1.1.1.8 netbsd-11-0-RC6:1.1.1.8 netbsd-11-0-RC5:1.1.1.8 netbsd-11-0-RC4:1.1.1.8 netbsd-11-0-RC3:1.1.1.8 netbsd-11-0-RC2:1.1.1.8 netbsd-11-0-RC1:1.1.1.8 perseant-exfatfs-base-20250801:1.1.1.8 netbsd-11:1.1.1.8.0.10 netbsd-11-base:1.1.1.8 netbsd-10-1-RELEASE:1.1.1.8 perseant-exfatfs-base-20240630:1.1.1.8 perseant-exfatfs:1.1.1.8.0.8 perseant-exfatfs-base:1.1.1.8 netbsd-8-3-RELEASE:1.1.1.5 netbsd-9-4-RELEASE:1.1.1.7 netbsd-10-0-RELEASE:1.1.1.8 netbsd-10-0-RC6:1.1.1.8 netbsd-10-0-RC5:1.1.1.8 netbsd-10-0-RC4:1.1.1.8 netbsd-10-0-RC3:1.1.1.8 netbsd-10-0-RC2:1.1.1.8 netbsd-10-0-RC1:1.1.1.8 netbsd-10:1.1.1.8.0.6 netbsd-10-base:1.1.1.8 netbsd-9-3-RELEASE:1.1.1.7 cjep_sun2x:1.1.1.8.0.4 cjep_sun2x-base:1.1.1.8 cjep_staticlib_x-base1:1.1.1.8 netbsd-9-2-RELEASE:1.1.1.7 cjep_staticlib_x:1.1.1.8.0.2 cjep_staticlib_x-base:1.1.1.8 netbsd-9-1-RELEASE:1.1.1.7 phil-wifi-20200421:1.1.1.8 phil-wifi-20200411:1.1.1.8 phil-wifi-20200406:1.1.1.8 netbsd-8-2-RELEASE:1.1.1.5 netbsd-9-0-RELEASE:1.1.1.7 netbsd-9-0-RC2:1.1.1.7 netbsd-9-0-RC1:1.1.1.7 netbsd-9:1.1.1.7.0.2 netbsd-9-base:1.1.1.7 phil-wifi-20190609:1.1.1.7 netbsd-8-1-RELEASE:1.1.1.5 netbsd-8-1-RC1:1.1.1.5 pgoyette-compat-merge-20190127:1.1.1.6.2.1 pgoyette-compat-20190127:1.1.1.7 pgoyette-compat-20190118:1.1.1.7 pgoyette-compat-1226:1.1.1.7 pgoyette-compat-1126:1.1.1.7 pgoyette-compat-1020:1.1.1.7 pgoyette-compat-0930:1.1.1.7 pgoyette-compat-0906:1.1.1.7 netbsd-7-2-RELEASE:1.1.1.3 pgoyette-compat-0728:1.1.1.7 clang-337282:1.1.1.7 netbsd-8-0-RELEASE:1.1.1.5 phil-wifi:1.1.1.6.0.4 phil-wifi-base:1.1.1.6 pgoyette-compat-0625:1.1.1.6 netbsd-8-0-RC2:1.1.1.5 pgoyette-compat-0521:1.1.1.6 pgoyette-compat-0502:1.1.1.6 pgoyette-compat-0422:1.1.1.6 netbsd-8-0-RC1:1.1.1.5 pgoyette-compat-0415:1.1.1.6 pgoyette-compat-0407:1.1.1.6 pgoyette-compat-0330:1.1.1.6 pgoyette-compat-0322:1.1.1.6 pgoyette-compat-0315:1.1.1.6 netbsd-7-1-2-RELEASE:1.1.1.3 pgoyette-compat:1.1.1.6.0.2 pgoyette-compat-base:1.1.1.6 netbsd-7-1-1-RELEASE:1.1.1.3 clang-319952:1.1.1.6 matt-nb8-mediatek:1.1.1.5.0.10 matt-nb8-mediatek-base:1.1.1.5 clang-309604:1.1.1.6 perseant-stdc-iso10646:1.1.1.5.0.8 perseant-stdc-iso10646-base:1.1.1.5 netbsd-8:1.1.1.5.0.6 netbsd-8-base:1.1.1.5 prg-localcount2-base3:1.1.1.5 prg-localcount2-base2:1.1.1.5 prg-localcount2-base1:1.1.1.5 prg-localcount2:1.1.1.5.0.4 prg-localcount2-base:1.1.1.5 pgoyette-localcount-20170426:1.1.1.5 bouyer-socketcan-base1:1.1.1.5 pgoyette-localcount-20170320:1.1.1.5 netbsd-7-1:1.1.1.3.0.10 netbsd-7-1-RELEASE:1.1.1.3 netbsd-7-1-RC2:1.1.1.3 clang-294123:1.1.1.5 netbsd-7-nhusb-base-20170116:1.1.1.3 bouyer-socketcan:1.1.1.5.0.2 bouyer-socketcan-base:1.1.1.5 clang-291444:1.1.1.5 pgoyette-localcount-20170107:1.1.1.4 netbsd-7-1-RC1:1.1.1.3 pgoyette-localcount-20161104:1.1.1.4 netbsd-7-0-2-RELEASE:1.1.1.3 localcount-20160914:1.1.1.4 netbsd-7-nhusb:1.1.1.3.0.8 netbsd-7-nhusb-base:1.1.1.3 clang-280599:1.1.1.4 pgoyette-localcount-20160806:1.1.1.4 pgoyette-localcount-20160726:1.1.1.4 pgoyette-localcount:1.1.1.4.0.2 pgoyette-localcount-base:1.1.1.4 netbsd-7-0-1-RELEASE:1.1.1.3 clang-261930:1.1.1.4 netbsd-7-0:1.1.1.3.0.6 netbsd-7-0-RELEASE:1.1.1.3 netbsd-7-0-RC3:1.1.1.3 netbsd-7-0-RC2:1.1.1.3 netbsd-7-0-RC1:1.1.1.3 clang-237755:1.1.1.3 clang-232565:1.1.1.3 clang-227398:1.1.1.3 tls-maxphys-base:1.1.1.3 tls-maxphys:1.1.1.3.0.4 netbsd-7:1.1.1.3.0.2 netbsd-7-base:1.1.1.3 clang-215315:1.1.1.3 clang-209886:1.1.1.2 yamt-pagecache:1.1.1.1.0.4 yamt-pagecache-base9:1.1.1.1 tls-earlyentropy:1.1.1.1.0.2 tls-earlyentropy-base:1.1.1.2 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.1 riastradh-drm2-base3:1.1.1.1 clang-202566:1.1.1.1 LLVM:1.1.1; locks; strict; comment @// @; 1.1 date 2014.03.04.19.54.54; author joerg; state Exp; branches 1.1.1.1; next ; commitid 29z1hJonZISIXprx; 1.1.1.1 date 2014.03.04.19.54.54; author joerg; state Exp; branches 1.1.1.1.2.1 1.1.1.1.4.1; next 1.1.1.2; commitid 29z1hJonZISIXprx; 1.1.1.2 date 2014.05.30.18.14.41; author joerg; state Exp; branches; next 1.1.1.3; commitid 8q0kdlBlCn09GACx; 1.1.1.3 date 2014.08.10.17.08.34; author joerg; state Exp; branches 1.1.1.3.4.1; next 1.1.1.4; commitid N85tXAN6Ex9VZPLx; 1.1.1.4 date 2016.02.27.22.12.04; author joerg; state Exp; branches 1.1.1.4.2.1; next 1.1.1.5; commitid tIimz3oDlh1NpBWy; 1.1.1.5 date 2017.01.11.10.33.40; author joerg; state Exp; branches; next 1.1.1.6; commitid CNnUNfII1jgNmxBz; 1.1.1.6 date 2017.08.01.19.34.59; author joerg; state Exp; branches 1.1.1.6.2.1 1.1.1.6.4.1; next 1.1.1.7; commitid pMuDy65V0VicSx1A; 1.1.1.7 date 2018.07.17.18.31.13; author joerg; state Exp; branches; next 1.1.1.8; commitid wDzL46ALjrCZgwKA; 1.1.1.8 date 2019.11.13.22.19.22; author joerg; state dead; branches; next ; commitid QD8YATxuNG34YJKB; 1.1.1.1.2.1 date 2014.08.10.07.08.08; author tls; state Exp; branches; next ; commitid t01A1TLTYxkpGMLx; 1.1.1.1.4.1 date 2014.03.04.19.54.54; author yamt; state dead; branches; next 1.1.1.1.4.2; commitid WSrDtL5nYAUyiyBx; 1.1.1.1.4.2 date 2014.05.22.16.18.27; author yamt; state Exp; branches; next ; commitid WSrDtL5nYAUyiyBx; 1.1.1.3.4.1 date 2014.08.10.17.08.34; author tls; state dead; branches; next 1.1.1.3.4.2; commitid jTnpym9Qu0o4R1Nx; 1.1.1.3.4.2 date 2014.08.19.23.47.27; author tls; state Exp; branches; next ; commitid jTnpym9Qu0o4R1Nx; 1.1.1.4.2.1 date 2017.03.20.06.52.37; author pgoyette; state Exp; branches; next ; commitid jjw7cAwgyKq7RfKz; 1.1.1.6.2.1 date 2018.07.28.04.33.18; author pgoyette; state Exp; branches; next ; commitid 1UP1xAIUxv1ZgRLA; 1.1.1.6.4.1 date 2019.06.10.21.45.22; author christos; state Exp; branches; next 1.1.1.6.4.2; commitid jtc8rnCzWiEEHGqB; 1.1.1.6.4.2 date 2020.04.13.07.46.33; author martin; state dead; branches; next ; commitid X01YhRUPVUDaec4C; desc @@ 1.1 log @Initial revision @ text @//===--- 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 "Tools.h" #include "clang/Driver/Options.h" #include "llvm/ADT/StringMap.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringSet.h" #include "llvm/ADT/Triple.h" #include "llvm/Option/Arg.h" #include "llvm/Option/ArgList.h" #include "llvm/Option/OptTable.h" #include "llvm/Option/Option.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/Regex.h" #include "llvm/Support/YAMLParser.h" #include "llvm/Support/YAMLTraits.h" #include 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::end(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 (flags_list::const_iterator I = Flags.begin(), E = Flags.end(); I != E; ++I) { if (StringRef(*I).front() == '+') OS << "@@" << I->substr(1); } } bool Multilib::isValid() const { llvm::StringMap FlagSet; for (unsigned I = 0, N = Flags.size(); I != N; ++I) { StringRef Flag(Flags[I]); llvm::StringMap::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 (flags_list::const_iterator I = Flags.begin(), E = Flags.end(); I != E; ++I) { MyFlags.insert(*I); } for (flags_list::const_iterator I = Other.Flags.begin(), E = Other.Flags.end(); I != E; ++I) { if (MyFlags.find(*I) == 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 (Multilib::flags_list::const_iterator I = M.flags().begin(), E = M.flags().end(); I != E; ++I) { StringRef Flag(*I); if (Flag.front() == '+') Opposite.flags().push_back(("-" + Flag.substr(1)).str()); } return Either(M, Opposite); } MultilibSet &MultilibSet::Either(const Multilib &M1, const Multilib &M2) { std::vector Ms; Ms.push_back(M1); Ms.push_back(M2); return Either(Ms); } MultilibSet &MultilibSet::Either(const Multilib &M1, const Multilib &M2, const Multilib &M3) { std::vector Ms; Ms.push_back(M1); Ms.push_back(M2); Ms.push_back(M3); return Either(Ms); } MultilibSet &MultilibSet::Either(const Multilib &M1, const Multilib &M2, const Multilib &M3, const Multilib &M4) { std::vector Ms; Ms.push_back(M1); Ms.push_back(M2); Ms.push_back(M3); Ms.push_back(M4); return Either(Ms); } MultilibSet &MultilibSet::Either(const Multilib &M1, const Multilib &M2, const Multilib &M3, const Multilib &M4, const Multilib &M5) { std::vector Ms; Ms.push_back(M1); Ms.push_back(M2); Ms.push_back(M3); Ms.push_back(M4); Ms.push_back(M5); return Either(Ms); } 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.str(), OSSuffix.str(), IncludeSuffix.str()); 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(const std::vector &MultilibSegments) { multilib_list Composed; if (Multilibs.empty()) Multilibs.insert(Multilibs.end(), MultilibSegments.begin(), MultilibSegments.end()); else { for (std::vector::const_iterator NewI = MultilibSegments.begin(), NewE = MultilibSegments.end(); NewI != NewE; ++NewI) { for (const_iterator BaseI = begin(), BaseE = end(); BaseI != BaseE; ++BaseI) { Multilib MO = compose(*BaseI, *NewI); if (MO.isValid()) Composed.push_back(MO); } } Multilibs = Composed; } return *this; } MultilibSet &MultilibSet::FilterOut(const MultilibSet::FilterCallback &F) { filterInPlace(F, Multilibs); return *this; } MultilibSet &MultilibSet::FilterOut(std::string Regex) { class REFilter : public MultilibSet::FilterCallback { mutable llvm::Regex R; public: REFilter(std::string Regex) : R(Regex) {} bool operator()(const Multilib &M) const LLVM_OVERRIDE { std::string Error; if (!R.isValid(Error)) { llvm::errs() << Error; assert(false); return false; } return R.match(M.gccSuffix()); } }; REFilter REF(Regex); filterInPlace(REF, 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()); } bool MultilibSet::select(const Multilib::flags_list &Flags, Multilib &M) const { class FilterFlagsMismatch : public MultilibSet::FilterCallback { llvm::StringMap FlagSet; public: FilterFlagsMismatch(const std::vector &Flags) { // 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 (Multilib::flags_list::const_iterator I = Flags.begin(), E = Flags.end(); I != E; ++I) { FlagSet[StringRef(*I).substr(1)] = isFlagEnabled(*I); } } bool operator()(const Multilib &M) const LLVM_OVERRIDE { for (Multilib::flags_list::const_iterator I = M.flags().begin(), E = M.flags().end(); I != E; ++I) { StringRef Flag(*I); llvm::StringMap::const_iterator SI = FlagSet.find(Flag.substr(1)); if (SI != FlagSet.end()) if ((*SI).getValue() != isFlagEnabled(Flag)) return true; } return false; } private: bool isFlagEnabled(StringRef Flag) const { char Indicator = Flag.front(); assert(Indicator == '+' || Indicator == '-'); return Indicator == '+'; } }; FilterFlagsMismatch FlagsMismatch(Flags); multilib_list Filtered = filterCopy(FlagsMismatch, Multilibs); if (Filtered.size() == 0) { return false; } else 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_iterator I = begin(), E = end(); I != E; ++I) OS << *I << "\n"; } MultilibSet::multilib_list MultilibSet::filterCopy(const MultilibSet::FilterCallback &F, const multilib_list &Ms) { multilib_list Copy(Ms); filterInPlace(F, Copy); return Copy; } namespace { // Wrapper for FilterCallback to make operator() nonvirtual so it // can be passed by value to std::remove_if class FilterWrapper { const MultilibSet::FilterCallback &F; public: FilterWrapper(const MultilibSet::FilterCallback &F) : F(F) {} bool operator()(const Multilib &M) const { return F(M); } }; } // end anonymous namespace void MultilibSet::filterInPlace(const MultilibSet::FilterCallback &F, multilib_list &Ms) { Ms.erase(std::remove_if(Ms.begin(), Ms.end(), FilterWrapper(F)), Ms.end()); } raw_ostream &clang::driver::operator<<(raw_ostream &OS, const MultilibSet &MS) { MS.print(OS); return OS; } @ 1.1.1.1 log @Import Clang 3.5svn r202566. @ text @@ 1.1.1.1.2.1 log @Rebase. @ text @d23 1 a26 1 #include "llvm/Support/raw_ostream.h" d93 4 a96 3 for (StringRef Flag : Flags) { if (Flag.front() == '+') OS << "@@" << Flag.substr(1); d120 8 a127 5 for (const auto &Flag : Flags) MyFlags.insert(Flag); for (const auto &Flag : Other.Flags) if (MyFlags.find(Flag) == MyFlags.end()) d129 1 d151 4 a154 1 for (StringRef Flag : M.flags()) { d226 6 a231 3 for (const Multilib &New : MultilibSegments) { for (const Multilib &Base : *this) { Multilib MO = compose(Base, New); d254 1 a254 1 bool operator()(const Multilib &M) const override { d285 5 a289 2 for (StringRef Flag : Flags) FlagSet[Flag.substr(1)] = isFlagEnabled(Flag); d291 5 a295 2 bool operator()(const Multilib &M) const override { for (StringRef Flag : M.flags()) { d298 1 a298 1 if (SI->getValue() != isFlagEnabled(Flag)) d329 2 a330 2 for (const Multilib &M : *this) OS << M << "\n"; d341 11 d354 1 a354 3 Ms.erase(std::remove_if(Ms.begin(), Ms.end(), [&F](const Multilib &M) { return F(M); }), Ms.end()); @ 1.1.1.2 log @Import Clang 3.5svn r209886. @ text @d23 1 a26 1 #include "llvm/Support/raw_ostream.h" d93 4 a96 3 for (StringRef Flag : Flags) { if (Flag.front() == '+') OS << "@@" << Flag.substr(1); d120 8 a127 5 for (const auto &Flag : Flags) MyFlags.insert(Flag); for (const auto &Flag : Other.Flags) if (MyFlags.find(Flag) == MyFlags.end()) d129 1 d151 4 a154 1 for (StringRef Flag : M.flags()) { d226 6 a231 3 for (const Multilib &New : MultilibSegments) { for (const Multilib &Base : *this) { Multilib MO = compose(Base, New); d254 1 a254 1 bool operator()(const Multilib &M) const override { d285 5 a289 2 for (StringRef Flag : Flags) FlagSet[Flag.substr(1)] = isFlagEnabled(Flag); d291 5 a295 2 bool operator()(const Multilib &M) const override { for (StringRef Flag : M.flags()) { d298 1 a298 1 if (SI->getValue() != isFlagEnabled(Flag)) d329 2 a330 2 for (const Multilib &M : *this) OS << M << "\n"; d341 11 d354 1 a354 3 Ms.erase(std::remove_if(Ms.begin(), Ms.end(), [&F](const Multilib &M) { return F(M); }), Ms.end()); @ 1.1.1.3 log @Import clang 3.6svn r215315. @ text @d40 1 a40 1 StringRef last = path::filename(seg); @ 1.1.1.4 log @Import Clang 3.8.0rc3 r261930. @ text @d154 4 a157 1 return Either({M1, M2}); d162 5 a166 1 return Either({M1, M2, M3}); d171 6 a176 1 return Either({M1, M2, M3, M4}); d182 7 a188 1 return Either({M1, M2, M3, M4, M5}); d200 1 a200 1 Multilib Composed(GCCSuffix, OSSuffix, IncludeSuffix); d210 2 a211 1 MultilibSet &MultilibSet::Either(ArrayRef MultilibSegments) { d232 1 a232 1 MultilibSet &MultilibSet::FilterOut(FilterCallback F) { d237 16 a252 9 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 d254 2 a255 2 filterInPlace([&R](const Multilib &M) { return R.match(M.gccSuffix()); }, Multilibs); a264 6 static bool isFlagEnabled(StringRef Flag) { char Indicator = Flag.front(); assert(Indicator == '+' || Indicator == '-'); return Indicator == '+'; } d266 2 a267 1 llvm::StringMap FlagSet; d269 22 a290 11 // 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::const_iterator SI = FlagSet.find(Flag.substr(1)); if (SI != FlagSet.end()) if (SI->getValue() != isFlagEnabled(Flag)) return true; d292 5 a296 2 return false; }, Multilibs); d298 1 a298 1 if (Filtered.size() == 0) d300 1 a300 1 if (Filtered.size() == 1) { d307 1 d316 3 a318 2 MultilibSet::multilib_list MultilibSet::filterCopy(FilterCallback F, const multilib_list &Ms) { d324 5 a328 2 void MultilibSet::filterInPlace(FilterCallback F, multilib_list &Ms) { Ms.erase(std::remove_if(Ms.begin(), Ms.end(), F), Ms.end()); @ 1.1.1.4.2.1 log @Sync with HEAD @ text @d16 1 d21 1 @ 1.1.1.5 log @Import Clang pre-4.0.0 r291444. @ text @d16 1 d21 1 @ 1.1.1.6 log @Import clang r309604 from branches/release_50 @ text @d11 1 a11 1 #include "ToolChains/CommonArgs.h" a82 4 LLVM_DUMP_METHOD void Multilib::dump() const { print(llvm::errs()); } a272 4 LLVM_DUMP_METHOD void MultilibSet::dump() const { print(llvm::errs()); } @ 1.1.1.6.4.1 log @Sync with HEAD @ text @d1 1 a1 1 //===- Multilib.cpp - Multilib Implementation -----------------------------===// d11 2 a12 2 #include "clang/Basic/LLVM.h" #include "llvm/ADT/SmallString.h" d16 4 a19 2 #include "llvm/Support/Compiler.h" #include "llvm/Support/ErrorHandling.h" d22 2 a25 2 #include #include d27 1 d29 1 a29 1 using namespace driver; d37 1 a37 1 while (true) { d45 1 a45 1 Segment.clear(); d201 2 a202 2 for (const auto &New : MultilibSegments) { for (const auto &Base : *this) { d265 1 a265 1 if (Filtered.empty()) d282 1 a282 1 for (const auto &M : *this) @ 1.1.1.6.4.2 log @Mostly merge changes from HEAD upto 20200411 @ text @@ 1.1.1.6.2.1 log @Sync with HEAD @ text @d1 1 a1 1 //===- Multilib.cpp - Multilib Implementation -----------------------------===// d11 2 a12 2 #include "clang/Basic/LLVM.h" #include "llvm/ADT/SmallString.h" d16 4 a19 2 #include "llvm/Support/Compiler.h" #include "llvm/Support/ErrorHandling.h" d22 2 a25 2 #include #include d27 1 d29 1 a29 1 using namespace driver; d37 1 a37 1 while (true) { d45 1 a45 1 Segment.clear(); d201 2 a202 2 for (const auto &New : MultilibSegments) { for (const auto &Base : *this) { d265 1 a265 1 if (Filtered.empty()) d282 1 a282 1 for (const auto &M : *this) @ 1.1.1.7 log @Import clang r337282 from trunk @ text @d1 1 a1 1 //===- Multilib.cpp - Multilib Implementation -----------------------------===// d11 2 a12 2 #include "clang/Basic/LLVM.h" #include "llvm/ADT/SmallString.h" d16 4 a19 2 #include "llvm/Support/Compiler.h" #include "llvm/Support/ErrorHandling.h" d22 2 a25 2 #include #include d27 1 d29 1 a29 1 using namespace driver; d37 1 a37 1 while (true) { d45 1 a45 1 Segment.clear(); d201 2 a202 2 for (const auto &New : MultilibSegments) { for (const auto &Base : *this) { d265 1 a265 1 if (Filtered.empty()) d282 1 a282 1 for (const auto &M : *this) @ 1.1.1.8 log @Mark old LLVM instance as dead. @ text @@ 1.1.1.3.4.1 log @file Multilib.cpp was added on branch tls-maxphys on 2014-08-19 23:47:27 +0000 @ text @d1 334 @ 1.1.1.3.4.2 log @Rebase to HEAD as of a few days ago. @ text @a0 334 //===--- 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 "Tools.h" #include "clang/Driver/Options.h" #include "llvm/ADT/StringMap.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringSet.h" #include "llvm/ADT/Triple.h" #include "llvm/Option/Arg.h" #include "llvm/Option/ArgList.h" #include "llvm/Option/OptTable.h" #include "llvm/Option/Option.h" #include "llvm/Support/MemoryBuffer.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 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 FlagSet; for (unsigned I = 0, N = Flags.size(); I != N; ++I) { StringRef Flag(Flags[I]); llvm::StringMap::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) { std::vector Ms; Ms.push_back(M1); Ms.push_back(M2); return Either(Ms); } MultilibSet &MultilibSet::Either(const Multilib &M1, const Multilib &M2, const Multilib &M3) { std::vector Ms; Ms.push_back(M1); Ms.push_back(M2); Ms.push_back(M3); return Either(Ms); } MultilibSet &MultilibSet::Either(const Multilib &M1, const Multilib &M2, const Multilib &M3, const Multilib &M4) { std::vector Ms; Ms.push_back(M1); Ms.push_back(M2); Ms.push_back(M3); Ms.push_back(M4); return Either(Ms); } MultilibSet &MultilibSet::Either(const Multilib &M1, const Multilib &M2, const Multilib &M3, const Multilib &M4, const Multilib &M5) { std::vector Ms; Ms.push_back(M1); Ms.push_back(M2); Ms.push_back(M3); Ms.push_back(M4); Ms.push_back(M5); return Either(Ms); } 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.str(), OSSuffix.str(), IncludeSuffix.str()); 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(const std::vector &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(const MultilibSet::FilterCallback &F) { filterInPlace(F, Multilibs); return *this; } MultilibSet &MultilibSet::FilterOut(std::string Regex) { class REFilter : public MultilibSet::FilterCallback { mutable llvm::Regex R; public: REFilter(std::string Regex) : R(Regex) {} bool operator()(const Multilib &M) const override { std::string Error; if (!R.isValid(Error)) { llvm::errs() << Error; assert(false); return false; } return R.match(M.gccSuffix()); } }; REFilter REF(Regex); filterInPlace(REF, 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()); } bool MultilibSet::select(const Multilib::flags_list &Flags, Multilib &M) const { class FilterFlagsMismatch : public MultilibSet::FilterCallback { llvm::StringMap FlagSet; public: FilterFlagsMismatch(const std::vector &Flags) { // 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); } bool operator()(const Multilib &M) const override { for (StringRef Flag : M.flags()) { llvm::StringMap::const_iterator SI = FlagSet.find(Flag.substr(1)); if (SI != FlagSet.end()) if (SI->getValue() != isFlagEnabled(Flag)) return true; } return false; } private: bool isFlagEnabled(StringRef Flag) const { char Indicator = Flag.front(); assert(Indicator == '+' || Indicator == '-'); return Indicator == '+'; } }; FilterFlagsMismatch FlagsMismatch(Flags); multilib_list Filtered = filterCopy(FlagsMismatch, Multilibs); if (Filtered.size() == 0) { return false; } else 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(const MultilibSet::FilterCallback &F, const multilib_list &Ms) { multilib_list Copy(Ms); filterInPlace(F, Copy); return Copy; } void MultilibSet::filterInPlace(const MultilibSet::FilterCallback &F, multilib_list &Ms) { Ms.erase(std::remove_if(Ms.begin(), Ms.end(), [&F](const Multilib &M) { return F(M); }), Ms.end()); } raw_ostream &clang::driver::operator<<(raw_ostream &OS, const MultilibSet &MS) { MS.print(OS); return OS; } @ 1.1.1.1.4.1 log @file Multilib.cpp was added on branch yamt-pagecache on 2014-05-22 16:18:27 +0000 @ text @d1 360 @ 1.1.1.1.4.2 log @sync with head. for a reference, the tree before this commit was tagged as yamt-pagecache-tag8. this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments") @ text @a0 360 //===--- 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 "Tools.h" #include "clang/Driver/Options.h" #include "llvm/ADT/StringMap.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringSet.h" #include "llvm/ADT/Triple.h" #include "llvm/Option/Arg.h" #include "llvm/Option/ArgList.h" #include "llvm/Option/OptTable.h" #include "llvm/Option/Option.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/Regex.h" #include "llvm/Support/YAMLParser.h" #include "llvm/Support/YAMLTraits.h" #include 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::end(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 (flags_list::const_iterator I = Flags.begin(), E = Flags.end(); I != E; ++I) { if (StringRef(*I).front() == '+') OS << "@@" << I->substr(1); } } bool Multilib::isValid() const { llvm::StringMap FlagSet; for (unsigned I = 0, N = Flags.size(); I != N; ++I) { StringRef Flag(Flags[I]); llvm::StringMap::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 (flags_list::const_iterator I = Flags.begin(), E = Flags.end(); I != E; ++I) { MyFlags.insert(*I); } for (flags_list::const_iterator I = Other.Flags.begin(), E = Other.Flags.end(); I != E; ++I) { if (MyFlags.find(*I) == 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 (Multilib::flags_list::const_iterator I = M.flags().begin(), E = M.flags().end(); I != E; ++I) { StringRef Flag(*I); if (Flag.front() == '+') Opposite.flags().push_back(("-" + Flag.substr(1)).str()); } return Either(M, Opposite); } MultilibSet &MultilibSet::Either(const Multilib &M1, const Multilib &M2) { std::vector Ms; Ms.push_back(M1); Ms.push_back(M2); return Either(Ms); } MultilibSet &MultilibSet::Either(const Multilib &M1, const Multilib &M2, const Multilib &M3) { std::vector Ms; Ms.push_back(M1); Ms.push_back(M2); Ms.push_back(M3); return Either(Ms); } MultilibSet &MultilibSet::Either(const Multilib &M1, const Multilib &M2, const Multilib &M3, const Multilib &M4) { std::vector Ms; Ms.push_back(M1); Ms.push_back(M2); Ms.push_back(M3); Ms.push_back(M4); return Either(Ms); } MultilibSet &MultilibSet::Either(const Multilib &M1, const Multilib &M2, const Multilib &M3, const Multilib &M4, const Multilib &M5) { std::vector Ms; Ms.push_back(M1); Ms.push_back(M2); Ms.push_back(M3); Ms.push_back(M4); Ms.push_back(M5); return Either(Ms); } 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.str(), OSSuffix.str(), IncludeSuffix.str()); 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(const std::vector &MultilibSegments) { multilib_list Composed; if (Multilibs.empty()) Multilibs.insert(Multilibs.end(), MultilibSegments.begin(), MultilibSegments.end()); else { for (std::vector::const_iterator NewI = MultilibSegments.begin(), NewE = MultilibSegments.end(); NewI != NewE; ++NewI) { for (const_iterator BaseI = begin(), BaseE = end(); BaseI != BaseE; ++BaseI) { Multilib MO = compose(*BaseI, *NewI); if (MO.isValid()) Composed.push_back(MO); } } Multilibs = Composed; } return *this; } MultilibSet &MultilibSet::FilterOut(const MultilibSet::FilterCallback &F) { filterInPlace(F, Multilibs); return *this; } MultilibSet &MultilibSet::FilterOut(std::string Regex) { class REFilter : public MultilibSet::FilterCallback { mutable llvm::Regex R; public: REFilter(std::string Regex) : R(Regex) {} bool operator()(const Multilib &M) const LLVM_OVERRIDE { std::string Error; if (!R.isValid(Error)) { llvm::errs() << Error; assert(false); return false; } return R.match(M.gccSuffix()); } }; REFilter REF(Regex); filterInPlace(REF, 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()); } bool MultilibSet::select(const Multilib::flags_list &Flags, Multilib &M) const { class FilterFlagsMismatch : public MultilibSet::FilterCallback { llvm::StringMap FlagSet; public: FilterFlagsMismatch(const std::vector &Flags) { // 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 (Multilib::flags_list::const_iterator I = Flags.begin(), E = Flags.end(); I != E; ++I) { FlagSet[StringRef(*I).substr(1)] = isFlagEnabled(*I); } } bool operator()(const Multilib &M) const LLVM_OVERRIDE { for (Multilib::flags_list::const_iterator I = M.flags().begin(), E = M.flags().end(); I != E; ++I) { StringRef Flag(*I); llvm::StringMap::const_iterator SI = FlagSet.find(Flag.substr(1)); if (SI != FlagSet.end()) if ((*SI).getValue() != isFlagEnabled(Flag)) return true; } return false; } private: bool isFlagEnabled(StringRef Flag) const { char Indicator = Flag.front(); assert(Indicator == '+' || Indicator == '-'); return Indicator == '+'; } }; FilterFlagsMismatch FlagsMismatch(Flags); multilib_list Filtered = filterCopy(FlagsMismatch, Multilibs); if (Filtered.size() == 0) { return false; } else 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_iterator I = begin(), E = end(); I != E; ++I) OS << *I << "\n"; } MultilibSet::multilib_list MultilibSet::filterCopy(const MultilibSet::FilterCallback &F, const multilib_list &Ms) { multilib_list Copy(Ms); filterInPlace(F, Copy); return Copy; } namespace { // Wrapper for FilterCallback to make operator() nonvirtual so it // can be passed by value to std::remove_if class FilterWrapper { const MultilibSet::FilterCallback &F; public: FilterWrapper(const MultilibSet::FilterCallback &F) : F(F) {} bool operator()(const Multilib &M) const { return F(M); } }; } // end anonymous namespace void MultilibSet::filterInPlace(const MultilibSet::FilterCallback &F, multilib_list &Ms) { Ms.erase(std::remove_if(Ms.begin(), Ms.end(), FilterWrapper(F)), Ms.end()); } raw_ostream &clang::driver::operator<<(raw_ostream &OS, const MultilibSet &MS) { MS.print(OS); return OS; } @