[PATCH] optee: Pass HOST_CC_ARCH for locating compiler runtime

[PATCH] optee: Pass HOST_CC_ARCH for locating compiler runtime

[Khem Raj]

This option is used to find the right path and file name of the C
runtime e.g. libgcc or compiler-rt, when using clang it needs to know if
compiler is using hard-float or not, since the compiler-rt file names
are different for these two ABIs libclang_rt.builtins-arm.a or libclang_rt.builtins-armhf.a
The option is computed in HOST_CC_ARCH for OE, this fixes build with
clang+llvm-runtime

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-arm/recipes-security/optee/optee.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arm/recipes-security/optee/optee.inc b/meta-arm/recipes-security/optee/optee.inc
index 0dd08a7..06c67cf 100644
--- a/meta-arm/recipes-security/optee/optee.inc
+++ b/meta-arm/recipes-security/optee/optee.inc
@@ -23,7 +23,7 @@ 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=--sysroot=${STAGING_DIR_HOST} \
+                 LIBGCC_LOCATE_CFLAGS='${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}' \
                  COMPILER=${OPTEE_COMPILER} \
                  OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${prefix} \
                  TEEC_EXPORT=${STAGING_DIR_HOST}${prefix} \
-- 
2.36.1

Re: [PATCH] optee: Pass HOST_CC_ARCH for locating compiler runtime

[Jon Mason]

On Tue, 10 May 2022 14:37:23 -0700, Khem Raj wrote:
> This option is used to find the right path and file name of the C
> runtime e.g. libgcc or compiler-rt, when using clang it needs to know if
> compiler is using hard-float or not, since the compiler-rt file names
> are different for these two ABIs libclang_rt.builtins-arm.a or libclang_rt.builtins-armhf.a
> The option is computed in HOST_CC_ARCH for OE, this fixes build with
> clang+llvm-runtime

Applied, thanks!

[1/1] optee: Pass HOST_CC_ARCH for locating compiler runtime
      commit: 03f5819187ee1c3e35a417866e0f94e47d483de2

Best regards,
-- 
Jon Mason <jon.mason@arm.com>

Re: [PATCH] optee: Pass HOST_CC_ARCH for locating compiler runtime

[Jon Mason]

On Tue, 10 May 2022 14:37:23 -0700, Khem Raj wrote:
> This option is used to find the right path and file name of the C
> runtime e.g. libgcc or compiler-rt, when using clang it needs to know if
> compiler is using hard-float or not, since the compiler-rt file names
> are different for these two ABIs libclang_rt.builtins-arm.a or libclang_rt.builtins-armhf.a
> The option is computed in HOST_CC_ARCH for OE, this fixes build with
> clang+llvm-runtime

Applied, thanks!

[1/1] optee: Pass HOST_CC_ARCH for locating compiler runtime
      commit: 03f5819187ee1c3e35a417866e0f94e47d483de2

Best regards,
-- 
Jon Mason <jon.mason@arm.com>