From bdfce0866c0b60c2b7968c09bf9eee061e7e8ccb Mon Sep 17 00:00:00 2001 From: Faidon Liambotis Date: Wed, 10 Jan 2024 09:32:21 +0200 Subject: [PATCH] Revert "Enable COMPILER_RT_BUILD_BUILTINS for armel" FTBFSes with: FAILED: CMakeFiles/clang_rt.builtins-arm.dir/arm/sync_fetch_and_add_4.S.o /<>/build-llvm/./bin/clang -target arm-linux-gnueabi -DVISIBILITY_HIDDEN -O3 -DNDEBUG -fno-lto -std=c11 -fPIC -fno-builtin -fvisibility=hidden -fomit-frame-pointer -DCOMPILER_RT_HAS_FLOAT16 -MD -MT CMakeFiles/clang_rt.builtins-arm.dir/arm/sync_fetch_and_add_4.S.o -MF CMakeFiles/clang_rt.builtins-arm.dir/arm/sync_fetch_and_add_4.S.o.d -o CMakeFiles/clang_rt.builtins-arm.dir/arm/sync_fetch_and_add_4.S.o -c /<>/compiler-rt/lib/builtins/arm/sync_fetch_and_add_4.S In file included from /<>/compiler-rt/lib/builtins/arm/sync_fetch_and_add_4.S:14: /<>/compiler-rt/lib/builtins/arm/sync-ops.h:22:2: error: DMB is only supported on ARMv6+ 22 | #error DMB is only supported on ARMv6+ | ^ This was despite an upstream commit labeled "[compiler-rt] support armv4t". Perhaps something going on with the way we configure? Revert for the time being, until (if) someone cares. This reverts commit 1b0abffef7149d26f5c0cb6480bfc7016b1673ee. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index c7bc68be..0fd35b24 100755 --- a/debian/rules +++ b/debian/rules @@ -177,6 +177,9 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),armel)) # https://wiki.debian.org/ArmEabiPort CFLAGS_EXTRA += -march=armv5t CXXFLAGS_EXTRA += -march=armv5t +# disable compiler-rt builtins (not supported for baseline armel arch: armv5t) +# See http://lists.llvm.org/pipermail/llvm-dev/2016-May/099761.html + STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF COMPILER_RT_USE_BUILTINS_LIBRARY := OFF LIBCXX_USE_COMPILER_RT := OFF # disable scudo standalone (not supported for baseline armel arch: armv5t)