gummiboot: build without -nostdinc

gnu-efi-libs needs stddef.h now.
It should be ok to be included, even if in -ffreestanding,
systemd-boot also dropped -nostdinc.

Close: #49859
This commit is contained in:
Đoàn Trần Công Danh 2024-04-17 17:00:08 +07:00
parent 147d5341db
commit 1df68ce9e7
2 changed files with 18 additions and 5 deletions

View File

@ -0,0 +1,14 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,11 +86,9 @@ efi_cflags = \
-Wall \
-Wextra \
-std=gnu90 \
- -nostdinc \
-ggdb -O0 \
-fpic \
-fshort-wchar \
- -nostdinc \
-ffreestanding \
-fno-strict-aliasing \
-fno-stack-protector \

View File

@ -1,12 +1,11 @@
--- a/src/efi/stub.c 2015-03-12 00:50:35.000000000 +0100
+++ b/src/efi/stub.c 2020-07-06 12:32:55.985327487 +0200
@@ -83,7 +83,7 @@
--- a/src/efi/stub.c
+++ b/src/efi/stub.c
@@ -83,7 +83,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EF
cmdline_len = szs[0];
/* if we are not in secure boot mode, accept a custom command line and replace the built-in one */
- if (!secure && loaded_image->LoadOptionsSize > 0) {
+ if ((!secure || cmdline_len == 0) && loaded_image->LoadOptionsSize > 0 && *(CHAR16 *)loaded_image->LoadOptions > 0x1F) {
CHAR16 *options;
CHAR8 *line;
UINTN i;