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

59bc213f · Nickolai Zeldovich · 703597f4 · 723303f6 · 59bc213f · 59bc213f
--- a/README
+++ b/README
@@ -9,7 +9,7 @@
 * Networking with lwIP

  $ git clone git://git.savannah.nongnu.org/lwip.git
-  $ (cd lwip && git checkout STABLE-1_4_0)
+  $ (cd lwip && git checkout DEVEL-1_4_1)
  $ make clean;make

 * Copies of e1000 and e1000e manuals are in manuals/.  They were
@@ -40,6 +40,7 @@
  mkdir build
  cd build
  ../configure --target=x86_64-jos-elf  --with-gmp=/usr/local/ --with-mpfr=/usr/local --enable-languages=c,c++ --without-headers --disable-nls
+  make all-gcc ; sudo make install-gcc

 * clang 
  - Version 3.0 or greater is required to build xv6

--- a/include/kernel.hh
+++ b/include/kernel.hh
@@ -205,7 +205,7 @@ int             kmemcpy(void*, void*, u64);
 void            syscall(void);

 // string.c
-int             memcmp(const void*, const void*, u32);
+extern  "C" int  memcmp(const void*, const void*, u32);
 void*           memmove(void*, const void*, u32);
 extern "C" void* memset(void*, int, u32);
 extern "C" void* memcpy(void*, const void *, u32);

--- a/net/string.h
+++ b/net/string.h
@@ -2,3 +2,4 @@ void* memset(void*, int, unsigned int);
 void* memcpy(void *dst, const void *src, unsigned int n);
 void* memset(void*, int, unsigned int);
 unsigned int strlen(const char* str);
+int memcmp(const void*, const void*, unsigned int);