Skip to content

Commit f38606d

Browse files
Typo fixes for Makefile and linker in "Build Process" chapter (#107)
* Fix makefile typos in the "GNU Makefiles" page of "Build Process" * Fix linker typo in "Linker Scripts" page of "Build Process" * Update I_Acknowledgments.md to include me * Remove -shared and -ffreestanding from LD_FLAGS var
1 parent ad2bea1 commit f38606d

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

01_Build_Process/03_Gnu_Makefiles.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Below is an example of a basic Makefile.
1717
CC = x86_64-elf-gcc
1818
CXX = x86_64-elf-g++
1919
AS = x86_64-elf-as
20-
LD = x86_64_elf-ld
20+
LD = x86_64-elf-ld
2121

2222
#inputs
2323
C_SRCS = kernel_main.c util.c
@@ -26,11 +26,11 @@ TARGET = build/kernel.elf
2626

2727
#flags
2828
CC_FLAGS = -g -ffreestanding
29-
LD_FLAGS = -T linker_script.lds -ffreestanding
29+
LD_FLAGS = -T linker_script.lds
3030

3131
#auto populated variables
3232
OBJS = $(patsubst %.c, build/%.c.o, $(C_SRCS))
33-
OBJS += $(patsubst %.S, build/%.S.o, %(ASM_SRCS))
33+
OBJS += $(patsubst %.S, build/%.S.o, $(ASM_SRCS))
3434

3535
.PHONY: all clean
3636

01_Build_Process/04_Linker_Scripts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ SECTIONS
196196
/* Then we can map those pages appropriately. */
197197
TEXT_BEGIN = .;
198198
*(.text*)
199-
TEXT_END = ,;
199+
TEXT_END = .;
200200
} :text
201201
202202
/* a trick to ensure the section next is on the next physical */

99_Appendices/I_Acknowledgments.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ In no particular order:
2222
- @Hqnnqh ([https://github.com/Hqnnqh](https://github.com/Hqnnqh))
2323
- @malletgaetan ([https://github.com/malletgaetan](https://github.com/malletgaetan))
2424
- @mrjbom ([https://github.com/mrjbom](https://github.com/mrjbom))
25+
- @AFellowSpeedrunner ([https://github.com/AFellowSpeedrunner](https://github.com/AFellowSpeedrunner))

0 commit comments

Comments
 (0)