diff --git a/debian/changelog b/debian/changelog index 89eb961c..2f64c8f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium * Disable the usage-wrapper/memory tracking by default. * Replace LLDB_DISABLE_ARCHS macro with LLDB_ARCHS macro. * Remove unused kfreebsd patches, and remove references to kfreebsd and s390. + * Remove references to powerpcspe. [ Aurelien Jarno ] * Enable lldb on riscv64. diff --git a/debian/control b/debian/control index fef5454f..ca77195a 100644 --- a/debian/control +++ b/debian/control @@ -525,7 +525,7 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- Package: lld-19 -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -535,7 +535,7 @@ Description: LLVM-based linker Project. Package: liblld-19 -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -549,7 +549,7 @@ Description: LLVM-based linker, library Package: liblld-19-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lld-19 (= ${binary:Version}), liblld-19 (= ${binary:Version}), libzstd-dev, zlib1g-dev @@ -590,7 +590,7 @@ Description: Next generation, high-performance debugger, library Package: python3-lldb-19 Section: python Architecture: amd64 arm64 armel armhf i386 ppc64el s390x sparc hppa m68k sh4 x32 loong64 riscv64 -# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed +# ia64 hurd powerpc ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-19 (= ${binary:Version}) Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y @@ -606,7 +606,7 @@ Description: Next generation, high-performance debugger, python3 lib Package: liblldb-19-dev Section: libdevel Architecture: amd64 arm64 armel armhf i386 ppc64el s390x sparc hppa m68k sh4 x32 loong64 riscv64 -# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed +# ia64 hurd powerpc ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-19 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, header files diff --git a/debian/control.in b/debian/control.in index fc4dfd4b..c025cefe 100644 --- a/debian/control.in +++ b/debian/control.in @@ -525,7 +525,7 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- Package: lld-@LLVM_VERSION@ -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -535,7 +535,7 @@ Description: LLVM-based linker Project. Package: liblld-@LLVM_VERSION@ -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -549,7 +549,7 @@ Description: LLVM-based linker, library Package: liblld-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x sparc alpha hppa m68k ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lld-@LLVM_VERSION@ (= ${binary:Version}), liblld-@LLVM_VERSION@ (= ${binary:Version}), libzstd-dev, zlib1g-dev @@ -590,7 +590,7 @@ Description: Next generation, high-performance debugger, library Package: python3-lldb-@LLVM_VERSION@ Section: python Architecture: amd64 arm64 armel armhf i386 ppc64el s390x sparc hppa m68k sh4 x32 loong64 riscv64 -# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed +# ia64 hurd powerpc ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@ (= ${binary:Version}) Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y @@ -606,7 +606,7 @@ Description: Next generation, high-performance debugger, python3 lib Package: liblldb-@LLVM_VERSION@-dev Section: libdevel Architecture: amd64 arm64 armel armhf i386 ppc64el s390x sparc hppa m68k sh4 x32 loong64 riscv64 -# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed +# ia64 hurd powerpc ppc64 alpha s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, header files diff --git a/debian/libpolly-X.Y-dev.install.in b/debian/libpolly-X.Y-dev.install.in index 12c1309d..422fb4a2 100644 --- a/debian/libpolly-X.Y-dev.install.in +++ b/debian/libpolly-X.Y-dev.install.in @@ -1,3 +1,3 @@ #!/usr/bin/dh-exec -[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/libPolly*.a +[!powerpc] usr/lib/llvm-@LLVM_VERSION@/lib/libPolly*.a diff --git a/debian/llvm-X.Y-linker-tools.install.in b/debian/llvm-X.Y-linker-tools.install.in index b9bb2552..68d96f39 100644 --- a/debian/llvm-X.Y-linker-tools.install.in +++ b/debian/llvm-X.Y-linker-tools.install.in @@ -1,4 +1,4 @@ #!/usr/bin/dh-exec usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@ -[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so +[!powerpc] usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so diff --git a/debian/llvm-X.Y-linker-tools.links.in b/debian/llvm-X.Y-linker-tools.links.in index cbafb159..4be12107 100644 --- a/debian/llvm-X.Y-linker-tools.links.in +++ b/debian/llvm-X.Y-linker-tools.links.in @@ -1,3 +1,3 @@ #!/usr/bin/dh-exec -[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so usr/lib/bfd-plugins/LLVMgold-@LLVM_VERSION@.so +[!powerpc] usr/lib/llvm-@LLVM_VERSION@/lib/LLVMgold.so usr/lib/bfd-plugins/LLVMgold-@LLVM_VERSION@.so diff --git a/debian/rules b/debian/rules index 79f9d81b..2544c4b5 100755 --- a/debian/rules +++ b/debian/rules @@ -182,7 +182,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),sparc sparc64)) STAGE_1_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4 endif -ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 armel mipsel mips64el powerpc powerpcspe riscv64)) +ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 armel mipsel mips64el powerpc riscv64)) # For some reason, in the stage2 build, when clang is used to compile # itself. The atomic detection is failing on armel and riscv64. Forcing the inclusion # everywhere and in all stages @@ -396,7 +396,7 @@ endif # Enable polly (or not) POLLY_ENABLE=yes -ifneq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe)) +ifneq (,$(filter $(DEB_HOST_ARCH), powerpc)) POLLY_ENABLE=no else PROJECTS+=;polly @@ -517,7 +517,7 @@ ifeq (,$(filter-out $(DOC_GENERATION_DISTRO), $(DISTRO))) DOC_GENERATION=no endif -ifneq (,$(filter $(DEB_HOST_ARCH),powerpc powerpcspe)) +ifneq (,$(filter $(DEB_HOST_ARCH),powerpc)) LIBCXX_WASM_ENABLE=no endif @@ -1215,7 +1215,7 @@ override_dh_auto_install: # Only run on executable, not script chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary'|cut -d: -f1` -ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe)) +ifeq (,$(filter $(DEB_HOST_ARCH), powerpc)) ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux)) # To fix custom-library-search-path chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so || true