path: root/firmware/asm
diff options
authorThomas Martitz <>2012-03-28 22:57:13 +0200
committerThomas Martitz <>2012-03-28 23:02:39 +0200
commit7b1a369cf7801f98139189ade463f3a460f78d85 (patch)
tree27f7fb3628f5692f508c1e3e439fa9d657869c77 /firmware/asm
parentc56950ea3a9e0244461ce445f25bd7a80c8f7199 (diff)
build system: completely autodetect target cpu architecture.
The existing ARCH Makefile variable is exported to the C code as well. Additionally the version (arm-only for now) is detected as well. This allows to for complete autodetection, i.e. that optimized ASM is picked up if determined by preprocessor (CPU_ARM, etc). Building a sim/raaa on a arm host will now automatically generate a arm optmized build like we have for native targets. Change-Id: I0b35393f8fb3ebd20beaa9e7371fa57bf3782107
Diffstat (limited to 'firmware/asm')
1 files changed, 2 insertions, 1 deletions
diff --git a/firmware/asm/asm.make b/firmware/asm/asm.make
index 17b666ee5e..69147c506e 100644
--- a/firmware/asm/asm.make
+++ b/firmware/asm/asm.make
@@ -10,8 +10,9 @@
# Collect dummy C files in firmware/asm
ASM_DUMMY_SRC := $(notdir $(call preprocess, $(FIRMDIR)/asm/SOURCES))
+ASM_ARCH := $(subst arch_,,$(ARCH)) # strip arch_ prefix from $(ARCH)
# Get the corresponding real source files under firmware/asm/$ARCH (C or ASM)
-ASM_C_SRC := $(addprefix $(FIRMDIR)/asm/$(ARCH)/,$(ASM_DUMMY_SRC))
+ASM_C_SRC := $(addprefix $(FIRMDIR)/asm/$(ASM_ARCH)/,$(ASM_DUMMY_SRC))
ASM_S_SRC := $(ASM_C_SRC:.c=.S)
# ASM_SRC now contains only files that exist under $ARCH