From d097f614e0e403550e3160e83e1a7ebdafae4697 Mon Sep 17 00:00:00 2001
From: Valerio Setti <vsetti@baylibre.com>
Date: Fri, 9 May 2025 17:24:20 +0200
Subject: [PATCH] scripts: all-helpers: improve helper_armc6_build_test()

Print library size both when in Mbed TLS repo and when in tf-psa-crypto
one.

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

diff --git a/scripts/all-helpers.sh b/scripts/all-helpers.sh
index d65da78c8..c0d486048 100644
--- a/scripts/all-helpers.sh
+++ b/scripts/all-helpers.sh
@@ -263,14 +263,6 @@ helper_armc6_build_test()
         make clean
         ARM_TOOL_VARIANT="ult" CC="$ARMC6_CC" AR="$ARMC6_AR" CFLAGS="$FLAGS" \
                          WARNING_CFLAGS='-Werror -xc -std=c99' make lib
-        msg "size: ARM Compiler 6 ($FLAGS)"
-        "$ARMC6_FROMELF" -z library/*.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
         cmake -DCMAKE_SYSTEM_NAME="Generic" -DCMAKE_SYSTEM_PROCESSOR="cortex-m0" \
               -DCMAKE_C_COMPILER="$ARMC6_CC" -DCMAKE_C_LINKER="$ARMC6_LINK" \
@@ -279,6 +271,17 @@ helper_armc6_build_test()
               -DENABLE_PROGRAMS=OFF "$TF_PSA_CRYPTO_ROOT_DIR"
         make
     fi
+
+    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
+    fi
 }
 
 clang_version() {