diff --git a/debian/changelog b/debian/changelog index 8fda9078..3560ac17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ llvm-toolchain-19 (1:19.1.0~++rc4-6) UNRELEASED; urgency=medium + [ Matthias Klose ] * debian/qualify-clang.sh: Skip llvmlibc test, if libllvmlibc-dev is not available. + [ YunQiang Su ] + * also pass -mxgot in LDFLAGS. + * d/p/mips-mlir-xgot.diff: Pass -mxgot for mlir. + -- Matthias Klose Tue, 10 Sep 2024 07:59:17 +0200 llvm-toolchain-19 (1:19.1.0~++rc4-5) unstable; urgency=medium diff --git a/debian/patches/mips-mlir-xgot.diff b/debian/patches/mips-mlir-xgot.diff new file mode 100644 index 00000000..a7c293df --- /dev/null +++ b/debian/patches/mips-mlir-xgot.diff @@ -0,0 +1,15 @@ +Index: llvm-toolchain-19-19.1.0~++rc4/mlir/CMakeLists.txt +=================================================================== +--- llvm-toolchain-19-19.1.0~++rc4.orig/mlir/CMakeLists.txt ++++ llvm-toolchain-19-19.1.0~++rc4/mlir/CMakeLists.txt +@@ -93,6 +93,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" A + append_if(CXX_SUPPORTS_WNO_UNUSED_BUT_SET_PARAMETER "-Wno-unused-but-set-parameter" CMAKE_CXX_FLAGS) + endif() + ++check_symbol_exists(__mips "" __MIPS) ++append_if(__MIPS "-mxgot" CMAKE_C_FLAGS) ++append_if(__MIPS "-mxgot" CMAKE_CXX_FLAGS) ++ + # Installing the headers and docs needs to depend on generating any public + # tablegen'd targets. + # mlir-generic-headers are dialect-independent. diff --git a/debian/patches/series b/debian/patches/series index 777229cd..6d0bbe62 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -136,3 +136,4 @@ libsanitizer-timebits.diff offload-disable-static-assert.diff link-with-package-metadata.diff env-lld-package-metadata.diff +mips-mlir-xgot.diff diff --git a/debian/rules b/debian/rules index 9d5d8070..6d2f4498 100755 --- a/debian/rules +++ b/debian/rules @@ -266,6 +266,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),mips64el)) STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=mips64el-linux-gnuabi64 CFLAGS_EXTRA += -mxgot CXXFLAGS_EXTRA += -mxgot + LDFLAGS_EXTRA += -mxgot endif ifneq (,$(filter $(DEB_HOST_ARCH),powerpc))