summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Neumann <mail@timnn.me>2017-04-02 12:36:20 +0200
committerTim Neumann <mail@timnn.me>2017-04-23 22:00:02 +0200
commit5ae4a58c339a935fd098ba6ea8315af444113276 (patch)
treeca70bf3edfd31a564072b15d0f20e75aa9d384f2
parenta146431e4c8095a3d809517c8abc6b886d5c5b07 (diff)
downloadrust-5ae4a58c339a935fd098ba6ea8315af444113276.tar.gz
FIN: build comiler-rt wihout Thumb on arm
-rw-r--r--src/libcompiler_builtins/build.rs6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libcompiler_builtins/build.rs b/src/libcompiler_builtins/build.rs
index bcd3a92dd43..8fe79057bd8 100644
--- a/src/libcompiler_builtins/build.rs
+++ b/src/libcompiler_builtins/build.rs
@@ -293,6 +293,12 @@ fn main() {
}
if target.contains("arm") && !target.contains("ios") {
+ // (At least) udivsi3.S is broken for Thumb 1 which our gcc uses by
+ // default, we don't want Thumb 2 since it isn't supported on some
+ // devices, so disable thumb entirely.
+ // Upstream bug: https://bugs.llvm.org/show_bug.cgi?id=32492
+ cfg.define("__ARM_ARCH_ISA_THUMB", Some("0"));
+
sources.extend(&["arm/aeabi_cdcmp.S",
"arm/aeabi_cdcmpeq_check_nan.c",
"arm/aeabi_cfcmp.S",