tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-24 22:50:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Zealbooter build system from Limine template

Browse source
This commit is contained in:
mintsuki 2024-09-30 20:07:33 +02:00
parent b7d5f81b35
commit 5bd76304ec
2 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
zealbooter/GNUmakefile
View file

@ -1,43 +1,40 @@
# Nuke built-in rules and variables. # Nuke built-in rules and variables.
override MAKEFLAGS += -rR MAKEFLAGS += -rR
.SUFFIXES:
# This is the name that our final executable will have. # This is the name that our final executable will have.
# Change as needed. # Change as needed.
override OUTPUT := kernel override OUTPUT := kernel
# Convenience macro to reliably declare user overridable variables. # Convenience macro to reliably declare user overridable variables.
define DEFAULT_VAR = override USER_VARIABLE = $(if $(filter $(origin $(1)),default undefined),$(eval override $(1) := $(2)))
ifeq ($(origin $1),default)
override $(1) := $(2)
endif
ifeq ($(origin $1),undefined)
override $(1) := $(2)
endif
endef
# User controllable C compiler command. # User controllable C compiler command.
override DEFAULT_KCC := cc $(call USER_VARIABLE,KCC,cc)
$(eval $(call DEFAULT_VAR,KCC,$(DEFAULT_KCC)))
# User controllable linker command. # User controllable linker command.
override DEFAULT_KLD := ld $(call USER_VARIABLE,KLD,ld)
$(eval $(call DEFAULT_VAR,KLD,$(DEFAULT_KLD)))
# User controllable C flags. # User controllable C flags.
override DEFAULT_KCFLAGS := -g -O2 -pipe $(call USER_VARIABLE,KCFLAGS,-g -O2 -pipe)
$(eval $(call DEFAULT_VAR,KCFLAGS,$(DEFAULT_KCFLAGS)))
# User controllable C preprocessor flags. We set none by default. # User controllable C preprocessor flags. We set none by default.
override DEFAULT_KCPPFLAGS := $(call USER_VARIABLE,KCPPFLAGS,)
$(eval $(call DEFAULT_VAR,KCPPFLAGS,$(DEFAULT_KCPPFLAGS)))
# User controllable nasm flags. # User controllable nasm flags.
override DEFAULT_KNASMFLAGS := -F dwarf -g $(call USER_VARIABLE,KNASMFLAGS,-F dwarf -g)
$(eval $(call DEFAULT_VAR,KNASMFLAGS,$(DEFAULT_KNASMFLAGS)))
# User controllable linker flags. We set none by default. # User controllable linker flags. We set none by default.
override DEFAULT_KLDFLAGS := $(call USER_VARIABLE,KLDFLAGS,)
$(eval $(call DEFAULT_VAR,KLDFLAGS,$(DEFAULT_KLDFLAGS)))
# Check if KCC is Clang.
override KCC_IS_CLANG := $(shell ! $(KCC) --version 2>/dev/null | grep 'clang' >/dev/null 2>&1; echo $$?)
# If the C compiler is Clang, set the target as needed.
ifeq ($(KCC_IS_CLANG),1)
override KCC += \
-target x86_64-unknown-none
endif
# Internal C flags that should not be changed by the user. # Internal C flags that should not be changed by the user.
override KCFLAGS += \ override KCFLAGS += \

23
zealbooter/linker.ld
View file

@ -9,9 +9,10 @@ ENTRY(kmain)
/* process. */ /* process. */
PHDRS PHDRS
{ {
text PT_LOAD; requests PT_LOAD;
rodata PT_LOAD; text PT_LOAD;
data PT_LOAD; rodata PT_LOAD;
data PT_LOAD;
} }
SECTIONS SECTIONS
@ -22,6 +23,16 @@ SECTIONS
/* that is the beginning of the region. */ /* that is the beginning of the region. */
. = 0xffffffff80000000; . = 0xffffffff80000000;
/* Define a section to contain the Limine requests and assign it to its own PHDR */
.requests : {
KEEP(*(.requests_start_marker))
KEEP(*(.requests))
KEEP(*(.requests_end_marker))
} :requests
/* Move to the next memory page for .text */
. = ALIGN(CONSTANT(MAXPAGESIZE));
.text : { .text : {
*(.text .text.*) *(.text .text.*)
} :text } :text
@ -38,12 +49,6 @@ SECTIONS
.data : { .data : {
*(.data .data.*) *(.data .data.*)
/* Place the sections that contain the Limine requests as part of the .data */
/* output section. */
KEEP(*(.requests_start_marker))
KEEP(*(.requests))
KEEP(*(.requests_end_marker))
} :data } :data
/* NOTE: .bss needs to be the last thing mapped to :data, otherwise lots of */ /* NOTE: .bss needs to be the last thing mapped to :data, otherwise lots of */