Try another way to address the mips64el issue

This commit is contained in:
Sylvestre Ledru 2019-05-13 11:36:58 +02:00
parent 05e63f66b7
commit 2da8f0a12a
4 changed files with 23 additions and 8 deletions

7
debian/changelog vendored
View File

@ -1,9 +1,8 @@
llvm-toolchain-8 (1:8.0.1-1~svn) UNRELEASED; urgency=medium
llvm-toolchain-8 (1:8-5) unstable; urgency=medium
[ Sylvestre Ledru ]
* New upstream release (prepare)
* Try another way to address the mips64el issue
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 07 Apr 2019 13:59:46 +0200
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 13 May 2019 11:36:47 +0200
llvm-toolchain-8 (1:8-4) unstable; urgency=medium

17
debian/patches/D59702-mips64el-fix.diff vendored Normal file
View File

@ -0,0 +1,17 @@
diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake
index ee9426b715d..2918cb07628 100644
--- a/compiler-rt/cmake/base-config-ix.cmake
+++ b/compiler-rt/cmake/base-config-ix.cmake
@@ -191,10 +191,10 @@ macro(test_targets)
# clang's default CPU's. In the 64-bit case, we must also specify the ABI
# since the default ABI differs between gcc and clang.
# FIXME: Ideally, we would build the N32 library too.
- test_target_arch(mipsel "" "-mips32r2" "-mabi=32")
+ test_target_arch(mipsel "" "-mips32r2" "-mabi=32" "-D_LARGEFILE_SOURCE" "-D_FILE_OFFSET_BITS=64")
test_target_arch(mips64el "" "-mips64r2" "-mabi=64")
elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "mips")
- test_target_arch(mips "" "-mips32r2" "-mabi=32")
+ test_target_arch(mips "" "-mips32r2" "-mabi=32" "-D_LARGEFILE_SOURCE" "-D_FILE_OFFSET_BITS=64")
test_target_arch(mips64 "" "-mips64r2" "-mabi=64")
elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "arm")
if(WIN32)

View File

@ -133,3 +133,6 @@ OpenCL-Change-type-of-block-pointer-for-OpenCL.patch
OpenCL-Simplify-LLVM-IR-generated-for-OpenCL-blocks.patch
OpenCL-Fix-assertion-due-to-blocks.patch
ubuntu-eoan-distro.patch
# Mipsel
D59702-mips64el-fix.diff

4
debian/rules vendored
View File

@ -100,10 +100,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH),mips64el))
# avoid an issue with search path on mips64el
# https://bugs.llvm.org/show_bug.cgi?id=41204
CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=mips64el-linux-gnuabi64
# Try to workaround another issue with struct_kernel_stat_sz
# https://reviews.llvm.org/D59702
CFLAGS_EXTRA += -mabi=32
CXXFLAGS_EXTRA += -mabi=32
endif