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

debian/changelog

@@ -58,7 +58,10 @@ llvm-toolchain-16 (1:16.0.6-5) UNRELEASED; urgency=medium
   [ Samuel Thibault ]
   * Fix hurd build by fixing Linux-specific lines.
 
- -- Samuel Thibault <sthibault@debian.org>  Sun, 09 Jul 2023 17:03:24 +0200
+  [ Sylvestre Ledru ]
+  * set -DCMAKE_SYSTEM_NAME=Generic to build wasm to fix upstream #63799
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 11 Jul 2023 22:28:59 +0200
 
 llvm-toolchain-16 (1:16.0.6-4) unstable; urgency=medium
 

debian/qualify-clang.sh

@@ -490,10 +490,10 @@ check_symlink "libclang-cpp.so.$VERSION"
 check_symlink "libclang-$VERSION.so"
 check_symlink "libclang.so"
 
+if [ $DEB_HOST_ARCH != "i386" ]; then
     echo "Testing python clang ..."
-
     python3 -c 'from ctypes import *; import clang.cindex; config = clang.cindex.Config(); verfunc = config.lib.clang_getClangVersion; verfunc.restype = c_char_p ; print(verfunc())'
-
+fi
 
 echo "Testing code coverage ..."
 

debian/rules

@@ -367,6 +367,23 @@ ifneq (,$(filter scan-build,$(DEB_BUILD_OPTIONS)))
 	STAGE_ALL_CMAKE_EXTRA += -DLLVM_ENABLE_ASSERTIONS=ON
 endif
 
+ifneq (,$(filter coverity,$(DEB_BUILD_OPTIONS)))
+# enable the build using coverity
+# pbuilder contains BINDMOUNTS="/opt/cov-analysis/"
+# And we have some pbuilder hooks to configure and pack the result
+# Where the binaries are installed on the jenkins instance
+        PRE_PROCESS=PATH=$$PATH:/opt/cov-analysis/bin/ cov-build --dir cov-int
+# We don't want to check the temporary files produced by the configure
+        PRE_PROCESS_CONF=
+        COVERITY_ENABLE=1
+        CONFIGURE_EXTRA += --enable-assertions
+        STAGE_ALL_CMAKE_EXTRA += -DLLVM_ENABLE_ASSERTIONS=ON
+# no need to run tests in this case
+        RUN_TEST=no
+else
+        COVERITY_ENABLE=0
+endif
+
 LLDB_ENABLE=yes
 LLDB_DISABLE_ARCHS := hurd-i386 ia64 powerpc powerpcspe ppc64 riscv64 sparc64 mips64el mipsel
 # hurd has threading issues
@@ -798,6 +815,7 @@ build-wasm/compiler-rt-%:
 	$(CMAKE_BIN) -B "$@" -S compiler-rt/lib/builtins/ \
 		-G Ninja \
 		$(SCCACHE_CMAKE) \
+		-DCMAKE_SYSTEM_NAME=Generic \
 		-DCMAKE_C_COMPILER_TARGET=$(cpu)-unknown-unknown \
 		-DCMAKE_CXX_COMPILER_TARGET=$(cpu)-unknown-unknown \
 		-DCMAKE_ASM_COMPILER_TARGET=$(cpu)-unknown-unknown \