proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-19 22:38:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sylvestre Ledru 2021-08-18 13:23:10 +02:00
commit a5c59c995f
6 changed files with 2 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -105,7 +105,6 @@ llvm-toolchain-12 (1:12.0.1-5) unstable; urgency=medium
llvm-toolchain-12 (1:12.0.1-4) unstable; urgency=medium
[ Sylvestre Ledru ]
* Make libunwind-dev depends on libunwind
* Don't build libunwind on hurd, armel, powerpc & mipsel
* Remove old svn reference in the usage dh_strip & dh_makeshlibs

3
debian/control vendored
View File

@ -19,8 +19,7 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils,
ocaml-findlib [amd64 arm64 armhf ppc64el s390x],
libctypes-ocaml-dev [amd64 arm64 armhf ppc64el s390x],
dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el s390x],
libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
llvm-spirv, spirv-tools
libpfm4-dev [linux-any], python3-setuptools, libz3-dev
Build-Conflicts: oprofile, ocaml
Standards-Version: 4.2.1
Homepage: https://www.llvm.org/

1
debian/libclc-X.Y.install.in vendored
View File

@ -1,2 +1 @@
usr/lib/clc/*.bc
usr/lib/clc/*.spv

13
debian/patches/libclc-llvm-spirv.diff vendored
View File

@ -1,13 +0,0 @@
diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt
index b8b5ceff086c..5964468358f2 100644
--- a/libclc/CMakeLists.txt
+++ b/libclc/CMakeLists.txt
@@ -95,7 +95,7 @@ find_program( LLVM_CLANG clang PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH )
find_program( LLVM_AS llvm-as PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH )
find_program( LLVM_LINK llvm-link PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH )
find_program( LLVM_OPT opt PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH )
-find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH )
+find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_BINDIR})
# Print toolchain
message( "clang: ${LLVM_CLANG}" )

2
debian/patches/series vendored
View File

@ -142,5 +142,3 @@ lld-use-link-atomic-i386.diff
lower-python-dep.diff
scan-build-py-fix-analyze-path.diff
scan-build-py-fix-default-bin.diff
libclc-llvm-spirv.diff

22
debian/rules vendored
View File

@ -35,7 +35,6 @@ endif
VENDOR=$(shell lsb_release -is)
DISTRO=$(shell lsb_release -sc)
DISTRO_RELEASE=$(shell lsb_release -sr)
DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}')
@ -141,25 +140,6 @@ else
control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev'
endif
ENABLE_SPRIV = yes
# Disable spirv on Debian older than bullseye (11)
ifeq ($(shell dpkg-vendor --is Debian && echo yes),yes)
ifeq ($(shell dpkg --compare-versions $(DISTRO_RELEASE) lt 11 ; echo $$?),0)
ENABLE_SPRIV = no
endif
endif
# Disable spirv on Ubuntu older than focal (20.04)
ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
ifeq ($(shell dpkg --compare-versions $(DISTRO_RELEASE) lt 20 ; echo $$?),0)
ENABLE_SPRIV = no
endif
endif
LIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"
ifeq ($(ENABLE_SPRIV),yes)
LIBCLC_TARGETS_TO_BUILD := $(LIBCLC_TARGETS_TO_BUILD)";spirv-mesa3d-;spirv64-mesa3d-"
endif
# Disabled:
# Host compiler does not support '-fuse-ld=lld'
# USE_LLD_ARCHS := amd64
@ -559,7 +539,7 @@ debian-libclc-build:
-DCMAKE_INSTALL_DATADIR=lib \
-DCMAKE_INSTALL_INCLUDEDIR=include \
-DLLVM_CONFIG=$(CURDIR)/$(TARGET_BUILD_STAGE2)/bin/llvm-config \
-DLIBCLC_TARGETS_TO_BUILD=$(LIBCLC_TARGETS_TO_BUILD); \
-DLIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"; \
make $(NJOBS) $(VERBOSE)
touch $@