Skip to content

Typo fixes for Makefile and linker in "Build Process" chapter #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 28, 2024
Merged

Typo fixes for Makefile and linker in "Build Process" chapter #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b1ff0f
Fix makefile typos in the "GNU Makefiles" page of "Build Process"
IAmTheNerdNextDoor Dec 27, 2024
6bc662c
Fix linker typo in "Linker Scripts" page of "Build Process"
IAmTheNerdNextDoor Dec 27, 2024
2904e16
Update I_Acknowledgments.md to include me
IAmTheNerdNextDoor Dec 27, 2024
b125e4c
Remove -shared and -ffreestanding from LD_FLAGS var
IAmTheNerdNextDoor Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions 01_Build_Process/03_Gnu_Makefiles.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

#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

Expand Down
2 changes: 1 addition & 1 deletion 01_Build_Process/04_Linker_Scripts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
1 change: 1 addition & 0 deletions 99_Appendices/I_Acknowledgments.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))