tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-25 23:10:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ZealBooter: Update to Limine 4.x

Browse source
This commit is contained in:
mintsuki 2022-09-05 06:42:29 +02:00
parent 67fda6d081
commit 091f07423a
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/build-iso.sh
View file

@ -79,7 +79,7 @@ echo "Building Distro ISO ..."
qemu-system-x86_64 -machine q35,accel=kvm -drive format=raw,file=$TMPDISK -m 1G -rtc base=localtime -smp 4 -device isa-debug-exit qemu-system-x86_64 -machine q35,accel=kvm -drive format=raw,file=$TMPDISK -m 1G -rtc base=localtime -smp 4 -device isa-debug-exit
if [ ! -d "limine" ]; then if [ ! -d "limine" ]; then
git clone https://github.com/limine-bootloader/limine.git --branch=v3.0-branch-binary --depth=1 git clone https://github.com/limine-bootloader/limine.git --branch=v4.x-branch-binary --depth=1
make -C limine make -C limine
fi fi

14
zealbooter/GNUmakefile
View file

@ -21,7 +21,7 @@ $(eval $(call DEFAULT_VAR,CC,cc))
$(eval $(call DEFAULT_VAR,LD,ld)) $(eval $(call DEFAULT_VAR,LD,ld))
# User controllable CFLAGS. # User controllable CFLAGS.
CFLAGS ?= -O2 -g -Wall -Wextra -pipe CFLAGS ?= -g -O2 -pipe -Wall -Wextra
# User controllable preprocessor flags. We set none by default. # User controllable preprocessor flags. We set none by default.
CPPFLAGS ?= CPPFLAGS ?=
@ -34,14 +34,13 @@ LDFLAGS ?=
# Internal C flags that should not be changed by the user. # Internal C flags that should not be changed by the user.
override CFLAGS += \ override CFLAGS += \
-I. \
-std=gnu11 \ -std=gnu11 \
-ffreestanding \ -ffreestanding \
-fno-stack-protector \ -fno-stack-protector \
-fno-stack-check \ -fno-stack-check \
-fno-lto \
-fno-pie \ -fno-pie \
-fno-pic \ -fno-pic \
-Wno-address-of-packed-member \
-m64 \ -m64 \
-march=x86-64 \ -march=x86-64 \
-mabi=sysv \ -mabi=sysv \
@ -51,15 +50,22 @@ override CFLAGS += \
-mno-sse2 \ -mno-sse2 \
-mno-red-zone \ -mno-red-zone \
-mcmodel=kernel \ -mcmodel=kernel \
-MMD -MMD \
-I.
# Internal linker flags that should not be changed by the user. # Internal linker flags that should not be changed by the user.
override LDFLAGS += \ override LDFLAGS += \
-nostdlib \ -nostdlib \
-static \ -static \
-m elf_x86_64 \
-z max-page-size=0x1000 \ -z max-page-size=0x1000 \
-T linker.ld -T linker.ld
# Check if the linker supports -no-pie and enable it if it does
ifeq ($(shell $(LD) --help 2>&1 | grep 'no-pie' >/dev/null 2>&1; echo $$?),0)
override LDFLAGS += -no-pie
endif
# Internal nasm flags that should not be changed by the user. # Internal nasm flags that should not be changed by the user.
override NASMFLAGS += \ override NASMFLAGS += \
-f elf64 -f elf64