On 4/9/24 11:08 AM, Ahmad Fatoum wrote:
The MAKE_ENV incantation results in PTXdist defining variables like AS
and LD that point at the respective tools in the cross toolchain.

This was unneeded as we already supply the TF-A built with a
CROSS_COMPILE option, which is used to derive the correct tools, but it
didn't hurt.

This will expectedly change with TF-A v2.11, which should merge commit
cc277de81692 ("build: refactor toolchain detection"), currently sitting
in the integration branch.

This changes the default value of AS to be that of the C compiler and
leads to various issues when overriding it with an assembler as was
possible before, e.g.:

   - hang during tool discovery, because `as -v` keeps waiting for input,
     unlike gcc -v

   - Assembler errors during build, because GCC-specific options (e.g.
     -DMACRO=VAL) are now passed to as(1).

While TF-A changing the semantics of the AS option is arguably
strange[2], let's take the easy way out and stop setting AS, so the PTXdist
rule can build both old and new TF-A without problems.

[1]: https://github.com/ARM-software/arm-trusted-firmware/commit/cc277de8169
[2]: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/27163

Signed-off-by: Ahmad Fatoum <a.fat...@pengutronix.de>
---
  rules/tf-a.make | 2 --
  1 file changed, 2 deletions(-)

diff --git a/rules/tf-a.make b/rules/tf-a.make
index 54fe7d1e37d8..b8c477476c74 100644
--- a/rules/tf-a.make
+++ b/rules/tf-a.make
@@ -74,8 +74,6 @@ TF_A_CONF_TOOL        := NO
  # Compile
  # ----------------------------------------------------------------------------
-TF_A_MAKE_ENV := $(CROSS_ENV)
-

Perhaps not in this config, but isn't the make env used for other things?
Like TLS stuff?

regards,
Christian

  $(STATEDIR)/tf-a.compile:
        @$(call targetinfo)

Reply via email to