about summary refs log tree commit diff
diff options
context:
space:
mode:
authorHideki Sekine <sekineh@me.com>2018-08-08 19:17:00 +0900
committerHideki Sekine <sekineh@me.com>2018-08-08 19:17:00 +0900
commit6c526537b8ac43b4924285d5cc6b620adfc5b13d (patch)
treec298dfba706b0f0eb6382c22c7ae6c4e77edb90e
parentbbbe4417d00d7a6a9384a648ce016c94fe96bb5c (diff)
downloadrust-6c526537b8ac43b4924285d5cc6b620adfc5b13d.tar.gz
rust-6c526537b8ac43b4924285d5cc6b620adfc5b13d.zip
[CI] run-make/thumb: support 4 thumb*-none-eabi* targets:
- thumbv6m-none-eabi (Bare Cortex-M0, M0+, M1)
- thumbv7em-none-eabi (Bare Cortex-M4, M7)
- thumbv7em-none-eabihf (Bare Cortex-M4F, M7F, FPU, hardfloat)
- thumbv7m-none-eabi (Bare Cortex-M3)
-rw-r--r--src/test/run-make/thumb-none-cortex-m/Makefile12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/test/run-make/thumb-none-cortex-m/Makefile b/src/test/run-make/thumb-none-cortex-m/Makefile
index a6a48c4249e..a049fc5fb3f 100644
--- a/src/test/run-make/thumb-none-cortex-m/Makefile
+++ b/src/test/run-make/thumb-none-cortex-m/Makefile
@@ -1,9 +1,17 @@
 -include ../../run-make-fulldeps/tools.mk
 
 # How to run this
-# $ ./x.py test --target thumbv7m-none-eabi src/test/run-make
+# $ ./x.py clean
+# $ ./x.py test --target thumbv6m-none-eabi,thumbv7m-none-eabi src/test/run-make
 
-ifeq ($(TARGET),thumbv7m-none-eabi)
+# Supported targets:
+# - thumbv6m-none-eabi (Bare Cortex-M0, M0+, M1)
+# - thumbv7em-none-eabi (Bare Cortex-M4, M7)
+# - thumbv7em-none-eabihf (Bare Cortex-M4F, M7F, FPU, hardfloat)
+# - thumbv7m-none-eabi (Bare Cortex-M3)
+
+# See https://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
+ifneq (,$(filter $(TARGET),thumbv6m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf thumbv7m-none-eabi))
 
 # We need to be outside of 'src' dir in order to run cargo
 WORK_DIR := $(RUST_TEST_TMPDIR)/run-make/$(TARGET)