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

make debug now uses the plain gdb binary

Browse Source
This commit is contained in:
pjht 2020-08-01 09:04:18 -05:00
parent ab200ad743
commit dc198741da
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -15,7 +15,6 @@ AS = $(shell cat psinfo/$(PLAT)/as.txt)
AR = $(shell cat psinfo/$(PLAT)/ar.txt) AR = $(shell cat psinfo/$(PLAT)/ar.txt)
NASM = $(shell cat psinfo/$(PLAT)/nasm.txt) NASM = $(shell cat psinfo/$(PLAT)/nasm.txt)
EMU = $(shell cat psinfo/$(PLAT)/emu.txt) EMU = $(shell cat psinfo/$(PLAT)/emu.txt)
GDB = $(shell cat psinfo/$(PLAT)/gdb.txt)
CFLAGS = -Isysroot/usr/include -Wextra -Wall -Wno-unused-parameter -g -ffreestanding CFLAGS = -Isysroot/usr/include -Wextra -Wall -Wno-unused-parameter -g -ffreestanding
QFLAGS = -hda ext2.img -m 2G -boot d -cdrom os.iso -serial file:serout #-chardev socket,id=s1,port=3000,host=localhost -serial chardev:s1 QFLAGS = -hda ext2.img -m 2G -boot d -cdrom os.iso -serial file:serout #-chardev socket,id=s1,port=3000,host=localhost -serial chardev:s1
CWD = $(shell pwd) CWD = $(shell pwd)
@ -29,10 +28,10 @@ run: os.iso
debug: os.iso kernel/kernel.elf debug: os.iso kernel/kernel.elf
@$(EMU) -s $(QFLAGS) & @$(EMU) -s $(QFLAGS) &
@$(GDB) gdb
#gdbgui -g i386-elf-gdb --project $(CWD) #gdbgui -g i386-elf-gdb --project $(CWD)
os.iso: kernel/kernel.elf init sysroot/usr/share/man # vfs devfs initrd vga_drv initrd_drv pci os.iso: kernel/kernel.elf init rpctest sysroot/usr/share/man # vfs devfs initrd vga_drv initrd_drv pci
@cp kernel/kernel.elf sysroot/boot @cp kernel/kernel.elf sysroot/boot
@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
@ -44,6 +43,10 @@ init: crts libc
@cd $@ && make @cd $@ && make
@cp $@/$@ initrd/$@ @cp $@/$@ initrd/$@
rpctest: crts libc
@cd $@ && make
@cp $@/$@ initrd/$@
vfs: crts libc vfs: crts libc
@cd $@ && make @cd $@ && make
@cp $@/$@ initrd/$@ @cp $@/$@ initrd/$@

1
psinfo/i386/gdb.txt
View File

@ -1 +0,0 @@
i386-elf-gdb