| From 9c55b7a4e39617c2abbf4e0e39fd8041c7b2b9b6 Mon Sep 17 00:00:00 2001 |
| From: Brett Warren <brett.warren@arm.com> |
| Date: Wed, 23 Sep 2020 09:27:34 +0100 |
| Subject: [PATCH] optee: enable clang support |
| |
| When compiling with clang, the LIBGCC_LOCATE_CFLAG variable used |
| to provide a sysroot wasn't included, which results in not locating |
| compiler-rt. This is mitigated by including the variable as ammended. |
| |
| Upstream-Status: Pending |
| ChangeId: 8ba69a4b2eb8ebaa047cb266c9aa6c2c3da45701 |
| Signed-off-by: Brett Warren <brett.warren@arm.com> |
| --- |
| mk/clang.mk | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/mk/clang.mk b/mk/clang.mk |
| index a045beee8482..1ebe2f702dcd 100644 |
| --- a/mk/clang.mk |
| +++ b/mk/clang.mk |
| @@ -30,7 +30,7 @@ comp-cflags-warns-clang := -Wno-language-extension-token \ |
| |
| # Note, use the compiler runtime library (libclang_rt.builtins.*.a) instead of |
| # libgcc for clang |
| -libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \ |
| +libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \ |
| -rtlib=compiler-rt -print-libgcc-file-name 2> /dev/null) |
| |
| # Core ASLR relies on the executable being ready to run from its preferred load |