From 01396b3a8787d3b6e694675d3f28ddbc90f6b832 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Sun, 20 Sep 2009 23:07:59 -0400 Subject: xv6 runs the console on the serial port, not the parallel port --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1e73ee1..2e1b927 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,7 @@ GDBPORT = $(shell expr `id -u` % 5000 + 25000) QEMUOPTS = -smp 2 -hdb fs.img xv6.img qemu: fs.img xv6.img - qemu -parallel mon:stdio $(QEMUOPTS) + qemu -serial mon:stdio $(QEMUOPTS) qemutty: fs.img xv6.img qemu -nographic $(QEMUOPTS) @@ -153,7 +153,7 @@ qemutty: fs.img xv6.img qemu-gdb: fs.img xv6.img .gdbinit @echo "*** Now run 'gdb'." 1>&2 - qemu -parallel mon:stdio $(QEMUOPTS) -s -S -p $(GDBPORT) + qemu -serial mon:stdio $(QEMUOPTS) -s -S -p $(GDBPORT) # CUT HERE # prepare dist for students -- cgit v1.2.3 From bab819ed8d77abe65ea16945f42e76b3d4d1ff8b Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 30 Sep 2009 22:09:48 -0400 Subject: Be consistent with JOS make targets --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2e1b927..07463d9 100644 --- a/Makefile +++ b/Makefile @@ -145,7 +145,7 @@ QEMUOPTS = -smp 2 -hdb fs.img xv6.img qemu: fs.img xv6.img qemu -serial mon:stdio $(QEMUOPTS) -qemutty: fs.img xv6.img +qemu-nox: fs.img xv6.img qemu -nographic $(QEMUOPTS) .gdbinit: .gdbinit.tmpl @@ -155,6 +155,10 @@ qemu-gdb: fs.img xv6.img .gdbinit @echo "*** Now run 'gdb'." 1>&2 qemu -serial mon:stdio $(QEMUOPTS) -s -S -p $(GDBPORT) +qemu-gdb-nox: fs.img xv6.img .gdbinit + @echo "*** Now run 'gdb'." 1>&2 + qemu -nographic $(QEMUOPTS) -s -S -p $(GDBPORT) + # CUT HERE # prepare dist for students # after running make dist, probably want to -- cgit v1.2.3 From 77a9aa55cd0c18ef33ebfa484b534511af4af53d Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Mon, 5 Oct 2009 13:20:23 -0400 Subject: Record debug info for assmebly code --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 07463d9..24ba05e 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ OBJCOPY = $(TOOLPREFIX)objcopy OBJDUMP = $(TOOLPREFIX)objdump CFLAGS = -fno-pic -static -fno-builtin -fno-strict-aliasing -O2 -Wall -MD -ggdb -m32 CFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector) -ASFLAGS = -m32 +ASFLAGS = -m32 -gdwarf-2 # FreeBSD ld wants ``elf_i386_fbsd'' LDFLAGS += -m $(shell $(LD) -V | grep elf_i386 2>/dev/null) -- cgit v1.2.3