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

Merge remote-tracking branch 'origin/14' into 15

Browse Source
This commit is contained in:
Sylvestre Ledru 2022-10-10 14:58:08 +02:00
commit b241afb285
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -177,6 +177,14 @@ llvm-toolchain-snapshot (1:15~++20220202093833+1a3137dc8451-1~exp1) experimental
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 13 Feb 2022 23:25:57 +0100 -- Sylvestre Ledru <sylvestre@debian.org> Sun, 13 Feb 2022 23:25:57 +0100
llvm-toolchain-14 (1:14.0.6-4) unstable; urgency=medium
* fix the cmake detection with libmlir
* Don't build wasm target on arm64 armel mips64el mipsel ppc64el armhf
for now
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 10 Oct 2022 13:47:25 +0200
llvm-toolchain-14 (1:14.0.6-3) unstable; urgency=medium llvm-toolchain-14 (1:14.0.6-3) unstable; urgency=medium
* Fix a typo to silent lintian (Closes: #1018770) * Fix a typo to silent lintian (Closes: #1018770)

1
debian/qualify-clang.sh vendored
View File

@ -993,6 +993,7 @@ extern "C" void plugin() {
EOF EOF
clang++-$VERSION -shared -o plugin.so -fvisibility=hidden foo.cpp -static-libstdc++ || true clang++-$VERSION -shared -o plugin.so -fvisibility=hidden foo.cpp -static-libstdc++ || true
clang++-$VERSION -shared -o plugin.so -fvisibility=hidden foo.cpp -stdlib=libc++ -static-libstdc++ ||true clang++-$VERSION -shared -o plugin.so -fvisibility=hidden foo.cpp -stdlib=libc++ -static-libstdc++ ||true
rm -f plugin.so
# Bug 889832 # Bug 889832
echo '#include <iostream> echo '#include <iostream>

15
debian/rules vendored
View File

@ -318,6 +318,12 @@ ifeq ($(LIBUNWIND_ENABLE),yes)
endif endif
endif endif
COMPILER_RT_WASM_ENABLE=yes
ifneq (,$(filter $(DEB_HOST_ARCH), arm64 armel mips64el mipsel ppc64el armhf))
COMPILER_RT_WASM_ENABLE=no
endif
# Do not install objects # Do not install objects
STAGE_ALL_CMAKE_EXTRA += -DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF STAGE_ALL_CMAKE_EXTRA += -DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF
@ -713,6 +719,7 @@ endif
touch $@ touch $@
debian-rtlib-wasm-build: debian-rtlib-wasm-build:
ifeq (${COMPILER_RT_WASM_ENABLE},yes)
echo "Using cmake: $(CMAKE_BIN)" echo "Using cmake: $(CMAKE_BIN)"
for build in wasm32 wasm64; do \ for build in wasm32 wasm64; do \
mkdir -p build-compiler-rt-$$build; \ mkdir -p build-compiler-rt-$$build; \
@ -741,6 +748,9 @@ debian-rtlib-wasm-build:
-DCOMPILER_RT_OS_DIR=wasi; \ -DCOMPILER_RT_OS_DIR=wasi; \
ninja -C build-compiler-rt-$$build -j $(NJOBS) $(VERBOSE); \ ninja -C build-compiler-rt-$$build -j $(NJOBS) $(VERBOSE); \
done done
else
echo "Skip on this arch"
endif
touch $@ touch $@
override_dh_auto_build: debian-full-build debian-libfuzzer-build debian-libclc-build debian-rtlib-wasm-build override_dh_auto_build: debian-full-build debian-libfuzzer-build debian-libclc-build debian-rtlib-wasm-build
@ -894,11 +904,10 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes)
DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C libclc/build install DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C libclc/build install
endif endif
ifeq (${COMPILER_RT_WASM_ENABLE},yes)
DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-compiler-rt-wasm32 install DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-compiler-rt-wasm32 install
DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-compiler-rt-wasm64 install DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-compiler-rt-wasm64 install
endif
DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-compiler-rt-wasm32 install
DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-compiler-rt-wasm64 install
# Rename binaries # Rename binaries
mkdir -p $(DEB_INST)/usr/bin/ mkdir -p $(DEB_INST)/usr/bin/