diff mbox series

arm/trusted-services: Move ts-newlib compilation fix to meta-arm

Message ID 20240807204343.4267-1-mariam.elshakfy@arm.com
State New
Headers show
Series arm/trusted-services: Move ts-newlib compilation fix to meta-arm | expand

Commit Message

Mariam Elshakfy Aug. 7, 2024, 8:43 p.m. UTC 
From: Mariam Elshakfy <mariam.elshakfy@arm.com>

This change moves ts-newlib compilation fix from
meta-arm-bsp to meta-arm, as this compilation failure
is not specific to meta-arm-bsp platforms.

Signed-off-by: Mariam Elshakfy <mariam.elshakfy@arm.com>
---
 .../recipes-security/trusted-services/ts-newlib_%.bbappend     | 1 -
 meta-arm/recipes-security/trusted-services/ts-newlib_4.1.0.bb  | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-newlib_%.bbappend b/meta-arm-bsp/recipes-security/trusted-services/ts-newlib_%.bbappend
index e861426a..708f5986 100644
--- a/meta-arm-bsp/recipes-security/trusted-services/ts-newlib_%.bbappend
+++ b/meta-arm-bsp/recipes-security/trusted-services/ts-newlib_%.bbappend
@@ -4,6 +4,5 @@  COMPATIBLE_MACHINE:corstone1000 = "corstone1000"
 SRC_URI:append:corstone1000 = " \
   file://0001-newlib-memcpy-remove-optimized-version.patch;patchdir=../newlib \
 "
-export NEWLIB_CFLAGS_TARGET = "-Wno-implicit-function-declaration -Wno-int-conversion"
 
 COMPATIBLE_MACHINE:fvp-base = "fvp-base"
diff --git a/meta-arm/recipes-security/trusted-services/ts-newlib_4.1.0.bb b/meta-arm/recipes-security/trusted-services/ts-newlib_4.1.0.bb
index 669e87ae..866276b3 100644
--- a/meta-arm/recipes-security/trusted-services/ts-newlib_4.1.0.bb
+++ b/meta-arm/recipes-security/trusted-services/ts-newlib_4.1.0.bb
@@ -20,6 +20,9 @@  EXTRA_OECMAKE += '-DNEWLIB_SOURCE_DIR=${WORKDIR}/git/newlib \
 
 OECMAKE_SOURCEPATH = "${S}/deployments/newlib/${TS_ENV}/"
 
+# Silence compilation errors from GCC 14.1 due to stricter code validation
+export NEWLIB_CFLAGS_TARGET = "-Wno-implicit-function-declaration -Wno-int-conversion"
+
 # TS ships a patch that needs to be applied to newlib
 apply_ts_patch() {
     ( cd ${WORKDIR}/git/newlib;    git stash; git branch -f bf_am; git am ${S}/external/newlib/*.patch; git reset bf_am )