pjht/os
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add libc library

Browse Source
This commit is contained in:
pjht 2019-03-30 11:44:01 -05:00
parent ed591187a1
commit 32bd671225
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,4 +8,5 @@ stuff/*
cpu/memory.h cpu/memory.h
os.iso os.iso
disk.img disk.img
libc/libc.a
iso/boot/initrd iso/boot/initrd

11
Makefile
View File

@ -1,6 +1,8 @@
PLAT=i386 PLAT=i386
C_SOURCES = $(wildcard kernel/*.c drivers/$(PLAT)/*.c drivers/$(PLAT)/*/*.c libc/*.c cpu/$(PLAT)/*.c fs/*.c) C_SOURCES = $(wildcard kernel/*.c drivers/$(PLAT)/*.c drivers/$(PLAT)/*/*.c cpu/$(PLAT)/*.c fs/*.c)
LIBC_SOURCES = $(wildcard libc/*.c libc/*/*.c)
OBJ = $(C_SOURCES:.c=.o $(shell cat psinfo/$(PLAT)/o.txt)) OBJ = $(C_SOURCES:.c=.o $(shell cat psinfo/$(PLAT)/o.txt))
LIBC_OBJ = $(LIBC_SOURCES:.c=.o)
CC = $(shell cat psinfo/$(PLAT)/cc.txt) CC = $(shell cat psinfo/$(PLAT)/cc.txt)
GDB = $(shell cat psinfo/$(PLAT)/gdb.txt) GDB = $(shell cat psinfo/$(PLAT)/gdb.txt)
CFLAGS = -Ilibc -Wextra -Wall -Wno-unused-parameter -g -ffreestanding CFLAGS = -Ilibc -Wextra -Wall -Wno-unused-parameter -g -ffreestanding
@ -24,9 +26,12 @@ initrd/prog.elf: prog/*
cd prog && make cd prog && make
cp prog/prog.elf initrd cp prog/prog.elf initrd
kernel/kernel.elf: $(OBJ) kernel/kernel.elf: $(OBJ) libc/libc.a
i386-elf-ld -T linker.ld -o $@ $^ i386-elf-ld -T linker.ld -o $@ $^
libc/libc.a: $(LIBC_OBJ)
i386-elf-ar rcs $@ $^
%.o: %.c %.o: %.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
@ -37,4 +42,4 @@ kernel/kernel.elf: $(OBJ)
i386-elf-as $< -o $@ i386-elf-as $< -o $@
clean: clean:
rm -rf $(OBJ) kernel/cstart.o cpu/memory.h os.iso */*.elf iso/boot/initrd.tar rm -rf $(OBJ) libc/libc.a kernel/cstart.o cpu/memory.h os.iso */*.elf iso/boot/initrd.tar