diff options
Diffstat (limited to 'recipes-security/optee/optee-os-qoriq')
2 files changed, 0 insertions, 54 deletions
diff --git a/recipes-security/optee/optee-os-qoriq/0001-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee/optee-os-qoriq/0001-allow-setting-sysroot-for-libgcc-lookup.patch deleted file mode 100644 index 17127d0b..00000000 --- a/recipes-security/optee/optee-os-qoriq/0001-allow-setting-sysroot-for-libgcc-lookup.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | diff --git a/mk/gcc.mk b/mk/gcc.mk | ||
2 | index fc38c4d..77b8d74 100644 | ||
3 | --- a/mk/gcc.mk | ||
4 | +++ b/mk/gcc.mk | ||
5 | @@ -12,7 +12,7 @@ nostdinc$(sm) := -nostdinc -isystem $(shell $(CC$(sm)) \ | ||
6 | -print-file-name=include 2> /dev/null) | ||
7 | |||
8 | # Get location of libgcc from gcc | ||
9 | -libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) $(comp-cflags$(sm)) \ | ||
10 | +libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) $(comp-cflags$(sm)) \ | ||
11 | -print-libgcc-file-name 2> /dev/null) | ||
12 | |||
13 | # Define these to something to discover accidental use | ||
diff --git a/recipes-security/optee/optee-os-qoriq/0001-arm64-Disable-outline-atomics-when-compiling.patch b/recipes-security/optee/optee-os-qoriq/0001-arm64-Disable-outline-atomics-when-compiling.patch deleted file mode 100644 index 086d4333..00000000 --- a/recipes-security/optee/optee-os-qoriq/0001-arm64-Disable-outline-atomics-when-compiling.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From f94d9558d9eae48e92ce8d651539b6cf69eb4394 Mon Sep 17 00:00:00 2001 | ||
2 | From: Joshua Watt <JPEWhacker@gmail.com> | ||
3 | Date: Mon, 18 May 2020 20:00:00 -0500 | ||
4 | Subject: [PATCH] arm64: Disable outline-atomics when compiling | ||
5 | |||
6 | Disables the automatic detection of LSE (Large System Extension) | ||
7 | instructions when compiling AArch64 code. GCC 10 implements this | ||
8 | detection in libgcc using __getauxval(), which optee doesn't implement. | ||
9 | This requires that the proper -mcpu is passed to GCC so that the code | ||
10 | can be correctly compiled to use either LSE or load-store-exclusive. | ||
11 | |||
12 | Fixes linker errors like the following when compiling with GCC 10: | ||
13 | |||
14 | aarch64-linux-ld.bfd: libgcc.a(lse-init.o): | ||
15 | in function `init_have_lse_atomics': | ||
16 | lse-init.c:44: undefined reference to `__getauxval' | ||
17 | core/arch/arm/kernel/link.mk:38: | ||
18 | recipe for target 'build/core/all_objs.o' failed | ||
19 | |||
20 | Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> | ||
21 | Upstream-Status: Submitted [https://github.com/OP-TEE/optee_os/pull/3874] | ||
22 | --- | ||
23 | core/arch/arm/arm.mk | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/core/arch/arm/arm.mk b/core/arch/arm/arm.mk | ||
27 | index a18eda3b..07069c66 100644 | ||
28 | --- a/core/arch/arm/arm.mk | ||
29 | +++ b/core/arch/arm/arm.mk | ||
30 | @@ -115,7 +115,7 @@ arm32-platform-aflags-no-hard-float ?= | ||
31 | |||
32 | arm64-platform-cflags-no-hard-float ?= -mgeneral-regs-only | ||
33 | arm64-platform-cflags-hard-float ?= | ||
34 | -arm64-platform-cflags-generic ?= -mstrict-align | ||
35 | +arm64-platform-cflags-generic ?= -mstrict-align $(call cc-option,-mno-outline-atomics,) | ||
36 | |||
37 | ifeq ($(DEBUG),1) | ||
38 | # For backwards compatibility | ||
39 | -- | ||
40 | 2.17.1 | ||
41 | |||