Merge remote-tracking branch 'origin/13' into snapshot

This commit is contained in:
Sylvestre Ledru 2021-08-01 11:44:42 +02:00
commit c8a5111815
3 changed files with 23 additions and 5 deletions

8
debian/changelog vendored
View File

@ -85,6 +85,14 @@ llvm-toolchain-snapshot (1:13~++20210129063721+010b176cdefb-1~exp1) experimental
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 30 Jan 2021 17:31:15 +0100 -- Sylvestre Ledru <sylvestre@debian.org> Sat, 30 Jan 2021 17:31:15 +0100
llvm-toolchain-12 (1:12.0.1-3) unstable; urgency=medium
* Build libunwind only on amd64 arm64 armhf i386
mips64el ppc64el ppc64 riscv64 sparc sparc64
Not supported on s390x for example
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 01 Aug 2021 11:42:20 +0200
llvm-toolchain-12 (1:12.0.1-2) unstable; urgency=medium llvm-toolchain-12 (1:12.0.1-2) unstable; urgency=medium
* Generate libunwind-12 & libunwind-12-dev packages * Generate libunwind-12 & libunwind-12-dev packages

4
debian/control vendored
View File

@ -713,7 +713,7 @@ Description: OpenCL C language implementation - development files
Package: libunwind-14 Package: libunwind-14
Section: libs Section: libs
Architecture: any Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 sparc sparc64
Multi-Arch: same Multi-Arch: same
Depends: ${shlibs:Depends}, Depends: ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
@ -730,7 +730,7 @@ Description: production-quality unwinder
Package: libunwind-14-dev Package: libunwind-14-dev
Section: libdevel Section: libdevel
Architecture: any Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 sparc sparc64
Multi-Arch: same Multi-Arch: same
Depends: Depends:
${misc:Depends}, ${misc:Depends},

16
debian/rules vendored
View File

@ -1,7 +1,7 @@
#!/usr/bin/make -f #!/usr/bin/make -f
# polly, openmp & lldb aren't enabled for every platform # polly, openmp & lldb aren't enabled for every platform
PROJECTS = clang;clang-tools-extra;libcxx;libcxxabi;compiler-rt;lld;debuginfo-tests;libunwind PROJECTS = clang;clang-tools-extra;libcxx;libcxxabi;compiler-rt;lld;debuginfo-tests
TARGET_BUILD := build-llvm TARGET_BUILD := build-llvm
TARGET_BUILD_STAGE2 := $(TARGET_BUILD)/tools/clang/stage2-bins TARGET_BUILD_STAGE2 := $(TARGET_BUILD)/tools/clang/stage2-bins
@ -191,6 +191,14 @@ else
# CMAKE_EXTRA += -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=ON -DLLVM_ENABLE_RUNTIMES=openmp # CMAKE_EXTRA += -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=ON -DLLVM_ENABLE_RUNTIMES=openmp
endif endif
# Enable libunwind (or not)
LIBUNWIND_ENABLE=yes
ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 sparc sparc64))
LIBUNWIND_ENABLE=no
else
PROJECTS+=;libunwind
endif
RUN_TEST=yes RUN_TEST=yes
ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
RUN_TEST=no RUN_TEST=no
@ -618,8 +626,10 @@ override_dh_auto_install:
cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && rm -f libomp.so; \ cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && rm -f libomp.so; \
ln -s libomp.so.$(SONAME_OPENMP) libomp.so ln -s libomp.so.$(SONAME_OPENMP) libomp.so
mkdir -p debian/tmp/usr/include/libunwind if test "$(LIBUNWIND_ENABLE)" = yes; then \
cp -R libunwind/include/* debian/tmp/usr/include/libunwind/ mkdir -p debian/tmp/usr/include/libunwind; \
cp -R libunwind/include/* debian/tmp/usr/include/libunwind/; \
fi
if test "$(OPENMP_ENABLE)" = yes; then \ if test "$(OPENMP_ENABLE)" = yes; then \
mkdir -p debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp; \ mkdir -p debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp; \