From b185cceaffd8bc536b9621476636faf8a747584a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Tue, 24 Mar 2026 16:02:39 +0100 Subject: [PATCH] boot/edk2: fix build with host gcc >= 15, glibc >= 2.43 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The edk2 package fails to build with gcc 15, with the following error: EfiRom.c:78:17: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] Cherry-pick one patch from edk2-stable202602 to fix this. This can be verified with the tests.boot.test_edk2 python tests. Signed-off-by: Vincent Stehlé Cc: Dick Olsson [Julien: add "host" gcc 15 and glibc 2.43 in commit title] Signed-off-by: Julien Olivain (cherry picked from commit d18f7e09162ac3dbe4538fd0e2a3e5ec192e88a4) Signed-off-by: Thomas Perale --- ...aseTools-EfiRom-fix-compiler-warning.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 boot/edk2/0001-BaseTools-EfiRom-fix-compiler-warning.patch diff --git a/boot/edk2/0001-BaseTools-EfiRom-fix-compiler-warning.patch b/boot/edk2/0001-BaseTools-EfiRom-fix-compiler-warning.patch new file mode 100644 index 0000000000..c1e688cfe0 --- /dev/null +++ b/boot/edk2/0001-BaseTools-EfiRom-fix-compiler-warning.patch @@ -0,0 +1,46 @@ +From 9af06ef3cbb052b142f9660c2c01e7aeb401300c Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Mon, 8 Dec 2025 10:28:50 +0100 +Subject: [PATCH] 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 +Upstream: https://github.com/tianocore/edk2/commit/9af06ef3cbb052b142f9660c2c01e7aeb401300c +Signed-off-by: Vincent Stehlé +--- + 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; + UINT32 TotalSize; + UINT32 Size; +- CHAR8 *Ptr0; + + SetUtilityName(UTILITY_NAME); + +@@ -75,7 +74,7 @@ Returns: + // + if (mOptions.DumpOption == 1) { + if (mOptions.FileList != NULL) { +- if ((Ptr0 = strstr ((CONST CHAR8 *) mOptions.FileList->FileName, DEFAULT_OUTPUT_EXTENSION)) != NULL) { ++ if (strstr ((CONST CHAR8 *) mOptions.FileList->FileName, DEFAULT_OUTPUT_EXTENSION) != NULL) { + DumpImage (mOptions.FileList); + goto BailOut; + } else { +-- +2.53.0 +