build: ldelf and TAs can rely on CFLAGS32/CFLAGS64 #4829
Conversation
ta/mk/build-user-ta.mk
Outdated
| @@ -2,6 +2,13 @@ include mk/cleanvars.mk | |||
| sm := $(lastword $(subst /, ,$(dir $(ta-mk-file)))) | |||
| sm-$(sm) := y | |||
|
|
|||
| ifeq ($(ta-target),ta_arm32) | |||
There was a problem hiding this comment.
Will this work? ta-target is reassigned below.
There was a problem hiding this comment.
Indeed this works. Maybe not for the good reasons :)
There was a problem hiding this comment.
How about replacing with with
ifeq ($(sm),ta_arm32)
arch-bits-ta_arm32 := 32
endif
ifeq ($(sm),ta_arm64)
arch-bits-ta_arm64 := 64
endif
below the assignment to be more clear and do it the same way as in ta/mk/ta_dev_kit.mk
ta/mk/build-user-ta.mk
Outdated
| ta-target := $(strip $(if $(CFG_USER_TA_TARGET_$(sm)), \ | ||
| $(filter $(CFG_USER_TA_TARGET_$(sm)), $(ta-targets)), \ | ||
| $(default-user-ta-target))) | ||
|
|
||
| ifeq ($(ta-target),ta_arm32) | ||
| arch-bits-$(sm) := 32 |
There was a problem hiding this comment.
You're checking $(ta-target), but then you're using $(sm). I can't make sense of that.
There was a problem hiding this comment.
sm, from build-user-ta.mk is the in-tree TA name (avb, pkcs11, ...).
As build process uses CFLAGS$(arch-bits-$(sm)) (to refer to CFLAGS32/CFLAGS64), we must set arch-bits-$(sm) for each TA name.
External TAs use ta_dev_kit.mk, where sm is ta_arm32 or ta_arm64, so a different path.
There was a problem hiding this comment.
Aha, thanks for the clarification. It might be worth adding a comment like:
# $(sm) here is the name of the binary being built, for instance "avb" or "pkcs11"
|
|
Defines arch-bits-$(sm) for ldelf and intree TAs sub components so that they can build using CFLAGS32 (or CFLAGS64) directives possibly passed by the build environment. Defines arch-bits-ta_arm32 (resp. 64) in TA devkit to leverage CFLAGS32 (reps. CFLAGS64) directive passed by the build process. This change is needed for external package willing to pass specific directive to TA build sequence as toolchain's sysroot path. Adds an inline comment describing $(sm) value in the in tree TAs build instructions. Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org> Reviewed-by: Jerome Forissier <jerome@forissier.org>
etienne-lms
force-pushed
the
cflagsxx
branch
from
7b366cb
to
9babbc3
Compare
|
Squashed, commit log updated, review tags applied. |
Defines arch-bits-$(sm) for ldelf and intree TAs sub components
so that they can build using CFLAGS32 (or CFLAGS64) directives
possibly passed by the build environment.
Defines arch-bits-ta_arm32 (resp. 64) in TA devkit to leverage
CFLAGS32 (reps. CFLAGS64) directive passed by the build process. This
change is needed for external package willing to pass specific
directive to TA build sequence as toolchain's sysroot path.
Signed-off-by: Etienne Carriere etienne.carriere@linaro.org