From: "Jon Mason" <jdmason@kudzu.us>
To: Brett Warren <brett.warren@arm.com>
Cc: meta-arm@lists.yoctoproject.org
Subject: Re: [meta-arm] [PATCH v2 1/2] arm-bsp/trusted-firmware-a: enable explicit linking to runtime builtin
Date: Tue, 15 Dec 2020 09:21:54 -0500 [thread overview]
Message-ID: <20201215142153.GC20024@kudzu.us> (raw)
In-Reply-To: <20201215101604.29534-1-brett.warren@arm.com>
On Tue, Dec 15, 2020 at 10:16:03AM +0000, Brett Warren wrote:
> 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>
Series applied to master.
Thanks,
Jon
> ---
> ...compiler-rt-builtins-when-32-bit-2-2.patch | 54 +++++++++++++++++++
> ...compiler-rt-builtins-when-32-bit-2-3.patch | 52 ++++++++++++++++++
> .../trusted-firmware-a/trusted-firmware-a.inc | 5 ++
> .../trusted-firmware-a_2.2.bb | 5 ++
> .../trusted-firmware-a_2.3.bb | 5 ++
> 5 files changed, 121 insertions(+)
> create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-2.2/0001-make-link-compiler-rt-builtins-when-32-bit-2-2.patch
> create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-2.3/0001-make-link-compiler-rt-builtins-when-32-bit-2-3.patch
>
> diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-2.2/0001-make-link-compiler-rt-builtins-when-32-bit-2-2.patch b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-2.2/0001-make-link-compiler-rt-builtins-when-32-bit-2-2.patch
> new file mode 100644
> index 0000000..16bfcf1
> --- /dev/null
> +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-2.2/0001-make-link-compiler-rt-builtins-when-32-bit-2-2.patch
> @@ -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
> +
> diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-2.3/0001-make-link-compiler-rt-builtins-when-32-bit-2-3.patch b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-2.3/0001-make-link-compiler-rt-builtins-when-32-bit-2-3.patch
> new file mode 100644
> index 0000000..1c01865
> --- /dev/null
> +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-2.3/0001-make-link-compiler-rt-builtins-when-32-bit-2-3.patch
> @@ -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
> +
> diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
> index d37c470..bed2bad 100644
> --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
> +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
> @@ -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 \
> diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb
> index 4e8882c..f4deebb 100644
> --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb
> +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb
> @@ -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"
>
> diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
> index 745ee70..ad95fa2 100644
> --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
> +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
> @@ -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"
>
> --
> 2.17.1
>
>
>
>
prev parent reply other threads:[~2020-12-15 14:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-15 10:16 [PATCH v2 1/2] arm-bsp/trusted-firmware-a: enable explicit linking to runtime builtin Brett Warren
2020-12-15 10:16 ` [PATCH v2 2/2] arm/trusted-firmware-a: -Wtautological triggers removed Brett Warren
2020-12-15 14:21 ` Jon Mason [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201215142153.GC20024@kudzu.us \
--to=jdmason@kudzu.us \
--cc=brett.warren@arm.com \
--cc=meta-arm@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.