From d85711c0498ed651a3be4a5e31e9a74814a6f288 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 29 Sep 2025 17:45:51 +0100 Subject: [PATCH] arm/optee: remove redundant libgcc flags Upstream appear to have resolved the libgcc linkage issues as these variables are not used in upstream nor our patches. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm/recipes-security/optee/optee-os.inc | 4 ---- meta-arm/recipes-security/optee/optee.inc | 1 - 2 files changed, 5 deletions(-) diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc index 3065f71f..41eb6d1f 100644 --- a/meta-arm/recipes-security/optee/optee-os.inc +++ b/meta-arm/recipes-security/optee/optee-os.inc @@ -38,10 +38,6 @@ CPPFLAGS[unexport] = "1" AS[unexport] = "1" LD[unexport] = "1" -do_compile:prepend() { - PLAT_LIBGCC_PATH=$(${CC} -print-libgcc-file-name) -} - do_compile() { oe_runmake -C ${S} all } diff --git a/meta-arm/recipes-security/optee/optee.inc b/meta-arm/recipes-security/optee/optee.inc index 5f01570f..a7d64af5 100644 --- a/meta-arm/recipes-security/optee/optee.inc +++ b/meta-arm/recipes-security/optee/optee.inc @@ -24,7 +24,6 @@ OPTEE_COMPILER = "${@bb.utils.contains("BBFILE_COLLECTIONS", "clang-layer", "${O TA_DEV_KIT_DIR = "${STAGING_INCDIR}/optee/export-user_ta" EXTRA_OEMAKE += "V=1 \ - LIBGCC_LOCATE_CFLAGS='${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}' \ COMPILER=${OPTEE_COMPILER} \ OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${prefix} \ TEEC_EXPORT=${STAGING_DIR_HOST}${prefix} \