chore: update .gitignore and Makefile
This commit is contained in:
1 parent
dd38cc6a3f
commit
3771599779
2 files changed
+55
-3
No files matched your search
@@ -3,3 +3,4 @@ os.iso
|
|||||||
iso/boot/frostbyte.elf
|
iso/boot/frostbyte.elf
|
||||||
*.o
|
*.o
|
||||||
*.elf
|
*.elf
|
||||||
|
iso/boot/initrd.img
|
||||||
@@ -6,7 +6,7 @@ CFLAGS := -std=gnu11 -ffreestanding -nostdlib \
|
|||||||
-fno-asynchronous-unwind-tables \
|
-fno-asynchronous-unwind-tables \
|
||||||
-mno-red-zone -mno-mmx -mno-sse -mno-sse2 \
|
-mno-red-zone -mno-mmx -mno-sse -mno-sse2 \
|
||||||
-mcmodel=kernel \
|
-mcmodel=kernel \
|
||||||
-Wall -Wextra -Iinclude -g -c
|
-Wall -Wextra -Iinclude -MMD -MP -g -c
|
||||||
|
|
||||||
ASFLAGS := -ffreestanding -Iinclude -g -c
|
ASFLAGS := -ffreestanding -Iinclude -g -c
|
||||||
|
|
||||||
@@ -16,7 +16,8 @@ UCFLAGS := -std=gnu11 -ffreestanding -nostdlib \
|
|||||||
-fno-stack-protector -fno-pic -fno-pie \
|
-fno-stack-protector -fno-pic -fno-pie \
|
||||||
-fno-asynchronous-unwind-tables \
|
-fno-asynchronous-unwind-tables \
|
||||||
-mno-red-zone -mno-mmx -mno-sse -mno-sse2 \
|
-mno-red-zone -mno-mmx -mno-sse -mno-sse2 \
|
||||||
-Wall -Wextra -Iinclude -Iuser -g -c
|
-mcmodel=large \
|
||||||
|
-Wall -Wextra -Iinclude -Iuser -MMD -MP -g -c
|
||||||
|
|
||||||
UASFLAGS := -ffreestanding -Iinclude -Iuser -g -c
|
UASFLAGS := -ffreestanding -Iinclude -Iuser -g -c
|
||||||
|
|
||||||
@@ -33,7 +34,55 @@ OBJS := $(SOBJS) $(COBJS)
|
|||||||
|
|
||||||
USERCOMMON := $(UBUILD)/crt.o $(UBUILD)/ulib.o
|
USERCOMMON := $(UBUILD)/crt.o $(UBUILD)/ulib.o
|
||||||
USERPROGRAMS := $(UBUILD)/hello.elf $(UBUILD)/counter.elf \
|
USERPROGRAMS := $(UBUILD)/hello.elf $(UBUILD)/counter.elf \
|
||||||
$(UBUILD)/sbrktest.elf $(UBUILD)/fileread.elf
|
$(UBUILD)/sbrktest.elf $(UBUILD)/fileread.elf \
|
||||||
|
$(UBUILD)/pipetest.elf $(UBUILD)/disktest.elf \
|
||||||
|
$(UBUILD)/fstest.elf $(UBUILD)/linktest.elf \
|
||||||
|
$(UBUILD)/spawntarget.elf $(UBUILD)/exectarget.elf \
|
||||||
|
$(UBUILD)/proctest.elf $(UBUILD)/argtest.elf \
|
||||||
|
$(UBUILD)/fifomaster.elf $(UBUILD)/fifowriter.elf \
|
||||||
|
$(UBUILD)/fiforeader.elf $(UBUILD)/killtest.elf \
|
||||||
|
$(UBUILD)/killvictim.elf $(UBUILD)/namedreader.elf \
|
||||||
|
$(UBUILD)/namedwriter.elf $(UBUILD)/consolereader1.elf \
|
||||||
|
$(UBUILD)/consolereader2.elf $(UBUILD)/sigtest.elf \
|
||||||
|
$(UBUILD)/sigtarget.elf $(UBUILD)/sigdefault.elf \
|
||||||
|
$(UBUILD)/jobtest.elf $(UBUILD)/jobtarget.elf \
|
||||||
|
$(UBUILD)/nesttest.elf $(UBUILD)/nesttarget.elf \
|
||||||
|
$(UBUILD)/eintrtest.elf $(UBUILD)/eintrtarget.elf \
|
||||||
|
$(UBUILD)/restarttest.elf $(UBUILD)/restarttarget.elf \
|
||||||
|
$(UBUILD)/masktest.elf $(UBUILD)/masktarget.elf \
|
||||||
|
$(UBUILD)/sigchldtest.elf $(UBUILD)/sigchldchild.elf \
|
||||||
|
$(UBUILD)/waitanytest.elf $(UBUILD)/waitanyfast.elf \
|
||||||
|
$(UBUILD)/waitanyslow.elf \
|
||||||
|
$(UBUILD)/stopchldtest.elf $(UBUILD)/stopchldtarget.elf \
|
||||||
|
$(UBUILD)/nodefertest.elf \
|
||||||
|
$(UBUILD)/alarmtest.elf $(UBUILD)/alarmdefault.elf \
|
||||||
|
$(UBUILD)/siginfotest.elf $(UBUILD)/siginfotarget.elf \
|
||||||
|
$(UBUILD)/pgroupfg.elf $(UBUILD)/pgroupbg.elf \
|
||||||
|
$(UBUILD)/jobctlfg.elf $(UBUILD)/jobctlbg.elf \
|
||||||
|
$(UBUILD)/polltest.elf $(UBUILD)/pollwriter.elf \
|
||||||
|
$(UBUILD)/pipesrc.elf $(UBUILD)/pipesink.elf \
|
||||||
|
$(UBUILD)/redirwriter.elf $(UBUILD)/redirreader.elf \
|
||||||
|
$(UBUILD)/stderrwriter.elf $(UBUILD)/stderrreader.elf \
|
||||||
|
$(UBUILD)/selfstoptest.elf $(UBUILD)/selfstoptarget.elf \
|
||||||
|
$(UBUILD)/herestest.elf \
|
||||||
|
$(UBUILD)/hcat.elf $(UBUILD)/hsink.elf \
|
||||||
|
$(UBUILD)/pipecat.elf \
|
||||||
|
$(UBUILD)/cwdtest.elf $(UBUILD)/cwdtarget.elf \
|
||||||
|
$(UBUILD)/envprint.elf \
|
||||||
|
$(UBUILD)/nicetest.elf $(UBUILD)/nicetarget.elf \
|
||||||
|
$(UBUILD)/date.elf \
|
||||||
|
$(UBUILD)/globcat.elf \
|
||||||
|
$(UBUILD)/timetest.elf \
|
||||||
|
$(UBUILD)/false.elf \
|
||||||
|
$(UBUILD)/argecho.elf \
|
||||||
|
$(UBUILD)/rmtest.elf \
|
||||||
|
$(UBUILD)/permtest.elf \
|
||||||
|
$(UBUILD)/identtest.elf \
|
||||||
|
$(UBUILD)/dirpermtest.elf \
|
||||||
|
$(UBUILD)/grouptest.elf \
|
||||||
|
$(UBUILD)/pidfdtest.elf \
|
||||||
|
$(UBUILD)/mmaptest.elf $(UBUILD)/mmapprotvictim.elf \
|
||||||
|
$(UBUILD)/mmapexecvictim.elf
|
||||||
|
|
||||||
FSFILES := fsroot/etc/motd.txt fsroot/etc/readme.txt fsroot/home/notes.txt
|
FSFILES := fsroot/etc/motd.txt fsroot/etc/readme.txt fsroot/home/notes.txt
|
||||||
|
|
||||||
@@ -41,6 +90,8 @@ KERNEL := $(BUILD)/frostbyte.elf
|
|||||||
INITRD := $(BUILD)/initrd.img
|
INITRD := $(BUILD)/initrd.img
|
||||||
MKTAR := $(BUILD)/mktar
|
MKTAR := $(BUILD)/mktar
|
||||||
ISO := os.iso
|
ISO := os.iso
|
||||||
|
DISK := $(BUILD)/disk.img
|
||||||
|
DISKFLAGS := -drive file=$(DISK),format=raw,if=ide
|
||||||
|
|
||||||
.PHONY: all clean run runserial test
|
.PHONY: all clean run runserial test
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user