The stack check logs a console message on failure, and the EFI API expects
a NULL terminated UCS-2 string. In order to define a UCS-2 string literal,
kernel.img on amd64 and i386 EFI targets is built with -fshort-wchar.
Also compile kernel.img on other EFI targets with -fshort-wchar.
Fixes: 37ddd94 (kern/efi/init: Log a console error during a stack check
failure)
Signed-off-by: Chris Coulson <chris.coul...@canonical.com>
---
grub-core/Makefile.core.def | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 5212dfab1..98714c68d 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -61,15 +61,19 @@ kernel = {
ia64_efi_ldflags = '-Wl,-r';
ia64_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment -R
.note.gnu.gold-version';
+ arm_efi_cflags = '-fshort-wchar';
arm_efi_ldflags = '-Wl,-r';
arm_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment
-R .note.gnu.gold-version';
+ arm64_efi_cflags = '-fshort-wchar';
arm64_efi_ldflags = '-Wl,-r';
arm64_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment
-R .note.gnu.gold-version -R .eh_frame';
+ riscv32_efi_cflags = '-fshort-wchar';
riscv32_efi_ldflags = '-Wl,-r';
riscv32_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment
-R .note.gnu.gold-version -R .eh_frame';
+ riscv64_efi_cflags = '-fshort-wchar';
riscv64_efi_ldflags = '-Wl,-r';
riscv64_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment
-R .note.gnu.gold-version -R .eh_frame';
--
2.35.1
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
