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

Get all programs building using the new hosted cross-compiler

Browse Source
This commit is contained in:
pjht 2019-08-28 08:26:42 -05:00
parent 1727e2c44b
commit 54ab300502
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -35,7 +35,10 @@ os.iso: kernel/kernel.elf init vfs fsdrv initrd
@cd initrd; tar -f ../sysroot/boot/initrd.tar -c * @cd initrd; tar -f ../sysroot/boot/initrd.tar -c *
@grub-mkrescue -o $@ sysroot >/dev/null 2>/dev/null @grub-mkrescue -o $@ sysroot >/dev/null 2>/dev/null
init: init/* kernel/start.o crts: kernel/crt0.o
cp $^ sysroot/usr/lib
init: init/* crts
@cd $@ && make @cd $@ && make
@cp $@/$@ initrd/$@ @cp $@/$@ initrd/$@

4
fsdrv/Makefile
View File

@ -1,10 +1,10 @@
C_SOURCES = $(wildcard *.c) C_SOURCES = $(wildcard *.c)
OBJ = $(C_SOURCES:.c=.o ) OBJ = $(C_SOURCES:.c=.o )
CFLAGS = -Wall -g --sysroot=../sysroot -isystem=/usr/include -nostdlib CFLAGS = -Wall -g
CC = i386-myos-gcc CC = i386-myos-gcc
fsdrv: $(OBJ) ../libc/* fsdrv: $(OBJ) ../libc/*
@$(CC) -z max-page-size=4096 -Xlinker -n -o $@ $(CFLAGS) $(OBJ) ../kernel/start.o ../sysroot/usr/lib/libc.a -lgcc @$(CC) -o $@ $(CFLAGS) $(OBJ)
%.o: %.c %.o: %.c
@$(CC) $(CFLAGS) -c $< -o $@ @$(CC) $(CFLAGS) -c $< -o $@

0
kernel/start.asm → kernel/crt0.asm
View File

4
vfs/Makefile
View File

@ -1,10 +1,10 @@
C_SOURCES = $(wildcard *.c) C_SOURCES = $(wildcard *.c)
OBJ = $(C_SOURCES:.c=.o) OBJ = $(C_SOURCES:.c=.o)
CFLAGS = -Wall -g --sysroot=../sysroot -isystem=/usr/include -nostdlib CFLAGS = -Wall -g
CC = i386-myos-gcc CC = i386-myos-gcc
vfs: $(OBJ) ../libc/* vfs: $(OBJ) ../libc/*
@$(CC) -z max-page-size=4096 -Xlinker -n -o $@ $(CFLAGS) $(OBJ) ../kernel/start.o ../sysroot/usr/lib/libc.a -lgcc @$(CC) -o $@ $(CFLAGS) $(OBJ)
%.o: %.c %.o: %.c
@$(CC) $(CFLAGS) -c $< -o $@ @$(CC) $(CFLAGS) -c $< -o $@