optee-os: upgrade to upstream 3.12.0
PATCH 1/1 optee-os: upgrade to upstream 3.12.0
From: Praneeth Bajjuri <[email protected]>
Upgrade optee-os to upstream 3.12.0 on dunfell branch.
upstream optee 3.13.0 tag has the following patches. f50962e3 ta_dev_kit.mk: make sure that libutils is linked second time 73196b58 link.mk: implement support for libnames-after-libgcc variable 36e784f6 libutils: provide empty __getauxval() implementation
Hence removing from here.
--- ...ide-empty-__getauxval-implementation.patch | 62 ------------------- ...t-support-for-libnames-after-libgcc-.patch | 55 ---------------- ...ke-sure-that-libutils-is-linked-seco.patch | 44 ------------- recipes-security/optee/optee-os_%.bbappend | 7 +-- 4 files changed, 2 insertions(+), 166 deletions(-) delete mode 100644 recipes-security/optee/optee-os/0001-libutils-provide-empty-__getauxval-implementation.patch delete mode 100644 recipes-security/optee/optee-os/0002-link.mk-implement-support-for-libnames-after-libgcc-.patch delete mode 100644 recipes-security/optee/optee-os/0003-ta_dev_kit.mk-make-sure-that-libutils-is-linked-seco.patch
recipes-security/optee/optee-os/0001-libutils-provide-empty-__getauxval-implementation.patch deleted +0 -62
@@ -1,62 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <[email protected]> - -From 36e784f621bf5d5be9183beba35f39426277c110 Mon Sep 17 00:00:00 2001 -From: Volodymyr Babchuk <[email protected]> -Date: Tue, 13 Oct 2020 22:45:39 +0300 -Subject: [PATCH 1/3] libutils: provide empty __getauxval() implementation - -Never version of libgcc are built with LSE implementation in mind. To -determine if LSE is available on platform it calls __getauxval(), so in -some cases we can get undefined reference to __getauxval() error. - -Prominent case is libgcc_eh.a library, which is used by C++ TAs. Exception -handler depends on atomic operations, so it tries to call -init_have_lse_atomics() first. This function in turn calls __getauxval(), -which causes linking error. - -In the future we can make __getauxval() to return actual platform -capabilities. - -Signed-off-by: Volodymyr Babchuk <[email protected]> -Reviewed-by: Jens Wiklander <[email protected]> -Reviewed-by: Jerome Forissier <[email protected]> ---- - lib/libutils/ext/arch/arm/auxval.c | 12 ++++++++++++ - lib/libutils/ext/arch/arm/sub.mk | 1 + - 2 files changed, 13 insertions(+) - create mode 100644 lib/libutils/ext/arch/arm/auxval.c - -diff --git a/lib/libutils/ext/arch/arm/auxval.c b/lib/libutils/ext/arch/arm/auxval.c -new file mode 100644 -index 00000000..98bca850 ---- /dev/null -+++ b/lib/libutils/ext/arch/arm/auxval.c -@@ -0,0 +1,12 @@ -+// SPDX-License-Identifier: BSD-2-Clause -+/* -+ * Copyright (c) 2020, EPAM Systems -+ */ -+ -+#include <compiler.h> -+ -+unsigned long int __getauxval (unsigned long int type); -+unsigned long int __getauxval (unsigned long int type __unused) -+{ -+ return 0; -+} -diff --git a/lib/libutils/ext/arch/arm/sub.mk b/lib/libutils/ext/arch/arm/sub.mk -index dc5eed67..2e779066 100644 ---- a/lib/libutils/ext/arch/arm/sub.mk -+++ b/lib/libutils/ext/arch/arm/sub.mk -@@ -3,6 +3,7 @@ srcs-$(CFG_ARM32_$(sm)) += aeabi_unwind.c - endif - srcs-$(CFG_ARM32_$(sm)) += atomic_a32.S - srcs-$(CFG_ARM64_$(sm)) += atomic_a64.S -+srcs-y += auxval.c - ifneq ($(sm),ldelf) # TA, core - srcs-$(CFG_ARM32_$(sm)) += mcount_a32.S - srcs-$(CFG_ARM64_$(sm)) += mcount_a64.S --- -2.25.1 -
recipes-security/optee/optee-os/0002-link.mk-implement-support-for-libnames-after-libgcc-.patch deleted +0 -55
55 lines not on this page · raw message
recipes-security/optee/optee-os/0003-ta_dev_kit.mk-make-sure-that-libutils-is-linked-seco.patch deleted +0 -44
44 lines not on this page · raw message
recipes-security/optee/optee-os_%.bbappend +2 -5
@@ -1,16 +1,13 @@ FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" -PV_ti-soc = "3.11.0+git${SRCPV}" +PV_ti-soc = "3.12.0+git${SRCPV}" -SRCREV_ti-soc = "c4def2a8262a03244d9a88461699b9b8e43c6b55" +SRCREV_ti-soc = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d" SRC_URI_ti-soc = " \ git://github.com/OP-TEE/optee_os.git \ file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ file://0007-allow-setting-sysroot-for-clang.patch \ - file://0001-libutils-provide-empty-__getauxval-implementation.patch \ - file://0002-link.mk-implement-support-for-libnames-after-libgcc-.patch \ - file://0003-ta_dev_kit.mk-make-sure-that-libutils-is-linked-seco.patch \ " do_compile_prepend_ti-soc() {
Signature · 1 line
2.17.1
Yogesh Siraswar
AppliedApplied to dunfell
-----Original Message-----
From: Bajjuri, Praneeth
Sent: Friday, June 25, 2021 8:09 PM
To: Bajjuri, Praneeth <[email protected]>; Siraswar, Yogesh <[email protected]>
Cc: Denys Dmytriyenko <[email protected]>; [email protected]
Subject: [dunfell PATCH] optee-os: upgrade to upstream 3.12.0
From: Praneeth Bajjuri <[email protected]>
Upgrade optee-os to upstream 3.12.0 on dunfell branch.
upstream optee 3.13.0 tag has the following patches. f50962e3 ta_dev_kit.mk: make sure that libutils is linked second time 73196b58 link.mk: implement support for libnames-after-libgcc variable 36e784f6 libutils: provide empty __getauxval() implementation
Hence removing from here.
--- ...ide-empty-__getauxval-implementation.patch | 62 ------------------- ...t-support-for-libnames-after-libgcc-.patch | 55 ---------------- ...ke-sure-that-libutils-is-linked-seco.patch | 44 ------------- recipes-security/optee/optee-os_%.bbappend | 7 +-- 4 files changed, 2 insertions(+), 166 deletions(-) delete mode 100644 recipes-security/optee/optee-os/0001-libutils-provide-empty-__getauxval-implementation.patch delete mode 100644 recipes-security/optee/optee-os/0002-link.mk-implement-support-for-libnames-after-libgcc-.patch delete mode 100644 recipes-security/optee/optee-os/0003-ta_dev_kit.mk-make-sure-that-libutils-is-linked-seco.patch
recipes-security/optee/optee-os/0001-libutils-provide-empty-__getauxval-implementation.patch deleted +0 -56
@@ -1,62 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <[email protected]> - -From 36e784f621bf5d5be9183beba35f39426277c110 Mon Sep 17 00:00:00 2001 -From: Volodymyr Babchuk <[email protected]> -Date: Tue, 13 Oct 2020 22:45:39 +0300 -Subject: [PATCH 1/3] libutils: provide empty __getauxval() implementation - -Never version of libgcc are built with LSE implementation in mind. To -determine if LSE is available on platform it calls __getauxval(), so in -some cases we can get undefined reference to __getauxval() error. - -Prominent case is libgcc_eh.a library, which is used by C++ TAs. Exception -handler depends on atomic operations, so it tries to call -init_have_lse_atomics() first. This function in turn calls __getauxval(), -which causes linking error. - -In the future we can make __getauxval() to return actual platform -capabilities. - -Signed-off-by: Volodymyr Babchuk <[email protected]> -Reviewed-by: Jens Wiklander <[email protected]> -Reviewed-by: Jerome Forissier <[email protected]> ---- - lib/libutils/ext/arch/arm/auxval.c | 12 ++++++++++++ - lib/libutils/ext/arch/arm/sub.mk | 1 + - 2 files changed, 13 insertions(+) - create mode 100644 lib/libutils/ext/arch/arm/auxval.c - -diff --git a/lib/libutils/ext/arch/arm/auxval.c b/lib/libutils/ext/arch/arm/auxval.c -new file mode 100644 -index 00000000..98bca850 ---- /dev/null -+++ b/lib/libutils/ext/arch/arm/auxval.c -@@ -0,0 +1,12 @@ -+// SPDX-License-Identifier: BSD-2-Clause -+/* -+ * Copyright (c) 2020, EPAM Systems -+ */ -+ -+#include <compiler.h> -+ -+unsigned long int __getauxval (unsigned long int type); unsigned long -+int __getauxval (unsigned long int type __unused) { -+ return 0; -+} -diff --git a/lib/libutils/ext/arch/arm/sub.mk b/lib/libutils/ext/arch/arm/sub.mk -index dc5eed67..2e779066 100644 ---- a/lib/libutils/ext/arch/arm/sub.mk -+++ b/lib/libutils/ext/arch/arm/sub.mk -@@ -3,6 +3,7 @@ srcs-$(CFG_ARM32_$(sm)) += aeabi_unwind.c - endif - srcs-$(CFG_ARM32_$(sm)) += atomic_a32.S - srcs-$(CFG_ARM64_$(sm)) += atomic_a64.S -+srcs-y += auxval.c - ifneq ($(sm),ldelf) # TA, core - srcs-$(CFG_ARM32_$(sm)) += mcount_a32.S - srcs-$(CFG_ARM64_$(sm)) += mcount_a64.S --- -2.25.1 -
recipes-security/optee/optee-os/0002-link.mk-implement-support-for-libnames-after-libgcc-.patch deleted +0 -48
48 lines not on this page · raw message
recipes-security/optee/optee-os/0003-ta_dev_kit.mk-make-sure-that-libutils-is-linked-seco.patch deleted +0 -41
41 lines not on this page · raw message
recipes-security/optee/optee-os_%.bbappend +2 -5
@@ -1,16 +1,13 @@ FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" -PV_ti-soc = "3.11.0+git${SRCPV}" +PV_ti-soc = "3.12.0+git${SRCPV}" -SRCREV_ti-soc = "c4def2a8262a03244d9a88461699b9b8e43c6b55" +SRCREV_ti-soc = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d" SRC_URI_ti-soc = " \ git://github.com/OP-TEE/optee_os.git \ file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ file://0007-allow-setting-sysroot-for-clang.patch \ - file://0001-libutils-provide-empty-__getauxval-implementation.patch \ - file://0002-link.mk-implement-support-for-libnames-after-libgcc-.patch \ - file://0003-ta_dev_kit.mk-make-sure-that-libutils-is-linked-seco.patch \ " do_compile_prepend_ti-soc() {
--
2.17.1