Skip to contentSkip to conversation

optee: Pass HOST_CC_ARCH for locating compiler runtime

PATCH Applied Khem Raj 2 participants 3 messages May 10, 2022 – May 16, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 optee: Pass HOST_CC_ARCH for locating compiler runtime

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

---
 meta-arm/recipes-security/optee/optee.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arm/recipes-security/optee/optee.inc +1 -1
index 0dd08a7..06c67cf 100644
@@ -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} \
Signature · 1 line
2.36.1
Applied
#1 lore raw
Quoted 6 lines · 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

Applied, thanks!

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

      commit: 03f5819187ee1c3e35a417866e0f94e47d483de2

Best regards,

Signature · 1 line
Jon Mason <[email protected]>
Applied
#2 lore raw
In reply to Khem Raj
Quoted 6 lines · 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

Applied, thanks!

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

      commit: 03f5819187ee1c3e35a417866e0f94e47d483de2

Best regards,

Signature · 1 line
Jon Mason <[email protected]>