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

e855e8e8 · Silas Boyd-Wickizer · 5246d248 · cef3edd9 · e855e8e8 · e855e8e8
--- a/bin/Makefrag
+++ b/bin/Makefrag
@@ -57,6 +57,7 @@ $(O)/bin/%: $(O)/bin/%.unstripped
 	$(Q)mkdir -p $(@D)
 	$(Q)$(STRIP) -o $@ $<

+# Assume everything inclues user.h, which includes sysstubs.h
 $(addsuffix .o,$(UPROGS)): $(O)/include/sysstubs.h

 .PRECIOUS: $(O)/bin/%.o $(O)/bin/%.unstripped

--- a/lib/Makefrag
+++ b/lib/Makefrag
@@ -11,5 +11,8 @@ $(O)/lib/sysstubs.S: tools/syscalls.py kernel/*.cc
 $(O)/include/sysstubs.h: tools/syscalls.py kernel/*.cc
 	$(call SYSCALLGEN,--udecls)

+# Assume all of the library sources include sysstubs.h
+$(ULIB): $(O)/include/sysstubs.h
+
 .PRECIOUS: $(O)/lib/%.o
 -include $(O)/lib/*.d