proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-27 11:41:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '19' into '19'

Browse Source 
patches/hurd/hurd-f_type.diff: Fix hurd build against glibc ≥ 2.39, and fix hurd-amd64

See merge request pkg-llvm-team/llvm-toolchain!150
This commit is contained in:
Sylvestre Ledru 2024-10-02 08:28:55 +00:00
commit 1b95e33f1d
6 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,4 +1,4 @@
llvm-toolchain-19 (1:19.1.0-5) UNRELEASED; urgency=medium
llvm-toolchain-19 (1:19.1.0-5) unstable; urgency=medium
[ Sylvestre Ledru ]
* Don't enable intel-pt on Ubuntu Bionic
@ -11,6 +11,13 @@ llvm-toolchain-19 (1:19.1.0-5) UNRELEASED; urgency=medium
[ Matthias Klose ]
* Update watch file and add .git* files to exclude in the tarball.
[ Samuel Thibault ]
* patches/hurd/hurd-f_type.diff: Fix hurd build against glibc ≥ 2.39.
* libomp-X.Y-dev.install.in: Don't try to ship ompd gdb plugin on
hurd-amd64 ; ship libomptarget.
* libomp5-X.Y.install.in: Ship libomptarget.
* libomp5-X.Y.symbols.in: Fix symbols on hurd-any.
-- Matthias Klose <doko@debian.org> Wed, 02 Oct 2024 06:08:02 +0200
llvm-toolchain-19 (1:19.1.0-4) unstable; urgency=medium

14
debian/libomp-X.Y-dev.install.in vendored
View File

@ -7,16 +7,16 @@
[!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher_static.a
[!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher.so
[amd64 ppc64el arm64 loong64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget.devicertl.a
[amd64 hurd-amd64 ppc64el arm64 loong64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget.devicertl.a
[amd64 ppc64el arm64 loong64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget-*.bc
[amd64 hurd-amd64 ppc64el arm64 loong64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget-*.bc
usr/lib/llvm-@LLVM_VERSION@/lib/cmake/openmp/*.cmake
[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-device-info
[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-kernel-replay
[amd64 hurd-amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-device-info
[amd64 hurd-amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-kernel-replay
[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-device-info-@LLVM_VERSION@
[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-kernel-replay-@LLVM_VERSION@
[amd64 hurd-amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-device-info-@LLVM_VERSION@
[amd64 hurd-amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-kernel-replay-@LLVM_VERSION@
[!armhf] usr/lib/llvm-@LLVM_VERSION@/share/gdb/python/ompd/
[!armhf !hurd-amd64] usr/lib/llvm-@LLVM_VERSION@/share/gdb/python/ompd/

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

@ -1,5 +1,5 @@
#!/usr/bin/dh-exec
usr/lib/llvm-@LLVM_VERSION@/lib/libomp*.so.5
[amd64 arm64 mips64el ppc64el ppc64 riscv64 loong64] usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@
[amd64 hurd-amd64 arm64 mips64el ppc64el ppc64 riscv64 loong64] usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@

2
debian/libomp5-X.Y.symbols.in vendored
View File

@ -1008,7 +1008,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER#
kmp_set_stacksize_@VERSION 0.20130412
kmp_set_stacksize_s@VERSION 0.20130412
kmp_set_stacksize_s_@VERSION 0.20130412
(arch=!ppc64 !ppc64el)kmp_set_thread_affinity_mask_initial@VERSION 3.8.0
(arch=!ppc64 !ppc64el !hurd-any)kmp_set_thread_affinity_mask_initial@VERSION 3.8.0
kmp_set_warnings_off@VERSION 0.20130412
kmp_set_warnings_off_@VERSION 0.20130412
kmp_set_warnings_on@VERSION 0.20130412

27
debian/patches/hurd/hurd-f_type.diff vendored Normal file
View File

@ -0,0 +1,27 @@
https://github.com/llvm/llvm-project/pull/71851
commit 620b8d994b8abdcf31271d9f4db7e7422fc9bd65
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Sep 9 15:53:33 2024 +0200
[hurd] Fix accessing f_type field of statvfs (#71851)
f4719c4d2cda ("Add support for GNU Hurd in Path.inc and other places")
made llvm use an internal __f_type name for the f_type field (which it
is not supposed to since accessing double-underscore names is explicitly
not supported by standards). In glibc 2.39 this field was renamed to
f_type so application can now access the field as the standard says.
diff --git a/llvm/lib/Support/Unix/Path.inc b/llvm/lib/Support/Unix/Path.inc
index 8098392a7fd9..44097bad7b46 100644
--- a/llvm/lib/Support/Unix/Path.inc
+++ b/llvm/lib/Support/Unix/Path.inc
@@ -487,7 +487,7 @@ static bool is_local_impl(struct STATVFS &Vfs) {
#ifndef CIFS_MAGIC_NUMBER
#define CIFS_MAGIC_NUMBER 0xFF534D42
#endif
-#ifdef __GNU__
+#if defined(__GNU__) && ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 39)))
switch ((uint32_t)Vfs.__f_type) {
#else
switch ((uint32_t)Vfs.f_type) {

1
debian/patches/series vendored
View File

@ -90,6 +90,7 @@ remove-apple-clang-manpage.diff
# Hurd port
hurd/hurd-pathmax.diff
hurd/hurd-f_type.diff
930008-arm.diff
bootstrap-fix-include-next.diff