Skip to content

X
xv6-public
提交 81b30b14 创建 作者: Robert Morris's avatar Robert Morris
浏览文件
操作

Merge remote branch 'origin/master' into page

上级 3c9ff073 fe4623b9
显示空白字符变更
内嵌 并排
正在显示 包含 7 行增加 和 3 行删除
Makefile
浏览文件 @ 81b30b14
...@@ -142,6 +142,10 @@ bochs : fs.img xv6.img ...@@ -142,6 +142,10 @@ bochs : fs.img xv6.img
# try to generate a unique GDB port # try to generate a unique GDB port
GDBPORT = $(shell expr `id -u` % 5000 + 25000) 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 QEMUOPTS = -smp 2 -hdb fs.img xv6.img
qemu: fs.img xv6.img qemu: fs.img xv6.img
...@@ -155,11 +159,11 @@ qemu-nox: fs.img xv6.img ...@@ -155,11 +159,11 @@ qemu-nox: fs.img xv6.img
qemu-gdb: fs.img xv6.img .gdbinit qemu-gdb: fs.img xv6.img .gdbinit
@echo "*** Now run 'gdb'." 1>&2 @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 @echo "*** Now run 'gdb'." 1>&2
qemu -nographic $(QEMUOPTS) -s -S -p $(GDBPORT) qemu -nographic $(QEMUOPTS) -S $(QEMUGDB)
# CUT HERE # CUT HERE
# prepare dist for students # prepare dist for students
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论