diff --git a/debian/changelog b/debian/changelog index f5af3508..15014848 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-8 (1:8-4) unstable; urgency=medium + + * Try to disable mips64el-fix.diff (struct_kernel_stat_sz) + to workaround a mips issue with some new C{XX}FLAGS + see https://reviews.llvm.org/D59702 + + -- Sylvestre Ledru Mon, 29 Apr 2019 08:58:57 +0200 + llvm-toolchain-8 (1:8-3) unstable; urgency=medium * Fix the FTBFS on mips (introduced by my previous change) diff --git a/debian/patches/series b/debian/patches/series index cbf0c7ab..0734b7cf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -127,7 +127,6 @@ kfreebsd/lib_Target_X86.diff kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff -mips64el-fix.diff # patches for intel-opencl-clang OpenCL-Change-type-of-block-pointer-for-OpenCL.patch diff --git a/debian/rules b/debian/rules index 909eb431..5baab1e2 100755 --- a/debian/rules +++ b/debian/rules @@ -100,6 +100,10 @@ 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