commit 156b307e28c52597fddea68baa5ca1f052520657 parent d55b2fac074ac23e30c337014f40ae2156b31b60 Author: Frans Kaashoek <kaashoek@26-4-190.dynamic.csail.mit.edu> Date: Mon, 30 Aug 2010 17:14:56 -0400 Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6 into page Diffstat:
| M | Makefile | | | 10 | +++++++--- |
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile @@ -142,6 +142,10 @@ bochs : fs.img xv6.img # try to generate a unique GDB port GDBPORT = $(shell expr `id -u` % 5000 + 25000) +# QEMU's gdb stub command line changed in 0.11 +QEMUGDB = $(shell if qemu -help | grep -q '^-gdb'; \ + then echo "-gdb tcp::$(GDBPORT)"; \ + else echo "-s -p $(GDBPORT)"; fi) QEMUOPTS = -smp 2 -hdb fs.img xv6.img qemu: fs.img xv6.img @@ -155,11 +159,11 @@ qemu-nox: fs.img xv6.img qemu-gdb: fs.img xv6.img .gdbinit @echo "*** Now run 'gdb'." 1>&2 - qemu -serial mon:stdio $(QEMUOPTS) -s -S -p $(GDBPORT) + qemu -serial mon:stdio $(QEMUOPTS) -S $(QEMUGDB) -qemu-gdb-nox: fs.img xv6.img .gdbinit +qemu-nox-gdb: fs.img xv6.img .gdbinit @echo "*** Now run 'gdb'." 1>&2 - qemu -nographic $(QEMUOPTS) -s -S -p $(GDBPORT) + qemu -nographic $(QEMUOPTS) -S $(QEMUGDB) # CUT HERE # prepare dist for students