diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-09-01 09:21:17 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-02 15:58:25 +0100 |
commit | 458a20d94db9381eb31abee9f16a3ccfdcbe645b (patch) | |
tree | daead04a9ed91c64eb0a4db1a7e6b674a5820c53 | |
parent | 8528cae27ae9cf0c1798eab53fb52cd3b903441a (diff) | |
download | poky-458a20d94db9381eb31abee9f16a3ccfdcbe645b.tar.gz |
ovmf: drop the force no-stack-protector patch
This should not be necessary, as ovmf is already marked as
COMPATIBLE_HOST:class-target='(i.86|x86_64).*'
and existing upstream code handles both.
If/when ovmf is used on other targets, the situation can be revisited.
(From OE-Core rev: 4a75ca7c5a1c6330748fd1efa0a23af4acd23099)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/ovmf/ovmf/0003-ovmf-Update-to-latest.patch | 45 | ||||
-rw-r--r-- | meta/recipes-core/ovmf/ovmf_git.bb | 1 |
2 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-core/ovmf/ovmf/0003-ovmf-Update-to-latest.patch b/meta/recipes-core/ovmf/ovmf/0003-ovmf-Update-to-latest.patch deleted file mode 100644 index d710429899..0000000000 --- a/meta/recipes-core/ovmf/ovmf/0003-ovmf-Update-to-latest.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 67267d8cc31df16a3608cad1a17c5f1470ef8bbd Mon Sep 17 00:00:00 2001 | ||
2 | From: Steve Langasek <steve.langasek@ubuntu.com> | ||
3 | Date: Sat, 10 Jun 2017 01:39:36 -0700 | ||
4 | Subject: [PATCH 3/6] ovmf: Update to latest | ||
5 | |||
6 | Description: pass -fno-stack-protector to all GCC toolchains | ||
7 | The upstream build rules inexplicably pass -fno-stack-protector only | ||
8 | when building for i386 and amd64. Add this essential argument to the | ||
9 | generic rules for gcc 4.4 and later. | ||
10 | Last-Updated: 2016-04-12 | ||
11 | Upstream-Status: Pending | ||
12 | --- | ||
13 | BaseTools/Conf/tools_def.template | 8 ++++---- | ||
14 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
15 | |||
16 | diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template | ||
17 | index 498696e583..36241b6ede 100755 | ||
18 | --- a/BaseTools/Conf/tools_def.template | ||
19 | +++ b/BaseTools/Conf/tools_def.template | ||
20 | @@ -1897,10 +1897,10 @@ DEFINE GCC_RISCV64_RC_FLAGS = -I binary -O elf64-littleriscv -B riscv | ||
21 | # GCC Build Flag for included header file list generation | ||
22 | DEFINE GCC_DEPS_FLAGS = -MMD -MF $@.deps | ||
23 | |||
24 | -DEFINE GCC48_ALL_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -ffunction-sections -fdata-sections -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings | ||
25 | +DEFINE GCC48_ALL_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -ffunction-sections -fdata-sections -fno-stack-protector -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings | ||
26 | DEFINE GCC48_IA32_X64_DLINK_COMMON = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x20 | ||
27 | -DEFINE GCC48_IA32_CC_FLAGS = DEF(GCC48_ALL_CC_FLAGS) -m32 -march=i586 -malign-double -fno-stack-protector -D EFI32 -fno-asynchronous-unwind-tables -Wno-address | ||
28 | -DEFINE GCC48_X64_CC_FLAGS = DEF(GCC48_ALL_CC_FLAGS) -m64 -fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" -maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie -fno-asynchronous-unwind-tables -Wno-address | ||
29 | +DEFINE GCC48_IA32_CC_FLAGS = DEF(GCC48_ALL_CC_FLAGS) -m32 -march=i586 -malign-double -D EFI32 -fno-asynchronous-unwind-tables -Wno-address | ||
30 | +DEFINE GCC48_X64_CC_FLAGS = DEF(GCC48_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie -fno-asynchronous-unwind-tables -Wno-address | ||
31 | DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable | ||
32 | DEFINE GCC48_IA32_X64_DLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive | ||
33 | DEFINE GCC48_IA32_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 DEF(GCC_DLINK2_FLAGS_COMMON) | ||
34 | @@ -1909,7 +1909,7 @@ DEFINE GCC48_X64_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF | ||
35 | DEFINE GCC48_ASM_FLAGS = DEF(GCC_ASM_FLAGS) | ||
36 | DEFINE GCC48_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian | ||
37 | DEFINE GCC48_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian | ||
38 | -DEFINE GCC48_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -fstack-protector -mword-relocations | ||
39 | +DEFINE GCC48_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -mword-relocations | ||
40 | DEFINE GCC48_ARM_CC_XIPFLAGS = DEF(GCC_ARM_CC_XIPFLAGS) | ||
41 | DEFINE GCC48_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mcmodel=large DEF(GCC_AARCH64_CC_FLAGS) | ||
42 | DEFINE GCC48_AARCH64_CC_XIPFLAGS = DEF(GCC_AARCH64_CC_XIPFLAGS) | ||
43 | -- | ||
44 | 2.32.0 | ||
45 | |||
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index aac30ead30..40542239e2 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb | |||
@@ -22,7 +22,6 @@ BUILD_CFLAGS += "-Wno-error=stringop-overflow" | |||
22 | SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ | 22 | SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ |
23 | file://0001-ovmf-update-path-to-native-BaseTools.patch \ | 23 | file://0001-ovmf-update-path-to-native-BaseTools.patch \ |
24 | file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ | 24 | file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ |
25 | file://0003-ovmf-Update-to-latest.patch \ | ||
26 | file://0005-debug-prefix-map.patch \ | 25 | file://0005-debug-prefix-map.patch \ |
27 | file://0006-reproducible.patch \ | 26 | file://0006-reproducible.patch \ |
28 | " | 27 | " |