From: Rust Maintainers <pkg-rust-maintainers@lists.alioth.debian.org>
Date: Mon, 17 Jul 2017 11:41:59 +0000 (+0100)
Subject: u-ignoretest-armhf_02
X-Git-Tag: archive/raspbian/1.17.0+dfsg2-8+rpi1~1^2~22
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dfd747f711ff1c3cf11cc68f518a2ce966efe6f7;p=rustc.git

u-ignoretest-armhf_02


Gbp-Pq: Name u-ignoretest-armhf_02.patch
---

diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile
index 485ecbb4b5..8b3ef73922 100644
--- a/src/test/run-make/relocation-model/Makefile
+++ b/src/test/run-make/relocation-model/Makefile
@@ -1,17 +1,22 @@
 -include ../tools.mk
 
 all: others
+ifneq ($(filter arm,$(LLVM_COMPONENTS)),arm)
+# FIXME(#40145)
 	$(RUSTC) -C relocation-model=dynamic-no-pic foo.rs
 	$(call RUN,foo)
 
 	$(RUSTC) -C relocation-model=default foo.rs
 	$(call RUN,foo)
-
+endif
 	$(RUSTC) -C relocation-model=dynamic-no-pic --crate-type=dylib foo.rs --emit=link,obj
 
 ifdef IS_MSVC
 # FIXME(#28026)
 others:
+else ifeq ($(filter arm,$(LLVM_COMPONENTS)),arm)
+# FIXME(#40145)
+others:
 else
 others:
 	$(RUSTC) -C relocation-model=static foo.rs