aboutsummaryrefslogtreecommitdiff
path: root/core/core.mk
diff options
context:
space:
mode:
authorJerome Forissier <jerome.forissier@linaro.org>2016-02-05 10:48:36 +0100
committerJerome Forissier <jerome.forissier@linaro.org>2016-02-08 13:30:02 +0100
commitc042fbefb52822b8f1c681d49e272092edd10b0d (patch)
treeac27a272bd0fb7229cd39246a0399f361d1ddd40 /core/core.mk
parent1aa8bb32c132f0cf3b2cf954b56b40dda1f37cc9 (diff)
Introduce CROSS_COMPILE32 and CROSS_COMPILE64
Currently, to build a 64-bit TEE core (as well as mixed 32- and 64-bit TA libraries, which are automatically enabled in this case), one has to set too many compiler variables: $ make PLATFORM=hikey CFG_ARM64_core=y \ CROSS_COMPILE_core=aarch64-linux-gnu- \ CROSS_COMPILE_ta_arm64=aarch64-linux-gnu- This commit introduces two variables, CROSS_COMPILE32 and CROSS_COMPILE64. They take appropriate default values, so that the above line may be simplified as: $ make PLATFORM=hikey CFG_ARM64_core=y The change remains compatible with previous builds, i.e., CROSS_COMPILE can still be used to define the 32-bit compiler because CROSS_COMPILE32 defaults to $(CROSS_COMPILE). Similarly, CROSS_COMPILE_core and CROSS_COMPILE_ta_arm{32,64} are still used so they may be overridden too. Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org> Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Diffstat (limited to 'core/core.mk')
-rw-r--r--core/core.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/core.mk b/core/core.mk
index 506d1d09..baefe536 100644
--- a/core/core.mk
+++ b/core/core.mk
@@ -12,7 +12,6 @@ include mk/config.mk
include core/arch/$(ARCH)/$(ARCH).mk
# Setup compiler for this sub module
-CROSS_COMPILE_$(sm) ?= $(CROSS_COMPILE)
COMPILER_$(sm) ?= $(COMPILER)
include mk/$(COMPILER_$(sm)).mk