:: commit 631b894af789ccb9d2c31d1db664688bce5ad1fd

mintsuki <mintsuki@protonmail.com> — 2021-10-11 19:35

parents: d90cb4a841

build: Pass -mtune=generic

diff --git a/decompressor/Makefile b/decompressor/Makefile
index 07caef48..2ae358a6 100644
--- a/decompressor/Makefile
+++ b/decompressor/Makefile
@@ -26,6 +26,7 @@ CFLAGS ?= -Os -pipe -Wall -Wextra $(WERROR)
 INTERNAL_CFLAGS = \
 	-m32 \
 	-march=i386 \
+	-mtune=generic \
 	-mabi=sysv \
 	-std=gnu11 \
 	-ffreestanding \
diff --git a/stage23/Makefile b/stage23/Makefile
index c145fa55..e2b4fb15 100644
--- a/stage23/Makefile
+++ b/stage23/Makefile
@@ -83,6 +83,7 @@ ifeq ($(TARGET), bios)
 		-Duefi=0 \
 		-m32 \
 		-march=i386 \
+		-mtune=generic \
 		-mabi=sysv \
 		-fno-pic \
 		-fno-pie
@@ -95,6 +96,7 @@ ifeq ($(TARGET), uefi)
 		-Duefi=1 \
 		-m32 \
 		-march=i386 \
+		-mtune=generic \
 		-mabi=sysv \
 		-DGNU_EFI_USE_MS_ABI \
 		-fpie
@@ -104,6 +106,7 @@ ifeq ($(TARGET), uefi)
 		-Duefi=1 \
 		-m64 \
 		-march=x86-64 \
+		-mtune=generic \
 		-mabi=sysv \
 		-DGNU_EFI_USE_MS_ABI \
 		-I../gnu-efi/inc \
@@ -118,6 +121,7 @@ ifeq ($(TARGET), uefi32)
 		-Duefi=1 \
 		-m32 \
 		-march=i386 \
+		-mtune=generic \
 		-mabi=sysv \
 		-DGNU_EFI_USE_MS_ABI \
 		-I../gnu-efi/inc \
@@ -255,7 +259,7 @@ $(BUILDDIR)/BOOTX64.EFI: $(BUILDDIR)/limine_efi.elf
 	$(TOOLCHAIN_OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel -j .rela -j .rel.* -j .rela.* -j .reloc -j .sbat --target efi-app-x86_64 --subsystem=10 $< $@
 
 $(BUILDDIR)/gnu-efi/gnuefi/crt0-efi-x86_64.o $(BUILDDIR)/gnu-efi/gnuefi/libgnuefi.a: $(BUILDDIR)/gnu-efi
-	$(MAKE) -C $(BUILDDIR)/gnu-efi/gnuefi CC="$(TOOLCHAIN_CC) -m64 -march=x86-64" AR="$(TOOLCHAIN_AR)" ARCH=x86_64
+	$(MAKE) -C $(BUILDDIR)/gnu-efi/gnuefi CC="$(TOOLCHAIN_CC) -m64 -march=x86-64 -mtune=generic" AR="$(TOOLCHAIN_AR)" ARCH=x86_64
 
 $(BUILDDIR)/limine_efi_nomap.elf: $(BUILDDIR)/gnu-efi/gnuefi/crt0-efi-x86_64.o $(BUILDDIR)/gnu-efi/gnuefi/libgnuefi.a $(OBJ) $(BUILDDIR)/font.o $(BUILDDIR)/sys/smp_trampoline.o
 	$(TOOLCHAIN_LD) \
@@ -280,7 +284,7 @@ $(BUILDDIR)/BOOTIA32.EFI: $(BUILDDIR)/limine_efi.elf
 	$(TOOLCHAIN_OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel -j .rela -j .rel.* -j .rela.* -j .reloc -j .sbat --target efi-app-ia32 --subsystem=10 $< $@
 
 $(BUILDDIR)/gnu-efi/gnuefi/crt0-efi-ia32.o $(BUILDDIR)/gnu-efi/gnuefi/libgnuefi.a: $(BUILDDIR)/gnu-efi
-	$(MAKE) -C $(BUILDDIR)/gnu-efi/gnuefi CC="$(TOOLCHAIN_CC) -m32 -march=i386" AR="$(TOOLCHAIN_AR)" ARCH=ia32
+	$(MAKE) -C $(BUILDDIR)/gnu-efi/gnuefi CC="$(TOOLCHAIN_CC) -m32 -march=i386 -mtune=generic" AR="$(TOOLCHAIN_AR)" ARCH=ia32
 
 $(BUILDDIR)/limine_efi_nomap.elf: $(BUILDDIR)/gnu-efi/gnuefi/crt0-efi-ia32.o $(BUILDDIR)/gnu-efi/gnuefi/libgnuefi.a $(OBJ) $(BUILDDIR)/font.o $(BUILDDIR)/sys/smp_trampoline.o
 	$(TOOLCHAIN_LD) \
diff --git a/stage23/protos/stivale2.c b/stage23/protos/stivale2.c
index a99f40ea..5254273b 100644
--- a/stage23/protos/stivale2.c
+++ b/stage23/protos/stivale2.c
@@ -403,7 +403,7 @@ failed_to_load_header_section:
     char *textmode_str = config_get_value(config, 0, "TEXTMODE");
     bool textmode = textmode_str != NULL && strcmp(textmode_str, "yes") == 0;
 
-    int preference;
+    int preference = 0;
     if (avtag != NULL) {
         preference = textmode ? 1 : avtag->preference;
     }
tab: 248 wrap: offon