From 80f9428337f148e9e791e21191ede0f4b4ea0498 Mon Sep 17 00:00:00 2001 From: Bananymous Date: Fri, 24 Feb 2023 03:19:54 +0200 Subject: [PATCH] Kernel: Fix prefs font for 32 bit --- kernel/Makefile | 2 +- kernel/arch/i386/make.config | 2 ++ kernel/arch/x86_64/make.config | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/Makefile b/kernel/Makefile index 2b581ea2..68261f40 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -96,7 +96,7 @@ $(ARCHDIR)/crtbegin.o $(ARCHDIR)/crtend.o: $(CC) -MD -c $< -o $(BUILDDIR)/$@ $(CFLAGS) .psf.o: - objcopy -O elf64-x86-64 -B i386 -I binary $< $(BUILDDIR)/$@ + objcopy -O $(ELF_FORMAT) -B i386 -I binary $< $(BUILDDIR)/$@ always: mkdir -p $(BUILDDIR)/$(ARCHDIR) diff --git a/kernel/arch/i386/make.config b/kernel/arch/i386/make.config index fa74f25b..f50633b4 100644 --- a/kernel/arch/i386/make.config +++ b/kernel/arch/i386/make.config @@ -3,6 +3,8 @@ KERNEL_ARCH_CPPFLAGS= KERNEL_ARCH_LDFLAGS= KERNEL_ARCH_LIBS= +ELF_FORMAT=elf32-i386 + KERNEL_ARCH_OBJS= \ $(ARCHDIR)/boot.o \ $(ARCHDIR)/IDT.o \ diff --git a/kernel/arch/x86_64/make.config b/kernel/arch/x86_64/make.config index e79262b0..a5d2ceec 100644 --- a/kernel/arch/x86_64/make.config +++ b/kernel/arch/x86_64/make.config @@ -3,6 +3,8 @@ KERNEL_ARCH_CPPFLAGS= KERNEL_ARCH_LDFLAGS=-z max-page-size=4096 KERNEL_ARCH_LIBS= +ELF_FORMAT=elf64-x86-64 + KERNEL_ARCH_OBJS= \ $(ARCHDIR)/boot.o \ $(ARCHDIR)/IDT.o \