mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-05-07 04:58:57 +00:00
arm-bsp/trusted-firmware-a: enable explicit linking to runtime builtin
When compiling under clang for aarch32, linking fails because the compiler-rt builtins aren't implicitly linked. Recipes and patches have been modified and added to explicitly pass the runtime builtin when linking files. Change-Id: I4299b7d078d77c1fdd5576ceec1491f91e73c35d Signed-off-by: Brett Warren <brett.warren@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Brett Warren
Jon Mason
+54
@@ -0,0 +1,54 @@
|
||||
From f2855c0957ded1af279724c1a82c3e381cc036f9 Mon Sep 17 00:00:00 2001
|
||||
From: Brett Warren <brett.warren@arm.com>
|
||||
Date: Fri, 27 Nov 2020 10:12:07 +0000
|
||||
Subject: [PATCH 3/3] make: link compiler-rt builtins when 32-bit
|
||||
|
||||
Compiler-rt builtins weren't previously linked when using
|
||||
GNU ld to link for aarch32; this is now explicitly linked
|
||||
in.
|
||||
|
||||
For use with TFA 2.2
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Brett Warren <brett.warren@arm.com>
|
||||
---
|
||||
Makefile | 9 +++++++++
|
||||
make_helpers/build_macros.mk | 2 +-
|
||||
2 files changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 721246d51..5bf8e9a11 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -204,6 +204,15 @@ LD = $(LINKER)
|
||||
AS = $(CC) -c -x assembler-with-cpp $(TF_CFLAGS_$(ARCH))
|
||||
CPP = $(CC) -E
|
||||
PP = $(CC) -E
|
||||
+
|
||||
+ifeq (${ARCH},aarch32)
|
||||
+RUNTIME_LIB = $(shell $(CC) --sysroot=$(RUNTIME_SYSROOT) \
|
||||
+ $(shell sed 's/none/linux/' <<< '$(target32-directive)') \
|
||||
+ -mfloat-abi=$(TARGET_FPU) \
|
||||
+ -rtlib=compiler-rt \
|
||||
+ -print-libgcc-file-name 2> /dev/null)
|
||||
+endif
|
||||
+
|
||||
else
|
||||
TF_CFLAGS_aarch32 = $(march32-directive)
|
||||
TF_CFLAGS_aarch64 = $(march64-directive)
|
||||
diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk
|
||||
index b89d87ea6..1ff345336 100644
|
||||
--- a/make_helpers/build_macros.mk
|
||||
+++ b/make_helpers/build_macros.mk
|
||||
@@ -436,7 +436,7 @@ ifneq ($(findstring armlink,$(notdir $(LD))),)
|
||||
else
|
||||
$$(Q)$$(LD) -o $$@ $$(TF_LDFLAGS) $$(LDFLAGS) -Map=$(MAPFILE) \
|
||||
--script $(LINKERFILE) $(BUILD_DIR)/build_message.o \
|
||||
- $(OBJS) $(LDPATHS) $(LIBWRAPPER) $(LDLIBS) $(BL_LIBS)
|
||||
+ $(OBJS) $(LDPATHS) $(LIBWRAPPER) $(LDLIBS) $(BL_LIBS) $(RUNTIME_LIB)
|
||||
endif
|
||||
ifeq ($(DISABLE_BIN_GENERATION),1)
|
||||
@${ECHO_BLANK_LINE}
|
||||
--
|
||||
2.17.1
|
||||
|
||||
+52
@@ -0,0 +1,52 @@
|
||||
From 39d139a56c54856a718218e30114f732188832ea Mon Sep 17 00:00:00 2001
|
||||
From: Brett Warren <brett.warren@arm.com>
|
||||
Date: Fri, 27 Nov 2020 14:41:43 +0000
|
||||
Subject: [PATCH] make: link compiler-rt builtins when 32-bit
|
||||
|
||||
Compiler-rt builtins weren't previously linked when using
|
||||
GNU ld to link for aarch32; this is now explicitly linked
|
||||
in.
|
||||
|
||||
For use with TFA 2.3
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Brett Warren <brett.warren@arm.com>
|
||||
---
|
||||
Makefile | 7 +++++++
|
||||
make_helpers/build_macros.mk | 2 +-
|
||||
2 files changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index f01a9ae3e..493b80b14 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -243,6 +243,13 @@ endif
|
||||
AS = $(CC) -c -x assembler-with-cpp $(TF_CFLAGS_$(ARCH))
|
||||
CPP = $(CC) -E
|
||||
PP = $(CC) -E
|
||||
+ifeq (${ARCH},aarch32)
|
||||
+RUNTIME_LIB = $(shell $(CC) --sysroot=$(RUNTIME_SYSROOT) \
|
||||
+ $(shell sed 's/none/linux/' <<< '$(target32-directive)') \
|
||||
+ -mfloat-abi=$(TARGET_FPU) \
|
||||
+ -rtlib=compiler-rt \
|
||||
+ -print-libgcc-file-name 2> /dev/null)
|
||||
+endif
|
||||
else ifneq ($(findstring gcc,$(notdir $(CC))),)
|
||||
TF_CFLAGS_aarch32 = $(march32-directive)
|
||||
TF_CFLAGS_aarch64 = $(march64-directive)
|
||||
diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk
|
||||
index 1c3d14d05..2a1abd4fe 100644
|
||||
--- a/make_helpers/build_macros.mk
|
||||
+++ b/make_helpers/build_macros.mk
|
||||
@@ -482,7 +482,7 @@ ifneq ($(findstring armlink,$(notdir $(LD))),)
|
||||
else ifneq ($(findstring gcc,$(notdir $(LD))),)
|
||||
$$(Q)$$(LD) -o $$@ $$(TF_LDFLAGS) $$(LDFLAGS) -Wl,-Map=$(MAPFILE) \
|
||||
-Wl,-T$(LINKERFILE) $(BUILD_DIR)/build_message.o \
|
||||
- $(OBJS) $(LDPATHS) $(LIBWRAPPER) $(LDLIBS) $(BL_LIBS)
|
||||
+ $(OBJS) $(LDPATHS) $(LIBWRAPPER) $(LDLIBS) $(BL_LIBS) $(RUNTIME_LIB)
|
||||
else
|
||||
$$(Q)$$(LD) -o $$@ $$(TF_LDFLAGS) $$(LDFLAGS) $(BL_LDFLAGS) -Map=$(MAPFILE) \
|
||||
--script $(LINKERFILE) $(BUILD_DIR)/build_message.o \
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -84,6 +84,7 @@ DEPENDS_remove = "virtual/${TARGET_PREFIX}compilerlibs virtual/libc"
|
||||
# We need openssl for fiptool
|
||||
DEPENDS = "dtc-native openssl-native"
|
||||
DEPENDS_append_aarch64_qemuall ?= " optee-os"
|
||||
DEPENDS_append_toolchain-clang = " compiler-rt"
|
||||
|
||||
# CC and LD introduce arguments which conflict with those otherwise provided by
|
||||
# this recipe. The heads of these variables excluding those arguments
|
||||
@@ -121,6 +122,10 @@ EXTRA_OEMAKE += "${@bb.utils.contains('TFA_UBOOT', '1', 'BL33=${DEPLOY_DIR_IMAGE
|
||||
# Tell the tools where the native OpenSSL is located
|
||||
EXTRA_OEMAKE += "OPENSSL_DIR=${STAGING_DIR_NATIVE}/${prefix_native}"
|
||||
|
||||
# Runtime variables
|
||||
EXTRA_OEMAKE += "RUNTIME_SYSROOT=${STAGING_DIR_HOST}"
|
||||
EXTRA_OEMAKE += "TARGET_FPU=${TARGET_FPU}"
|
||||
|
||||
EXTRA_OEMAKE_append_aarch64_qemuall = " \
|
||||
BL32=${STAGING_DIR_TARGET}${nonarch_base_libdir}/firmware/tee-header_v2.bin \
|
||||
BL32_EXTRA1=${STAGING_DIR_TARGET}${nonarch_base_libdir}/firmware/tee-pager_v2.bin \
|
||||
|
||||
@@ -19,6 +19,11 @@ LIC_FILES_CHKSUM += "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa8
|
||||
|
||||
SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-2.16"
|
||||
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
|
||||
SRC_URI += " \
|
||||
file://0001-make-link-compiler-rt-builtins-when-32-bit-2-2.patch \
|
||||
"
|
||||
|
||||
# mbed TLS v2.16.2
|
||||
SRCREV_mbedtls = "d81c11b8ab61fd5b2da8133aa73c5fe33a0633eb"
|
||||
|
||||
|
||||
@@ -21,6 +21,11 @@ SRC_URI += "file://0001-fdts-a5ds-Fix-for-the-system-timer-issue.patch"
|
||||
|
||||
SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-2.18"
|
||||
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
|
||||
SRC_URI += " \
|
||||
file://0001-make-link-compiler-rt-builtins-when-32-bit-2-3.patch \
|
||||
"
|
||||
|
||||
# mbed TLS v2.18.1
|
||||
SRCREV_mbedtls = "ca933c7e0c9e84738b168b6b0feb89af4183a60a"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user