Skip to content

X
xv6-public
提交 752446ec 创建 作者: Nickolai Zeldovich's avatar Nickolai Zeldovich
浏览文件
操作

Merge branch 'scale' of git+ssh://pdos.csail.mit.edu/home/am0/6.828/xv6 into scale

上级 c4cda662 df5b08e3
隐藏空白字符变更
内嵌 并排
正在显示 包含 6 行增加 和 5 行删除
Makefile
浏览文件 @ 752446ec
...@@ -29,7 +29,7 @@ OBJS = \ ...@@ -29,7 +29,7 @@ OBJS = \
vm.o\ vm.o\
# Cross-compiling (e.g., on Mac OS X) # Cross-compiling (e.g., on Mac OS X)
#TOOLPREFIX = i386-jos-elf- TOOLPREFIX = x86_64-jos-elf-
# Using native tools (e.g., on X86 Linux) # Using native tools (e.g., on X86 Linux)
#TOOLPREFIX = #TOOLPREFIX =
...@@ -51,8 +51,8 @@ TOOLPREFIX := $(shell if i386-jos-elf-objdump -i 2>&1 | grep '^elf32-i386$$' >/d ...@@ -51,8 +51,8 @@ TOOLPREFIX := $(shell if i386-jos-elf-objdump -i 2>&1 | grep '^elf32-i386$$' >/d
endif endif
# The i386 ('qemu') mtrace doesn't work, but 'qemu-system-x86_64' mtrace works. # The i386 ('qemu') mtrace doesn't work, but 'qemu-system-x86_64' mtrace works.
MTRACE = qemu-system-x86_64 MTRACE = ../mtrace/x86_64-softmmu/qemu-system-x86_64
QEMUSRC ?= QEMUSRC = ../mtrace
ifeq ($(QEMUSRC),) ifeq ($(QEMUSRC),)
$(error You need to set QEMUSRC (e.g. make QEMUSRC=~/qemu)) $(error You need to set QEMUSRC (e.g. make QEMUSRC=~/qemu))
...@@ -75,12 +75,13 @@ QEMU = $(shell if which qemu > /dev/null; \ ...@@ -75,12 +75,13 @@ QEMU = $(shell if which qemu > /dev/null; \
echo "***" 1>&2; exit 1) echo "***" 1>&2; exit 1)
endif endif
NM = $(TOOLPREFIX)nm
CC = $(TOOLPREFIX)gcc CC = $(TOOLPREFIX)gcc
AS = $(TOOLPREFIX)gas AS = $(TOOLPREFIX)gas
LD = $(TOOLPREFIX)ld LD = $(TOOLPREFIX)ld
OBJCOPY = $(TOOLPREFIX)objcopy OBJCOPY = $(TOOLPREFIX)objcopy
OBJDUMP = $(TOOLPREFIX)objdump OBJDUMP = $(TOOLPREFIX)objdump
CFLAGS = -fno-pic -static -fno-builtin -fno-strict-aliasing -O2 -Wall -MD -ggdb -m32 -Werror -I$(QEMUSRC) -std=c99 -fms-extensions CFLAGS = -fno-pic -static -fno-builtin -fno-strict-aliasing -O2 -Wall -MD -ggdb -m32 -Werror -I$(QEMUSRC) -std=c99 -fms-extensions -mno-sse
CFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector) CFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector)
ASFLAGS = -m32 -gdwarf-2 ASFLAGS = -m32 -gdwarf-2
# FreeBSD ld wants ``elf_i386_fbsd'' # FreeBSD ld wants ``elf_i386_fbsd''
...@@ -202,7 +203,7 @@ bochs : fs.img xv6.img ...@@ -202,7 +203,7 @@ bochs : fs.img xv6.img
bochs -q bochs -q
mscan.syms: kernel mscan.syms: kernel
nm -S $< > $@ $(NM) -S $< > $@
mscan.kern: kernel mscan.kern: kernel
cp $< $@ cp $< $@
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论