[ YunQiang Su ]

* also pass -mxgot in LDFLAGS.
  * d/p/mips-mlir-xgot.diff: Pass -mxgot for mlir.
This commit is contained in:
Matthias Klose 2024-09-10 17:11:28 +02:00
parent 4d3b2e59b9
commit 8e77584fe9
4 changed files with 22 additions and 0 deletions

5
debian/changelog vendored
View File

@ -1,8 +1,13 @@
llvm-toolchain-19 (1:19.1.0~++rc4-6) UNRELEASED; urgency=medium 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 * debian/qualify-clang.sh: Skip llvmlibc test, if libllvmlibc-dev is not
available. available.
[ YunQiang Su ]
* also pass -mxgot in LDFLAGS.
* d/p/mips-mlir-xgot.diff: Pass -mxgot for mlir.
-- Matthias Klose <doko@debian.org> Tue, 10 Sep 2024 07:59:17 +0200 -- Matthias Klose <doko@debian.org> Tue, 10 Sep 2024 07:59:17 +0200
llvm-toolchain-19 (1:19.1.0~++rc4-5) unstable; urgency=medium llvm-toolchain-19 (1:19.1.0~++rc4-5) unstable; urgency=medium

15
debian/patches/mips-mlir-xgot.diff vendored Normal file
View File

@ -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.

View File

@ -136,3 +136,4 @@ libsanitizer-timebits.diff
offload-disable-static-assert.diff offload-disable-static-assert.diff
link-with-package-metadata.diff link-with-package-metadata.diff
env-lld-package-metadata.diff env-lld-package-metadata.diff
mips-mlir-xgot.diff

1
debian/rules vendored
View File

@ -266,6 +266,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),mips64el))
STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=mips64el-linux-gnuabi64 STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=mips64el-linux-gnuabi64
CFLAGS_EXTRA += -mxgot CFLAGS_EXTRA += -mxgot
CXXFLAGS_EXTRA += -mxgot CXXFLAGS_EXTRA += -mxgot
LDFLAGS_EXTRA += -mxgot
endif endif
ifneq (,$(filter $(DEB_HOST_ARCH),powerpc)) ifneq (,$(filter $(DEB_HOST_ARCH),powerpc))