From 547b9a0be53398ee394a66f0048c57e9e228624f Mon Sep 17 00:00:00 2001
From: Valerio Setti <vsetti@baylibre.com>
Date: Tue, 20 May 2025 09:46:01 +0200
Subject: [PATCH] scripts: all-helpers: fix helper_armc6_build_test

Adapt path for the tf-psa-crypto case

Signed-off-by: Valerio Setti <vsetti@baylibre.com>
---
 scripts/all-helpers.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/all-helpers.sh b/scripts/all-helpers.sh
index c0d486048..917e45531 100644
--- a/scripts/all-helpers.sh
+++ b/scripts/all-helpers.sh
@@ -275,12 +275,15 @@ helper_armc6_build_test()
     msg "size: ARM Compiler 6 ($FLAGS)"
     if in_mbedtls_repo; then
         "$ARMC6_FROMELF" -z library/*.o
-    fi
-    if [ -n "${PSA_CORE_PATH}" ]; then
-        "$ARMC6_FROMELF" -z ${PSA_CORE_PATH}/*.o
-    fi
-    if [ -n "${BUILTIN_SRC_PATH}" ]; then
-        "$ARMC6_FROMELF" -z ${BUILTIN_SRC_PATH}/*.o
+        if [ -n "${PSA_CORE_PATH}" ]; then
+            "$ARMC6_FROMELF" -z ${PSA_CORE_PATH}/*.o
+        fi
+        if [ -n "${BUILTIN_SRC_PATH}" ]; then
+            "$ARMC6_FROMELF" -z ${BUILTIN_SRC_PATH}/*.o
+        fi
+    else
+        "$ARMC6_FROMELF" -z ${PSA_CORE_PATH}/CMakeFiles/tfpsacrypto.dir/*.o
+        "$ARMC6_FROMELF" -z ${BUILTIN_SRC_PATH}/../CMakeFiles/builtin.dir/src/*.o
     fi
 }