Merge branch '16' into 17

This commit is contained in:
Gianfranco Costamagna 2023-09-12 09:08:35 +02:00
commit a1337d7ebb
4 changed files with 19 additions and 1 deletions

7
debian/changelog vendored
View File

@ -121,6 +121,13 @@ llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 28 Jan 2023 18:07:40 +0100
llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium
* Second attempt to refresh D158066.patch (Closes: #1049362)
* Second attempt to fix mips64el without loosing ompd
-- Gianfranco Costamagna <locutusofborg@debian.org> Mon, 11 Sep 2023 15:40:42 +0200
llvm-toolchain-16 (1:16.0.6-14) unstable; urgency=medium
[ Sylvestre Ledru ]

10
debian/patches/mips64el-ompt.patch vendored Normal file
View File

@ -0,0 +1,10 @@
--- llvm-toolchain-16-16.0.6.orig/openmp/runtime/cmake/config-ix.cmake
+++ llvm-toolchain-16-16.0.6/openmp/runtime/cmake/config-ix.cmake
@@ -328,6 +329,7 @@ else()
(LIBOMP_ARCH STREQUAL aarch64) OR
(LIBOMP_ARCH STREQUAL aarch64_a64fx) OR
(LIBOMP_ARCH STREQUAL ppc64le) OR
+ (LIBOMP_ARCH STREQUAL mips64) OR
(LIBOMP_ARCH STREQUAL ppc64) OR
(LIBOMP_ARCH STREQUAL riscv64) OR
(LIBOMP_ARCH STREQUAL loongarch64))

View File

@ -148,3 +148,4 @@ force-sse2-compiler-rt.diff
bolt-disable-emit-relocs.patch
link-grpc.diff
D158066.patch
mips64el-ompt.patch

2
debian/rules vendored
View File

@ -1217,7 +1217,7 @@ endif
# Disable the python binding for buster. not sure why it regressed
# regressed de4364f1ecaa..0745b0c0354a
if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic" -o "$(DEB_HOST_ARCH)" = "mips64el"; then \
if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic"; then \
mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/; \
touch $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/empty; \
echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \