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

b20e970f · Nickolai Zeldovich · 32bf96eb · f089a081 · b20e970f · b20e970f
--- a/Makefile
+++ b/Makefile
@@ -29,10 +29,10 @@ STRIP = $(TOOLPREFIX)strip
 # XXX(sbw)
 # -nostdinc

+INCLUDES  = -Iinclude -I$(QEMUSRC) -include param.h -include include/compiler.h
 COMFLAGS  = -static -g -MD -m64 -O2 -Wall -Werror -DHW_$(HW) -DXV6 \
 	    -fno-builtin -fno-strict-aliasing -fno-omit-frame-pointer -fms-extensions \
-	    -mno-sse -mcx16 -mno-red-zone -Iinclude -I$(QEMUSRC) \
-	    -include param.h -include include/compiler.h
+	    -mno-sse -mcx16 -mno-red-zone $(INCLUDES)
 COMFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector)
 CFLAGS   := $(COMFLAGS) -std=c99 $(CFLAGS)
 CXXFLAGS := $(COMFLAGS) -std=c++0x -Wno-sign-compare -fno-exceptions -fno-rtti -fcheck-new -nostdinc++ $(CXXFLAGS)

--- a/user/Makefrag.user
+++ b/user/Makefrag.user
-CXXFLAGS := -Iuser $(CXXFLAGS) -msse
+CXXFLAGS := -Iuser $(filter-out -nostdinc++, $(CXXFLAGS)) -msse

 $(O)/utest: $(O)/kernel/crange.o \
            $(O)/kernel/gc.o \