diff options
| author | Frans Kaashoek <[email protected]> | 2009-10-07 17:42:25 -0400 |
|---|---|---|
| committer | Frans Kaashoek <[email protected]> | 2009-10-07 17:42:25 -0400 |
| commit | aaf63e62d763216448854bc6f921943a5140462e (patch) | |
| tree | aba0d8124bd49710ba2e5c5904786e20e5def1db /Makefile | |
| parent | ab777a9ad0355e6df16ee53bad348d5fbb1f347f (diff) | |
| parent | 2c536bff67ed209b1c5aa3d40e40731813bfcd9a (diff) | |
| download | xv6-labs-aaf63e62d763216448854bc6f921943a5140462e.tar.gz xv6-labs-aaf63e62d763216448854bc6f921943a5140462e.tar.bz2 xv6-labs-aaf63e62d763216448854bc6f921943a5140462e.zip | |
Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -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) @@ -143,9 +143,9 @@ 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-nox: fs.img xv6.img qemu -nographic $(QEMUOPTS) .gdbinit: .gdbinit.tmpl @@ -153,7 +153,11 @@ 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) + +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 |