proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-12-08 05:49:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '10-hurd' into '10'

Browse Source 
hurd/hurd-cxx-paths.diff: Fix patch so it can be applied

See merge request pkg-llvm-team/llvm-toolchain!50
This commit is contained in:
Sylvestre Ledru 2020-02-07 10:03:58 +00:00
commit e92cfc0184
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,8 +1,14 @@
llvm-toolchain-10 (1:10.0.0~+rc1-1~exp2) experimental; urgency=medium llvm-toolchain-10 (1:10.0.0~+rc1-1~exp2) experimental; urgency=medium
[ Sylvestre Ledru ]
* Do not try to install hwasan_symbolize on armhf ppc64el * Do not try to install hwasan_symbolize on armhf ppc64el
as it isn't built as it isn't built
[ Samuel Thibault ]
* hurd/hurd-cxx-paths.diff: Fix patch so it can be applied.
* clang-tools-X.Y.install.in: Do not try to install hwasan_symbolize on
hurd-any.
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 06 Feb 2020 10:37:39 +0100 -- Sylvestre Ledru <sylvestre@debian.org> Thu, 06 Feb 2020 10:37:39 +0100
llvm-toolchain-10 (1:10.0.0~+rc1-1~exp1) experimental; urgency=medium llvm-toolchain-10 (1:10.0.0~+rc1-1~exp1) experimental; urgency=medium

2
debian/clang-tools-X.Y.install.in vendored
View File

@ -31,7 +31,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace
usr/lib/llvm-@LLVM_VERSION@/bin/clang-move usr/lib/llvm-@LLVM_VERSION@/bin/clang-move
usr/lib/llvm-@LLVM_VERSION@/bin/clang-offload-wrapper usr/lib/llvm-@LLVM_VERSION@/bin/clang-offload-wrapper
[!armhf !ppc64el] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize [!armhf !ppc64el !hurd-any] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize
clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/
clang/tools/scan-build-py-@LLVM_VERSION@ usr/share/clang/ clang/tools/scan-build-py-@LLVM_VERSION@ usr/share/clang/

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

@ -6,7 +6,7 @@ Index: llvm-toolchain-9-9.0.0/clang/lib/Driver/ToolChains/Hurd.cpp
=================================================================== ===================================================================
--- llvm-toolchain-9-9.0.0.orig/clang/lib/Driver/ToolChains/Hurd.cpp --- llvm-toolchain-9-9.0.0.orig/clang/lib/Driver/ToolChains/Hurd.cpp
+++ llvm-toolchain-9-9.0.0/clang/lib/Driver/ToolChains/Hurd.cpp +++ llvm-toolchain-9-9.0.0/clang/lib/Driver/ToolChains/Hurd.cpp
@@ -61,17 +61,107 @@ static StringRef getOSLibDir(const llvm: @@ -61,21 +61,107 @@ static StringRef getOSLibDir(const llvm:
return Triple.isArch32Bit() ? "lib" : "lib64"; return Triple.isArch32Bit() ? "lib" : "lib64";
} }
@ -42,10 +42,6 @@ Index: llvm-toolchain-9-9.0.0/clang/lib/Driver/ToolChains/Hurd.cpp
+ .str()); + .str());
+ } + }
+ +
+#ifdef ENABLE_LINKER_BUILD_ID
+ ExtraOpts.push_back("--build-id");
+#endif
+
+ // The selection of paths to try here is designed to match the patterns which + // The selection of paths to try here is designed to match the patterns which
+ // the GCC driver itself uses, as this is part of the GCC-compatible driver. + // the GCC driver itself uses, as this is part of the GCC-compatible driver.
+ // This was determined by running GCC in a fake filesystem, creating all + // This was determined by running GCC in a fake filesystem, creating all
@ -56,6 +52,10 @@ Index: llvm-toolchain-9-9.0.0/clang/lib/Driver/ToolChains/Hurd.cpp
const std::string OSLibDir = getOSLibDir(Triple, Args); const std::string OSLibDir = getOSLibDir(Triple, Args);
const std::string MultiarchTriple = getMultiarchTriple(D, Triple, SysRoot); const std::string MultiarchTriple = getMultiarchTriple(D, Triple, SysRoot);
#ifdef ENABLE_LINKER_BUILD_ID
ExtraOpts.push_back("--build-id");
#endif
- // If we are currently running Clang inside of the requested system root, add - // If we are currently running Clang inside of the requested system root, add
- // its parent library paths to those searched. - // its parent library paths to those searched.
+ // Add the multilib suffixed paths where they are available. + // Add the multilib suffixed paths where they are available.

1
debian/patches/series vendored
View File

@ -97,6 +97,7 @@ remove-apple-clang-manpage.diff
0049-Use-Debian-provided-MathJax-everywhere.patch 0049-Use-Debian-provided-MathJax-everywhere.patch
# Hurd port # Hurd port
hurd/hurd-cxx-paths.diff
hurd/hurd-pathmax.diff hurd/hurd-pathmax.diff
# powerpcspe # powerpcspe