proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-30 21:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '10' into '10'

Browse Source 
debian/patches/hurd/hurd-cxx-paths.diff: Add missing GCC installation initialization.

See merge request pkg-llvm-team/llvm-toolchain!60
This commit is contained in:
Sylvestre Ledru 2020-09-25 06:50:32 +00:00
commit 061c89e00f
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
llvm-toolchain-10 (1:10.0.1-7) UNRELEASED; urgency=medium
* debian/patches/hurd/hurd-cxx-paths.diff: Add missing GCC installation
initialization.
-- Samuel Thibault <sthibault@debian.org> Thu, 27 Aug 2020 17:06:44 +0200
llvm-toolchain-10 (1:10.0.1-6) unstable; urgency=medium llvm-toolchain-10 (1:10.0.1-6) unstable; urgency=medium
[ Sylvestre Ledru ] [ Sylvestre Ledru ]

19
debian/patches/hurd/hurd-cxx-paths.diff vendored
View File

@ -3,13 +3,13 @@ hurd: find c++ headers
This should be factorized with Linux.cpp and the GNU/kFreeBSD case. This should be factorized with Linux.cpp and the GNU/kFreeBSD case.
--- ---
clang/lib/Driver/ToolChains/Hurd.cpp | 146 ++++++++++++++++++++++++++++++++++- clang/lib/Driver/ToolChains/Hurd.cpp | 149 ++++++++++++++++++++++++++++++++++-
clang/lib/Driver/ToolChains/Hurd.h | 3 clang/lib/Driver/ToolChains/Hurd.h | 3
2 files changed, 145 insertions(+), 4 deletions(-) 2 files changed, 148 insertions(+), 4 deletions(-)
--- a/clang/lib/Driver/ToolChains/Hurd.cpp --- a/clang/lib/Driver/ToolChains/Hurd.cpp
+++ b/clang/lib/Driver/ToolChains/Hurd.cpp +++ b/clang/lib/Driver/ToolChains/Hurd.cpp
@@ -61,6 +61,15 @@ static StringRef getOSLibDir(const llvm: @@ -61,8 +61,20 @@ static StringRef getOSLibDir(const llvm:
return Triple.isArch32Bit() ? "lib" : "lib64"; return Triple.isArch32Bit() ? "lib" : "lib64";
} }
@ -24,8 +24,13 @@ This should be factorized with Linux.cpp and the GNU/kFreeBSD case.
+ +
Hurd::Hurd(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) Hurd::Hurd(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
: Generic_ELF(D, Triple, Args) { : Generic_ELF(D, Triple, Args) {
+ GCCInstallation.init(Triple, Args);
+ Multilibs = GCCInstallation.getMultilibs();
+ SelectedMultilib = GCCInstallation.getMultilib();
std::string SysRoot = computeSysRoot(); std::string SysRoot = computeSysRoot();
@@ -73,8 +82,61 @@ Hurd::Hurd(const Driver &D, const llvm:: path_list &Paths = getFilePaths();
@@ -73,8 +85,61 @@ Hurd::Hurd(const Driver &D, const llvm::
ExtraOpts.push_back("--build-id"); ExtraOpts.push_back("--build-id");
#endif #endif
@ -89,7 +94,7 @@ This should be factorized with Linux.cpp and the GNU/kFreeBSD case.
// FIXME: It's not clear whether we should use the driver's installed // FIXME: It's not clear whether we should use the driver's installed
// directory ('Dir' below) or the ResourceDir. // directory ('Dir' below) or the ResourceDir.
if (StringRef(D.Dir).startswith(SysRoot)) { if (StringRef(D.Dir).startswith(SysRoot)) {
@@ -88,8 +150,40 @@ Hurd::Hurd(const Driver &D, const llvm:: @@ -88,8 +153,40 @@ Hurd::Hurd(const Driver &D, const llvm::
addPathIfExists(D, SysRoot + "/usr/lib/" + MultiarchTriple, Paths); addPathIfExists(D, SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
addPathIfExists(D, SysRoot + "/usr/lib/../" + OSLibDir, Paths); addPathIfExists(D, SysRoot + "/usr/lib/../" + OSLibDir, Paths);
@ -132,7 +137,7 @@ This should be factorized with Linux.cpp and the GNU/kFreeBSD case.
// FIXME: It's not clear whether we should use the driver's installed // FIXME: It's not clear whether we should use the driver's installed
// directory ('Dir' below) or the ResourceDir. // directory ('Dir' below) or the ResourceDir.
if (StringRef(D.Dir).startswith(SysRoot)) if (StringRef(D.Dir).startswith(SysRoot))
@@ -156,6 +250,17 @@ void Hurd::AddClangSystemIncludeArgs(con @@ -156,6 +253,17 @@ void Hurd::AddClangSystemIncludeArgs(con
// Lacking those, try to detect the correct set of system includes for the // Lacking those, try to detect the correct set of system includes for the
// target triple. // target triple.
@ -150,7 +155,7 @@ This should be factorized with Linux.cpp and the GNU/kFreeBSD case.
if (getTriple().getArch() == llvm::Triple::x86) { if (getTriple().getArch() == llvm::Triple::x86) {
std::string Path = SysRoot + "/usr/include/i386-gnu"; std::string Path = SysRoot + "/usr/include/i386-gnu";
if (D.getVFS().exists(Path)) if (D.getVFS().exists(Path))
@@ -174,3 +279,36 @@ void Hurd::addExtraOpts(llvm::opt::ArgSt @@ -174,3 +282,36 @@ void Hurd::addExtraOpts(llvm::opt::ArgSt
for (const auto &Opt : ExtraOpts) for (const auto &Opt : ExtraOpts)
CmdArgs.push_back(Opt.c_str()); CmdArgs.push_back(Opt.c_str());
} }