From 8b1ff0ff97db770ccbb1f2623934e6889479598c Mon Sep 17 00:00:00 2001 From: MrMasterKeyboard <73440604+AFellowSpeedrunner@users.noreply.github.com> Date: Fri, 27 Dec 2024 14:09:26 +0000 Subject: [PATCH 1/4] Fix makefile typos in the "GNU Makefiles" page of "Build Process" --- 01_Build_Process/03_Gnu_Makefiles.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/01_Build_Process/03_Gnu_Makefiles.md b/01_Build_Process/03_Gnu_Makefiles.md index 6d4052c..0d4ee91 100644 --- a/01_Build_Process/03_Gnu_Makefiles.md +++ b/01_Build_Process/03_Gnu_Makefiles.md @@ -17,7 +17,7 @@ Below is an example of a basic Makefile. CC = x86_64-elf-gcc CXX = x86_64-elf-g++ AS = x86_64-elf-as -LD = x86_64_elf-ld +LD = x86_64-elf-ld #inputs C_SRCS = kernel_main.c util.c @@ -26,11 +26,11 @@ TARGET = build/kernel.elf #flags CC_FLAGS = -g -ffreestanding -LD_FLAGS = -T linker_script.lds -ffreestanding +LD_FLAGS = -T linker_script.lds -ffreestanding -shared #auto populated variables OBJS = $(patsubst %.c, build/%.c.o, $(C_SRCS)) -OBJS += $(patsubst %.S, build/%.S.o, %(ASM_SRCS)) +OBJS += $(patsubst %.S, build/%.S.o, $(ASM_SRCS)) .PHONY: all clean From 6bc662c26334c9c42baf31f7cd8b6c0f7c3c4d72 Mon Sep 17 00:00:00 2001 From: MrMasterKeyboard <73440604+AFellowSpeedrunner@users.noreply.github.com> Date: Fri, 27 Dec 2024 14:13:22 +0000 Subject: [PATCH 2/4] Fix linker typo in "Linker Scripts" page of "Build Process" --- 01_Build_Process/04_Linker_Scripts.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/01_Build_Process/04_Linker_Scripts.md b/01_Build_Process/04_Linker_Scripts.md index 0314c8d..d5acf6f 100644 --- a/01_Build_Process/04_Linker_Scripts.md +++ b/01_Build_Process/04_Linker_Scripts.md @@ -196,7 +196,7 @@ SECTIONS /* Then we can map those pages appropriately. */ TEXT_BEGIN = .; *(.text*) - TEXT_END = ,; + TEXT_END = .; } :text /* a trick to ensure the section next is on the next physical */ From 2904e166ef905eb2a79cb8ebbca70f0740386614 Mon Sep 17 00:00:00 2001 From: MrMasterKeyboard <73440604+AFellowSpeedrunner@users.noreply.github.com> Date: Fri, 27 Dec 2024 17:02:28 +0000 Subject: [PATCH 3/4] Update I_Acknowledgments.md to include me --- 99_Appendices/I_Acknowledgments.md | 1 + 1 file changed, 1 insertion(+) diff --git a/99_Appendices/I_Acknowledgments.md b/99_Appendices/I_Acknowledgments.md index 01822f8..51582d5 100644 --- a/99_Appendices/I_Acknowledgments.md +++ b/99_Appendices/I_Acknowledgments.md @@ -22,3 +22,4 @@ In no particular order: - @Hqnnqh ([https://github.com/Hqnnqh](https://github.com/Hqnnqh)) - @malletgaetan ([https://github.com/malletgaetan](https://github.com/malletgaetan)) - @mrjbom ([https://github.com/mrjbom](https://github.com/mrjbom)) +- @AFellowSpeedrunner ([https://github.com/AFellowSpeedrunner](https://github.com/AFellowSpeedrunner)) From b125e4c7320ece9ae3e390b2ce1686922d31792f Mon Sep 17 00:00:00 2001 From: MrMasterKeyboard <73440604+AFellowSpeedrunner@users.noreply.github.com> Date: Fri, 27 Dec 2024 18:04:17 +0000 Subject: [PATCH 4/4] Remove -shared and -ffreestanding from LD_FLAGS var --- 01_Build_Process/03_Gnu_Makefiles.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/01_Build_Process/03_Gnu_Makefiles.md b/01_Build_Process/03_Gnu_Makefiles.md index 0d4ee91..92bb384 100644 --- a/01_Build_Process/03_Gnu_Makefiles.md +++ b/01_Build_Process/03_Gnu_Makefiles.md @@ -26,7 +26,7 @@ TARGET = build/kernel.elf #flags CC_FLAGS = -g -ffreestanding -LD_FLAGS = -T linker_script.lds -ffreestanding -shared +LD_FLAGS = -T linker_script.lds #auto populated variables OBJS = $(patsubst %.c, build/%.c.o, $(C_SRCS))