Skip to content

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

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

上级 32bf96eb f089a081
隐藏空白字符变更
内嵌 并排
正在显示 包含 3 行增加 和 3 行删除
Makefile
浏览文件 @ b20e970f
...@@ -29,10 +29,10 @@ STRIP = $(TOOLPREFIX)strip ...@@ -29,10 +29,10 @@ STRIP = $(TOOLPREFIX)strip
# XXX(sbw) # XXX(sbw)
# -nostdinc # -nostdinc
INCLUDES = -Iinclude -I$(QEMUSRC) -include param.h -include include/compiler.h
COMFLAGS = -static -g -MD -m64 -O2 -Wall -Werror -DHW_$(HW) -DXV6 \ COMFLAGS = -static -g -MD -m64 -O2 -Wall -Werror -DHW_$(HW) -DXV6 \
-fno-builtin -fno-strict-aliasing -fno-omit-frame-pointer -fms-extensions \ -fno-builtin -fno-strict-aliasing -fno-omit-frame-pointer -fms-extensions \
-mno-sse -mcx16 -mno-red-zone -Iinclude -I$(QEMUSRC) \ -mno-sse -mcx16 -mno-red-zone $(INCLUDES)
-include param.h -include include/compiler.h
COMFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector) COMFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector)
CFLAGS := $(COMFLAGS) -std=c99 $(CFLAGS) CFLAGS := $(COMFLAGS) -std=c99 $(CFLAGS)
CXXFLAGS := $(COMFLAGS) -std=c++0x -Wno-sign-compare -fno-exceptions -fno-rtti -fcheck-new -nostdinc++ $(CXXFLAGS) CXXFLAGS := $(COMFLAGS) -std=c++0x -Wno-sign-compare -fno-exceptions -fno-rtti -fcheck-new -nostdinc++ $(CXXFLAGS)
......
user/Makefrag.user
浏览文件 @ b20e970f
CXXFLAGS := -Iuser $(CXXFLAGS) -msse CXXFLAGS := -Iuser $(filter-out -nostdinc++, $(CXXFLAGS)) -msse
$(O)/utest: $(O)/kernel/crange.o \ $(O)/utest: $(O)/kernel/crange.o \
$(O)/kernel/gc.o \ $(O)/kernel/gc.o \
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论