about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-15 20:46:26 -0800
committerbors <bors@rust-lang.org>2014-02-15 20:46:26 -0800
commitf3d4fe75000eba9ff575d37fd1a2acba942fa68e (patch)
tree4796bdee85e5795f1f7be7b27580b67cf8324647
parent49ba513c78e6430e55e5478f478a157e085a639a (diff)
parent615536a265124550cc94b6c66c64bdb6752391f1 (diff)
downloadrust-f3d4fe75000eba9ff575d37fd1a2acba942fa68e.tar.gz
rust-f3d4fe75000eba9ff575d37fd1a2acba942fa68e.zip
auto merge of #12305 : luqmana/rust/ub, r=sfackler
These are no longer valid options as of the recent llvm upgrade.
-rw-r--r--mk/platform.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/platform.mk b/mk/platform.mk
index c473618004e..b27546289f3 100644
--- a/mk/platform.mk
+++ b/mk/platform.mk
@@ -350,7 +350,7 @@ CFG_GCCISH_DEF_FLAG_arm-unknown-linux-gnueabi := -Wl,--export-dynamic,--dynamic-
 CFG_GCCISH_PRE_LIB_FLAGS_arm-unknown-linux-gnueabi := -Wl,-whole-archive
 CFG_GCCISH_POST_LIB_FLAGS_arm-unknown-linux-gnueabi := -Wl,-no-whole-archive
 CFG_DEF_SUFFIX_arm-unknown-linux-gnueabi := .linux.def
-CFG_LLC_FLAGS_arm-unknown-linux-gnueabi := -arm-enable-ehabi -arm-enable-ehabi-descriptors
+CFG_LLC_FLAGS_arm-unknown-linux-gnueabi :=
 CFG_INSTALL_NAME_arm-unknown-linux-gnueabi =
 CFG_LIBUV_LINK_FLAGS_arm-unknown-linux-gnueabi =
 CFG_EXE_SUFFIX_arm-unknown-linux-gnueabi :=