diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in
index 3002792a..d69cd402 100644
--- a/debian/clang-tools-X.Y.install.in
+++ b/debian/clang-tools-X.Y.install.in
@@ -61,7 +61,8 @@ usr/lib/llvm-@LLVM_VERSION@/libexec/analyze-cc
 usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-c++
 usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-cc
 
-[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mipsel !mips64el !sparc64 !loong64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize
+# See compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake / HWASAN_SUPPORTED_ARCH
+[amd64 arm64 riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize
 
 clang/tools/scan-build-@LLVM_VERSION@      usr/share/clang/
 clang/tools/scan-view-@LLVM_VERSION@       usr/share/clang/
diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in
index ebe7c0bd..be3689b8 100644
--- a/debian/libclang-rt-X.Y-dev.install.in
+++ b/debian/libclang-rt-X.Y-dev.install.in
@@ -7,4 +7,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/README.txt
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/fuzzer/
 usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/orc/c_api.h
 # See compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake / ALL_ORC_SUPPORTED_ARCH
-[amd64 arm64 armhf armel i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt*
+[amd64 arm64 armhf armel] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt*
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)