diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-06-15 10:12:17 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-17 00:07:05 +0100 |
commit | f9cbd62bf34658312a20132e8f081068ecb6d836 (patch) | |
tree | dff399995ec7976f4b4782b2713d2964bbbfbe02 /meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch | |
parent | b324d19336ad65b4a34da869c05dcb5711f1edc9 (diff) | |
download | poky-f9cbd62bf34658312a20132e8f081068ecb6d836.tar.gz |
ovmf: update 2021.02 -> 2021.05
Reformat patches using git, so that rebasing them to newer versions is easier.
(From OE-Core rev: 796f5a422a1bb9059ca8045b5aa199aa02b0e46a)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch')
-rw-r--r-- | meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch b/meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch deleted file mode 100644 index 128438b201..0000000000 --- a/meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From ad06fcf1e08736e79221cd6863ff2e3c9254f261 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 4/4] 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 | --- | ||
14 | BaseTools/Conf/tools_def.template | 8 ++++---- | ||
15 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template | ||
18 | index 933b3160fd..c2fbbf0c38 100755 | ||
19 | --- a/BaseTools/Conf/tools_def.template | ||
20 | +++ b/BaseTools/Conf/tools_def.template | ||
21 | @@ -1952,10 +1952,10 @@ DEFINE GCC_RISCV64_RC_FLAGS = -I binary -O elf64-littleriscv -B riscv | ||
22 | # GCC Build Flag for included header file list generation | ||
23 | DEFINE GCC_DEPS_FLAGS = -MMD -MF $@.deps | ||
24 | |||
25 | -DEFINE GCC48_ALL_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -ffunction-sections -fdata-sections -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings | ||
26 | +DEFINE GCC48_ALL_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -ffunction-sections -fdata-sections -fno-stack-protector -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings | ||
27 | DEFINE GCC48_IA32_X64_DLINK_COMMON = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x20 | ||
28 | -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 | ||
29 | -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 | ||
30 | +DEFINE GCC48_IA32_CC_FLAGS = DEF(GCC48_ALL_CC_FLAGS) -m32 -march=i586 -malign-double -D EFI32 -fno-asynchronous-unwind-tables -Wno-address | ||
31 | +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 | ||
32 | DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable | ||
33 | 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 | ||
34 | DEFINE GCC48_IA32_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 DEF(GCC_DLINK2_FLAGS_COMMON) | ||
35 | @@ -1964,7 +1964,7 @@ DEFINE GCC48_X64_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF | ||
36 | DEFINE GCC48_ASM_FLAGS = DEF(GCC_ASM_FLAGS) | ||
37 | DEFINE GCC48_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian | ||
38 | DEFINE GCC48_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian | ||
39 | -DEFINE GCC48_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -fstack-protector -mword-relocations | ||
40 | +DEFINE GCC48_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -mword-relocations | ||
41 | DEFINE GCC48_ARM_CC_XIPFLAGS = DEF(GCC_ARM_CC_XIPFLAGS) | ||
42 | DEFINE GCC48_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mcmodel=large DEF(GCC_AARCH64_CC_FLAGS) | ||
43 | DEFINE GCC48_AARCH64_CC_XIPFLAGS = DEF(GCC_AARCH64_CC_XIPFLAGS) | ||
44 | -- | ||
45 | 2.28.0 | ||
46 | |||