Merge branch '16' into snapshot

This commit is contained in:
Gianfranco Costamagna 2023-03-21 23:55:18 +01:00
commit 76a748b0a0
2 changed files with 7 additions and 1 deletions

6
debian/changelog vendored
View File

@ -21,6 +21,12 @@ 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.0-1~exp3) experimental; urgency=medium
* Revert gold linker on riscv64, FTBFS
-- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 21 Mar 2023 11:27:33 +0100
llvm-toolchain-16 (1:16.0.0-1~exp2) experimental; urgency=medium
[ Matthias Klose <doko@ubuntu.com> ]

2
debian/rules vendored
View File

@ -278,7 +278,7 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes)
LIBCLC_LLVM_SPIRV = "-DLLVM_SPIRV=$(LLVM_SPIRV)"
endif
BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el riscv64 x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386
BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386
ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.23.1-1~exp3 ; echo $$?),0)
ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS)))
STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=gold