+++ /dev/null
-From 3597306191297b504683b83fe7750e49c6a2e836 Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Thu, 29 Jan 2026 09:23:32 +0100
-Subject: [PATCH 1/2] BaseTools/StringFuncs: fix gcc 16 warning
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-StringFuncs.c: In function ‘SplitStringByWhitespace’:
-StringFuncs.c:113:15: error: variable ‘Item’ set but not used [-Werror=unused-but-set-variable=]
- 113 | UINTN Item;
- | ^~~~
-
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-Upstream-Status: Backport
----
- BaseTools/Source/C/Common/StringFuncs.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/BaseTools/Source/C/Common/StringFuncs.c b/BaseTools/Source/C/Common/StringFuncs.c
-index 53e44365e9..df02d9c808 100644
---- a/BaseTools/Source/C/Common/StringFuncs.c
-+++ b/BaseTools/Source/C/Common/StringFuncs.c
-@@ -110,7 +110,6 @@ SplitStringByWhitespace (
- CHAR8 *EndOfSubString;\r
- CHAR8 *EndOfString;\r
- STRING_LIST *Output;\r
-- UINTN Item;\r
- \r
- String = CloneString (String);\r
- if (String == NULL) {\r
-@@ -120,7 +119,7 @@ SplitStringByWhitespace (
- \r
- Output = NewStringList ();\r
- \r
-- for (Pos = String, Item = 0; Pos < EndOfString; Item++) {\r
-+ for (Pos = String; Pos < EndOfString;) {\r
- while (isspace ((int)*Pos)) {\r
- Pos++;\r
- }\r
---
-2.53.0
-
-From 89a7bfe82c9dea89fa7d859eb392aa414a365578 Mon Sep 17 00:00:00 2001
+From 7a517d144ead6a50baab6eaf7d6d763620243440 Mon Sep 17 00:00:00 2001
From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Date: Thu, 9 Jun 2016 02:23:01 -0700
-Subject: [PATCH 1/5] ovmf: update path to native BaseTools
+Subject: [PATCH] ovmf: update path to native BaseTools
BaseTools is a set of utilities to build EDK-based firmware. These utilities
are used during the build process. Thus, they need to be built natively.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
-index 30f4830173..ce4ffb20ab 100755
+index ed3ed001b4..15f13424e5 100755
--- a/OvmfPkg/build.sh
+++ b/OvmfPkg/build.sh
@@ -24,7 +24,7 @@ then
echo $EDK_TOOLS_PATH
source edksetup.sh BaseTools
else
---
-2.47.3
-
+++ /dev/null
-From 9af06ef3cbb052b142f9660c2c01e7aeb401300c Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Mon, 8 Dec 2025 10:28:50 +0100
-Subject: [PATCH 2/2] BaseTools/EfiRom: fix compiler warning
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-New warning after updating gcc:
-
-EfiRom.c: In function ‘main’:
-EfiRom.c:78:17: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
-
-The assigned value is not used, so fix the warning by just removing it.
-
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-Upstream-Status: Backport
----
- BaseTools/Source/C/EfiRom/EfiRom.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/BaseTools/Source/C/EfiRom/EfiRom.c b/BaseTools/Source/C/EfiRom/EfiRom.c
-index fa7bf0e62e..6e903b3504 100644
---- a/BaseTools/Source/C/EfiRom/EfiRom.c
-+++ b/BaseTools/Source/C/EfiRom/EfiRom.c
-@@ -44,7 +44,6 @@ Returns:
- FILE_LIST *FList;\r
- UINT32 TotalSize;\r
- UINT32 Size;\r
-- CHAR8 *Ptr0;\r
- \r
- SetUtilityName(UTILITY_NAME);\r
- \r
-@@ -75,7 +74,7 @@ Returns:
- //\r
- if (mOptions.DumpOption == 1) {\r
- if (mOptions.FileList != NULL) {\r
-- if ((Ptr0 = strstr ((CONST CHAR8 *) mOptions.FileList->FileName, DEFAULT_OUTPUT_EXTENSION)) != NULL) {\r
-+ if (strstr ((CONST CHAR8 *) mOptions.FileList->FileName, DEFAULT_OUTPUT_EXTENSION) != NULL) {\r
- DumpImage (mOptions.FileList);\r
- goto BailOut;\r
- } else {\r
---
-2.53.0
-
-From 8b4941871ccc88ed8b31eb7ffc097e1fe39fe57d Mon Sep 17 00:00:00 2001
+From 5f9cc244e566bd28a2a9c46454d206d795a02847 Mon Sep 17 00:00:00 2001
From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Date: Fri, 26 Jul 2019 17:34:26 -0400
-Subject: [PATCH 2/5] BaseTools: makefile: adjust to build in under bitbake
+Subject: [PATCH] BaseTools: makefile: adjust to build in under bitbake
Prepend the build flags with those of bitbake. This is to build
using the bitbake native sysroot include and library directories.
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
-index 53e73abe53..0b3f9bbb2a 100644
+index d63f487724..0403f83f77 100644
--- a/BaseTools/Source/C/Makefiles/header.makefile
+++ b/BaseTools/Source/C/Makefiles/header.makefile
@@ -151,35 +151,34 @@ endif
ifeq ($(HOST_ARCH), IA32)\r
#\r
# Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults\r
---
-2.47.3
-
-From 640b1e443a1b400d32d9af0c478abbbaebd491f1 Mon Sep 17 00:00:00 2001
+From ce5cd61548663f85845b8c645f21185fc7419b1b Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 14 Jun 2021 19:56:28 +0200
-Subject: [PATCH 3/5] debug prefix map
+Subject: [PATCH] debug prefix map
We want to pass ${DEBUG_PREFIX_MAP} to gcc commands and also pass in
--debug-prefix-map to nasm (we carry a patch to nasm for this). The
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- BaseTools/Conf/tools_def.template | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
+ BaseTools/Conf/tools_def.template | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-index 90a389bdff..1e134b299a 100755
+index eca4cb82d0..7ccbb9c763 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
-@@ -833,7 +833,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink="$(DEBUG_DIR)/$(MODULE_
+@@ -925,7 +925,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink="$(DEBUG_DIR)/$(MODULE_
*_*_*_DTC_PATH = DEF(DTC_BIN)\r
\r
# All supported GCC archs except LOONGARCH64 support -mstack-protector-guard=global, so set that on everything except LOONGARCH64\r
--DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common -fstack-protector\r
-+DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common -fstack-protector ENV(GCC_PREFIX_MAP)\r
- DEFINE GCC_IA32_X64_CC_FLAGS = -mstack-protector-guard=global\r
- DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d -fno-asynchronous-unwind-tables -Wno-address -fno-short-enums -fsigned-char -ffunction-sections -fdata-sections\r
- DEFINE GCC_AARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno-short-enums -fverbose-asm -funsigned-char -ffunction-sections -fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-pic -fno-pie -ffixed-x18 -mstack-protector-guard=global\r
-@@ -845,8 +845,8 @@ DEFINE GCC_AARCH64_DLINK_FLAGS = -Wl,--emit-relocs -nostdlib -Wl,--gc-sectio
- DEFINE GCC_LOONGARCH64_DLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_COMMON) -z common-page-size=0x20\r
- DEFINE GCC_AARCH64_ASLDLINK_FLAGS = DEF(GCC_AARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) -Wl,--defsym=PECOFF_HEADER_SIZE=0 DEF(GCC_DLINK2_FLAGS_COMMON) -z common-page-size=0x20\r
- DEFINE GCC_LOONGARCH64_ASLDLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)\r
--DEFINE GCC_ASM_FLAGS = -c -x assembler\r
--DEFINE GCC_PP_FLAGS = -E -x assembler-with-cpp -include AutoGen.h\r
-+DEFINE GCC_ASM_FLAGS = -c -x assembler ENV(GCC_PREFIX_MAP)\r
-+DEFINE GCC_PP_FLAGS = -E -x assembler-with-cpp -include AutoGen.h ENV(GCC_PREFIX_MAP)\r
- DEFINE GCC_VFRPP_FLAGS = -x c -E -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h\r
- DEFINE GCC_ASLPP_FLAGS = -x c -E -include AutoGen.h\r
- DEFINE GCC_ASLCC_FLAGS = -x c -include AutoGen.h -fshort-wchar\r
-@@ -980,7 +980,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d -march=loongarch64 DEF(
- *_GCC48_IA32_DLINK2_FLAGS = DEF(GCC48_IA32_DLINK2_FLAGS)\r
- *_GCC48_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)\r
- *_GCC48_IA32_OBJCOPY_FLAGS =\r
--*_GCC48_IA32_NASM_FLAGS = -f elf32\r
-+*_GCC48_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP)\r
- \r
- DEBUG_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS)\r
- RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set-variable\r
-@@ -1008,7 +1008,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set
- *_GCC48_X64_DLINK2_FLAGS = DEF(GCC48_X64_DLINK2_FLAGS)\r
- *_GCC48_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)\r
- *_GCC48_X64_OBJCOPY_FLAGS =\r
--*_GCC48_X64_NASM_FLAGS = -f elf64\r
-+*_GCC48_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP)\r
- \r
- DEBUG_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS)\r
- RELEASE_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) -Wno-unused-but-set-variable\r
-@@ -1087,7 +1087,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
- *_GCC49_IA32_DLINK2_FLAGS = DEF(GCC49_IA32_DLINK2_FLAGS)\r
- *_GCC49_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)\r
- *_GCC49_IA32_OBJCOPY_FLAGS =\r
--*_GCC49_IA32_NASM_FLAGS = -f elf32\r
-+*_GCC49_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP)\r
- \r
- DEBUG_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS)\r
- RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable\r
-@@ -1115,7 +1115,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set
- *_GCC49_X64_DLINK2_FLAGS = DEF(GCC49_X64_DLINK2_FLAGS)\r
- *_GCC49_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)\r
- *_GCC49_X64_OBJCOPY_FLAGS =\r
--*_GCC49_X64_NASM_FLAGS = -f elf64\r
-+*_GCC49_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP)\r
- \r
- DEBUG_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS)\r
- RELEASE_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable\r
-@@ -1314,7 +1314,7 @@ RELEASE_GCCNOLTO_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20
- *_GCC5_IA32_DLINK2_FLAGS = DEF(GCC5_IA32_DLINK2_FLAGS) -no-pie\r
- *_GCC5_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)\r
- *_GCC5_IA32_OBJCOPY_FLAGS =\r
--*_GCC5_IA32_NASM_FLAGS = -f elf32\r
-+*_GCC5_IA32_NASM_FLAGS = -f elf32 ENV(NASM_PREFIX_MAP)\r
- \r
- DEBUG_GCC5_IA32_CC_FLAGS = DEF(GCC5_IA32_CC_FLAGS) -flto\r
- DEBUG_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,-m,elf_i386,--oformat=elf32-i386\r
-@@ -1346,7 +1346,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
- *_GCC5_X64_DLINK2_FLAGS = DEF(GCC5_X64_DLINK2_FLAGS)\r
- *_GCC5_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)\r
- *_GCC5_X64_OBJCOPY_FLAGS =\r
--*_GCC5_X64_NASM_FLAGS = -f elf64\r
-+*_GCC5_X64_NASM_FLAGS = -f elf64 ENV(NASM_PREFIX_MAP)\r
- \r
- DEBUG_GCC5_X64_CC_FLAGS = DEF(GCC5_X64_CC_FLAGS) -flto -DUSING_LTO\r
- DEBUG_GCC5_X64_DLINK_FLAGS = DEF(GCC5_X64_DLINK_FLAGS) -flto -Os\r
---
-2.47.3
-
+-DEFINE GCC_ALL_CC_COMMON = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common -fstack-protector\r
++DEFINE GCC_ALL_CC_COMMON = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common -fstack-protector ENV(GCC_PREFIX_MAP)\r
+ DEFINE GCC_IA32_X64_CC_FLAGS = -mstack-protector-guard=global\r
+ DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_COMMON) -mabi=lp64d -fno-asynchronous-unwind-tables -Wno-address -fno-short-enums -fsigned-char -ffunction-sections -fdata-sections -march=loongarch64 -mno-memcpy -Werror -Wno-maybe-uninitialized -Wno-stringop-overflow -Wno-pointer-to-int-cast -no-pie -fno-stack-protector -mno-explicit-relocs -mno-relax\r
+ DEFINE GCC_AARCH64_CC_COMMON = DEF(GCC_ALL_CC_COMMON) -mlittle-endian -fno-short-enums -fverbose-asm -funsigned-char -ffunction-sections -fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-pic -fno-pie -ffixed-x18 -mstack-protector-guard=global\r
+@@ -936,8 +936,8 @@ DEFINE GCC_AARCH64_DLINK_COMMON = -Wl,--emit-relocs -nostdlib -Wl,--gc-se
+ DEFINE GCC_LOONGARCH64_DLINK_COMMON = -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map -z common-page-size=0x20\r
+ DEFINE GCC_AARCH64_ASLDLINK_COMMON = DEF(GCC_AARCH64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) -Wl,--defsym=PECOFF_HEADER_SIZE=0 DEF(GCC_DLINK2_FLAGS_COMMON) -z common-page-size=0x20\r
+ DEFINE GCC_LOONGARCH64_ASLDLINK_COMMON = DEF(GCC_LOONGARCH64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)\r
+-DEFINE GCC_ASM_COMMON = -c -x assembler\r
+-DEFINE GCC_PP_FLAGS = -E -x assembler-with-cpp -include AutoGen.h\r
++DEFINE GCC_ASM_COMMON = -c -x assembler ENV(GCC_PREFIX_MAP)\r
++DEFINE GCC_PP_FLAGS = -E -x assembler-with-cpp -include AutoGen.h ENV(GCC_PREFIX_MAP)\r
+ DEFINE GCC_VFRPP_FLAGS = -x c -E -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h\r
+ DEFINE GCC_ASLPP_FLAGS = -x c -E -include AutoGen.h\r
+ DEFINE GCC_ASLCC_COMMON = -x c -include AutoGen.h -fshort-wchar\r
-From 8b218dffa0368fbc2bfb5d8051b358476266fcb4 Mon Sep 17 00:00:00 2001
+From 8ae6441f19c71347acab1e789517035ee458449e Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 14 Jun 2021 19:57:30 +0200
-Subject: [PATCH 4/5] reproducible
+Subject: [PATCH] reproducible
This patch fixes various things which make the build more reproducible. Some changes
here only change intermediate artefacts but that means when you have two build trees
4 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c
-index 83f1b285c2..e2f582f8fb 100644
+index bf4baf05d7..295f3f6efb 100644
--- a/BaseTools/Source/C/GenFw/Elf64Convert.c
+++ b/BaseTools/Source/C/GenFw/Elf64Convert.c
@@ -15,6 +15,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#endif\r
#include <assert.h>\r
#include <stdio.h>\r
-@@ -995,7 +997,7 @@ ScanSections64 (
+@@ -996,7 +998,7 @@ ScanSections64 (
}\r
mCoffOffset = mDebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY) +\r
sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) +\r
\r
//\r
// Add more space in the .debug data region for the DllCharacteristicsEx\r
-@@ -2329,7 +2331,7 @@ WriteDebug64 (
+@@ -2330,7 +2332,7 @@ WriteDebug64 (
EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10;\r
EFI_IMAGE_DEBUG_EX_DLLCHARACTERISTICS_ENTRY *DllEntry;\r
\r
\r
NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset);\r
DataDir = &NtHdr->Pe32Plus.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG];\r
-@@ -2362,7 +2364,7 @@ WriteDebug64 (
+@@ -2363,7 +2365,7 @@ WriteDebug64 (
\r
Nb10 = (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY*)(Dir + 1);\r
Nb10->Signature = CODEVIEW_SIGNATURE_NB10;\r
if Input not in self.Inputs:\r
self.Inputs.append(Input)\r
diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
-index e5f282c4ac..27a34ef7c6 100755
+index b729103efd..afc5b14a8a 100755
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
-@@ -571,7 +571,7 @@ cleanlib:
+@@ -579,7 +579,7 @@ cleanlib:
os.remove(RespFileList)\r
\r
# convert source files and binary files to build targets\r
if len(self.ResultFileList) == 0 and len(MyAgo.SourceFileList) != 0:\r
EdkLogger.error("build", AUTOGEN_ERROR, "Nothing to build",\r
ExtraData="[%s]" % str(MyAgo))\r
-@@ -722,7 +722,7 @@ cleanlib:
+@@ -730,7 +730,7 @@ cleanlib:
OutputFile = ''\r
DepsFileList = []\r
\r
if Cmd[2]:\r
for CopyCmd in Cmd[2]:\r
Src, Dst = CopyCmd\r
-@@ -755,7 +755,7 @@ cleanlib:
+@@ -763,7 +763,7 @@ cleanlib:
self.BuildTargetList.append('\t%s' % CmdString)\r
\r
self.ParseSecCmd(DepsFileList, Cmd[1])\r
self.BuildTargetList.append('%s : %s' % (self.ReplaceMacro(SecOutputFile), self.ReplaceMacro(SecDepsFile)))\r
self.BuildTargetList.append('\t%s' % self.ReplaceMacro(SecCmd))\r
self.FfsOutputFileList = []\r
-@@ -794,13 +794,13 @@ cleanlib:
+@@ -802,13 +802,13 @@ cleanlib:
\r
def CommandExceedLimit(self):\r
FlagDict = {\r
}\r
\r
RespDict = {}\r
-@@ -1014,9 +1014,9 @@ cleanlib:
+@@ -1022,9 +1022,9 @@ cleanlib:
if not self.ObjTargetDict.get(T.Target.SubDir):\r
self.ObjTargetDict[T.Target.SubDir] = set()\r
self.ObjTargetDict[T.Target.SubDir].add(NewFile)\r
if T.GenFileListMacro and T.FileListMacro not in self.FileListMacros:\r
self.FileListMacros[T.FileListMacro] = []\r
diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
-index 764c51789b..40aadbcfbc 100755
+index c358d7f0e3..6ed48091fa 100755
--- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
@@ -1429,6 +1429,9 @@ class ModuleAutoGen(AutoGen):
\r
# Ignore generating makefile when it is a binary module\r
if self.IsBinaryModule:\r
---
-2.47.3
-
+++ /dev/null
-From 7e6be0f4068a2158af3c97e873edb33fa4d5c6b8 Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Mon, 3 Nov 2025 09:56:52 +0100
-Subject: [PATCH 5/5] UefiCpuPkg/CpuExceptionHandlerLib: fix push instructions
-
-Nasm 3.0 complains about 'dword' being invalid. The comment talks about
-a '8-byte value' so 'qword' should be correct here.
-
-With this change the extra comment explaining that the instruction
-actually pushes an 8-byte value despite the 'dword' keyword is not
-needed any more. Drop it.
-
-Fixes: https://github.com/tianocore/edk2/issues/11635
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-Upstream-Status: Backport [https://github.com/tianocore/edk2/commit/9ccf8751a74f26142e584c7b7c7572a182b67997]
-(cherry picked from commit 9ccf8751a74f26142e584c7b7c7572a182b67997)
-Signed-off-by: Ankur Tyagi <ankur.tyagi@navicogroup.com>
----
- .../CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm
-index 3d64ac9080..671ed98f85 100644
---- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm
-+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm
-@@ -57,7 +57,7 @@ ALIGN 8
- AsmIdtVectorBegin:\r
- %assign Vector 0\r
- %rep 256\r
-- push strict dword %[Vector] ; This instruction pushes sign-extended 8-byte value on stack\r
-+ push strict qword %[Vector]\r
- push rax\r
- %ifdef NO_ABSOLUTE_RELOCS_IN_TEXT\r
- mov rax, strict qword 0 ; mov rax, ASM_PFX(CommonInterruptEntry)\r
-@@ -70,7 +70,7 @@ AsmIdtVectorBegin:
- AsmIdtVectorEnd:\r
- \r
- HookAfterStubHeaderBegin:\r
-- push strict dword 0 ; 0 will be fixed\r
-+ push strict qword 0 ; 0 will be fixed\r
- VectorNum:\r
- push rax\r
- %ifdef NO_ABSOLUTE_RELOCS_IN_TEXT\r
---
-2.47.3
-
file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \
file://0003-debug-prefix-map.patch \
file://0004-reproducible.patch \
- file://0005-UefiCpuPkg-CpuExceptionHandlerLib-fix-push-instructi.patch \
- file://0001-BaseTools-StringFuncs-fix-gcc-16-warning.patch \
- file://0002-BaseTools-EfiRom-fix-compiler-warning.patch \
"
-PV = "edk2-stable202511"
-SRCREV = "46548b1adac82211d8d11da12dd914f41e7aa775"
+PV = "edk2-stable202605"
+SRCREV = "b03a21a63e3bd001f52c527e5a57feddb53a690b"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)"
CVE_PRODUCT = "edk2"
projects / thirdparty / openembedded / openembedded-core.git / commitdiff
