Merge remote-tracking branch 'origin/16' into 17

debian/changelog

@@ -96,6 +96,62 @@ 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.6-13) UNRELEASED; urgency=medium
+
+  * Also runtime-depend on {libzstd,zlib1g}-dev, from Paravoid (Closes:
+    #1047718)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 07 Sep 2023 01:43:23 +0200
+
+llvm-toolchain-16 (1:16.0.6-12) unstable; urgency=medium
+
+  [ John Paul Adrian Glaubitz ]
+  * Disable wasm support on powerpc and powerpcspe
+  * Remove powerpc from BINUTILS_GOLD_ARCHS again
+
+  [ Sylvestre Ledru ]
+  * Disable python3-lldb on mips64el to unbreak the build
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 03 Sep 2023 14:06:19 +0200
+
+llvm-toolchain-16 (1:16.0.6-11) unstable; urgency=medium
+
+  * debian/patches/D158066.patch:
+    - upstream fix for Debian bug: #1049362
+  * Also build-depend on libzstd-dev (Closes: #1047718)
+  * Explicitly depend on libcurl4-openssl-dev, since nss is being removed.
+    (Closes: #1043552)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 17 Aug 2023 10:19:13 +0200
+
+llvm-toolchain-16 (1:16.0.6-10) unstable; urgency=medium
+
+  * update test to depend on libstdc++-13-dev
+  * Also ignore mlir test on armel, hang
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 07 Aug 2023 11:01:06 +0200
+
+llvm-toolchain-16 (1:16.0.6-9) unstable; urgency=medium
+
+  * Really enable spirv, and disable spirv on mips* since it's not yet
+    bootstrapped. Thanks <tjaalton> for the patch
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 03 Aug 2023 14:20:06 +0200
+
+llvm-toolchain-16 (1:16.0.6-8) unstable; urgency=medium
+
+  * Make sure flang-16 depends on libflang-16-dev (Closes: #1041202)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 02 Aug 2023 09:30:36 +0200
+
+llvm-toolchain-16 (1:16.0.6-7) unstable; urgency=medium
+
+  * Use spirv-16 to build llvm. This should fix libclc-16 content
+    and fix mesa build
+  * Don't reduce parallel builds anymore on riscv64
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 02 Aug 2023 09:10:31 +0200
+
 llvm-toolchain-16 (1:16.0.6-6) unstable; urgency=medium
 
   * Do the delete of wasi in libclang-rt regardless (Closes: #1041834)

debian/control

@@ -13,7 +13,8 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     binutils-dev,
     libxml2-dev,
     libjsoncpp-dev, pkg-config,
-    lcov, procps, help2man, zlib1g-dev,
+    lcov, procps, help2man,
+    zlib1g-dev, libzstd-dev,
     g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32],
     libjs-mathjax, python3-recommonmark,
     doxygen,
@@ -22,8 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
     dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
-    llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
+    llvm-spirv-16 [ amd64 arm64 armel armhf ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
-    llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
     spirv-tools [ linux-any ] | hello [ !i386],
     wasi-libc | hello [ !any-i386],
     libcurl4-openssl-dev | libcurl-dev,
@@ -547,7 +547,7 @@ Section: libdevel
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lld-17 (= ${binary:Version}),
- liblld-17 (= ${binary:Version})
+ liblld-17 (= ${binary:Version}), libzstd-dev, zlib1g-dev
 Pre-Depends: ${misc:Pre-Depends}
 Description: LLVM-based linker, header files
  LLD is a new, high-performance linker. It is built as a set of reusable
@@ -687,8 +687,13 @@ Package: libc++-17-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
+<<<<<<< HEAD
 Depends: libc++1-17 (= ${binary:Version}), ${misc:Depends},
  libunwind-17-dev [amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64]
+=======
+Depends: libc++1-16 (= ${binary:Version}), ${misc:Depends},
+ libunwind-16-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64]
+>>>>>>> origin/16
 Breaks: libc++-dev (<< 44)
 Provides: libc++-x.y-dev
 Conflicts: libc++-x.y-dev
@@ -828,7 +833,7 @@ Description: OpenCL C language implementation - development files
 
 Package: libunwind-17
 Section: libs
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -845,7 +850,7 @@ Description: production-quality unwinder
 
 Package: libunwind-17-dev
 Section: libdevel
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends:
  ${misc:Depends},
@@ -934,7 +939,7 @@ Package: flang-17
 # no 32bit support
 # https://github.com/llvm/llvm-project/issues/59845
 Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-16-dev (= ${binary:Version}),
 Provides: fortran-compiler, gfortran-mod-15
 Description: Fortran compiler
  Ground-up implementation of a Fortran front end written in

debian/control.in

@@ -13,7 +13,8 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     binutils-dev,
     libxml2-dev,
     libjsoncpp-dev, pkg-config,
-    lcov, procps, help2man, zlib1g-dev,
+    lcov, procps, help2man,
+    zlib1g-dev, libzstd-dev,
     g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32],
     libjs-mathjax, python3-recommonmark,
     doxygen,
@@ -22,8 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
     dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
-    llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
+    llvm-spirv-16 [ amd64 arm64 armel armhf ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
-    llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
     spirv-tools [ linux-any ] | hello [ !i386],
     wasi-libc | hello [ !any-i386],
     libcurl4-openssl-dev | libcurl-dev,
@@ -547,7 +547,7 @@ Section: libdevel
 Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
 # ia64 hurd powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lld-@LLVM_VERSION@ (= ${binary:Version}),
- liblld-@LLVM_VERSION@ (= ${binary:Version})
+ liblld-@LLVM_VERSION@ (= ${binary:Version}), libzstd-dev, zlib1g-dev
 Pre-Depends: ${misc:Pre-Depends}
 Description: LLVM-based linker, header files
  LLD is a new, high-performance linker. It is built as a set of reusable
@@ -688,7 +688,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libc++1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends},
- libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64]
+ libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64]
 Breaks: libc++-dev (<< 44)
 Provides: libc++-x.y-dev
 Conflicts: libc++-x.y-dev
@@ -828,7 +828,7 @@ Description: OpenCL C language implementation - development files
 
 Package: libunwind-@LLVM_VERSION@
 Section: libs
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -845,7 +845,7 @@ Description: production-quality unwinder
 
 Package: libunwind-@LLVM_VERSION@-dev
 Section: libdevel
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends:
  ${misc:Depends},
@@ -934,7 +934,7 @@ Package: flang-@LLVM_VERSION@
 # no 32bit support
 # https://github.com/llvm/llvm-project/issues/59845
 Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-@LLVM_VERSION@-dev (= ${binary:Version}),
 Provides: fortran-compiler, gfortran-mod-15
 Description: Fortran compiler
  Ground-up implementation of a Fortran front end written in

debian/patches/lldb/lldb-link-atomic-cmake.patch

@@ -1,26 +0,0 @@
-Description: Link with -latomic when mips* processor is detected
-Author: Gianfranco Costamagna <locutusofborg@debian.org>
-Last-Update: 2016-07-27
-
----
- lldb/cmake/LLDBDependencies.cmake |    6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/source/Utility/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/lldb/source/Utility/CMakeLists.txt
-+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/source/Utility/CMakeLists.txt
-@@ -15,6 +15,13 @@ endif()
- 
- list(APPEND LLDB_SYSTEM_LIBS ${CMAKE_DL_LIBS})
- 
-+if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips" OR
-+   CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mipsel" OR
-+   CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64el" OR
-+   CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "powerpcspe")
-+  list(APPEND LLDB_SYSTEM_LIBS atomic)
-+endif()
-+
- if (CMAKE_SYSTEM_NAME MATCHES "Windows")
-   list(APPEND LLDB_SYSTEM_LIBS ws2_32 rpcrt4)
- endif ()

debian/patches/series

@@ -51,7 +51,6 @@ scan-view-fix-path.diff
 fix-scan-view-path.diff
 
 # lldb
-lldb/lldb-link-atomic-cmake.patch
 lldb/lldb-addversion-suffix-to-llvm-server-exec.patch
 lldb/lldb-missing-install.diff
 lldb/lldb-disable-swig-error.diff

debian/rules

@@ -192,9 +192,8 @@ ifneq (,$(filter $(DEB_HOST_ARCH),powerpc))
   STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
 endif
 
-# more than 2 jobs causes OOM in Ubuntu and slows down build process.
+# debug symbols OOM in Ubuntu Ubuntu and slows down build process.
 ifneq (,$(filter $(DEB_HOST_ARCH),riscv64))
-  NJOBS=2
   opt_flags = -O2 -DNDEBUG -g0
 else
   opt_flags = -O2 -DNDEBUG -g1
@@ -222,6 +221,13 @@ ifneq (,$(filter $(DEB_HOST_ARCH),s390x))
   LIBCXX_USE_COMPILER_RT := OFF
 endif
 
+ifneq (,$(filter $(DEB_HOST_ARCH),mips64el))
+  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
+  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF
+  COMPILER_RT_USE_BUILTINS_LIBRARY := OFF
+  LIBCXX_USE_COMPILER_RT := OFF
+endif
+
 ifneq (,$(filter $(DEB_HOST_ARCH),x32))
   STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=x86_64-linux-gnux32
   STAGE_ALL_CMAKE_EXTRA += -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-linux-gnux32
@@ -250,9 +256,6 @@ ifndef LLVM_SPIRV
 	LLVM_SPIRV_VERSION := $(shell expr $(LLVM_VERSION) - 1)
 	LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv-$(LLVM_SPIRV_VERSION)" 2>/dev/null)
 endif
-# For now, disable spir because it needs
-# 16 because of opaque pointers
-undefine LLVM_SPIRV
 ifndef LLVM_SPIRV
 	LLVM_SPIRV_INSTALLED = no
 else
@@ -310,7 +313,7 @@ endif
 
 # Enable libunwind (or not)
 LIBUNWIND_ENABLE=yes
-ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel m68k mipsel hurd-i386 powerpc sparc sparc64 x32))
+ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel m68k mipsel mips64el hurd-i386 powerpc sparc sparc64 x32))
   LIBUNWIND_ENABLE=no
 # do not use compiler-rt builtins for libcxx (libcxxabi) when libunwind is
 # disabled since the gnu implementation in libgcc_s will then be required
@@ -1368,7 +1371,7 @@ endif
 	ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libcxxabi || true
 
 # MLIR
-ifeq (,$(filter $(DEB_HOST_ARCH), armhf i386 x32))
+ifeq (,$(filter $(DEB_HOST_ARCH), armel armhf i386 x32))
 # Do not run MLIR test on i386 because of
 # https://github.com/llvm/llvm-project/issues/58357
 	ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-mlir || true