Fix boot under Bochs when Pintos is compiled with recent GCC.

[pintos-anon] / src / misc / bochs-2.2.6-build.sh

diff --git a/src/misc/bochs-2.2.6-build.sh b/src/misc/bochs-2.2.6-build.sh
index bdf38b0418415e81682981ece04c617573ebfd08..befe3b4c922f42386ea98c43e441bf2cff72df71 100755 (executable)
--- a/src/misc/bochs-2.2.6-build.sh
+++ b/src/misc/bochs-2.2.6-build.sh
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
-if test -z "$SRCDIR" || test -z "$PINTOSROOT" || test -z "$DSTDIR"; then
-    echo "usage: env SRCDIR=<srcdir> PINTOSDIR=<srcdir> DSTDIR=<dstdir> $0"
+if test -z "$SRCDIR" || test -z "$PINTOSDIR" || test -z "$DSTDIR"; then
+    echo "usage: env SRCDIR=<srcdir> PINTOSDIR=<srcdir> DSTDIR=<dstdir> sh $0"
     echo "  where <srcdir> contains bochs-2.2.6.tar.gz"
     echo "    and <pintosdir> is the root of the pintos source tree"
     echo "    and <dstdir> is the installation prefix (e.g. /usr/local)"
@@ -14,16 +14,28 @@ cd $$
 mkdir bochs-2.2.6
 tar xzf $SRCDIR/bochs-2.2.6.tar.gz
 cd bochs-2.2.6
-patch -p1 < $PINTOSDIR/src/misc/bochs-2.2.6-*.patch
-
-CFGOPTS="--with-x --with-x11 --with-term --with-nogui --prefix=$DSTDIR"
-(mkdir plain &&
- cd plain && 
- ../configure $CFGOPTS --enable-gdb-stub && 
- make && 
- make install)
-(mkdir with-dbg &&
- cd with-dbg &&
- ../configure --enable-debugger $CFGOPTS &&
- make &&
- cp bochs $DSTDIR/bin/bochs-dbg)
+cat $PINTOSDIR/src/misc/bochs-2.2.6-ms-extensions.patch | patch -p1
+cat $PINTOSDIR/src/misc/bochs-2.2.6-big-endian.patch | patch -p1
+cat $PINTOSDIR/src/misc/bochs-2.2.6-jitter.patch | patch -p1
+cat $PINTOSDIR/src/misc/bochs-2.2.6-triple-fault.patch | patch -p1
+cat $PINTOSDIR/src/misc/bochs-2.2.6-solaris-tty.patch | patch -p1
+cat $PINTOSDIR/src/misc/bochs-2.2.6-page-fault-segv.patch | patch -p1
+cat $PINTOSDIR/src/misc/bochs-2.2.6-paranoia.patch | patch -p1
+cat $PINTOSDIR/src/misc/bochs-2.2.6-gdbstub-ENN.patch | patch -p1
+cat $PINTOSDIR/src/misc/bochs-2.2.6-namespace.patch | patch -p1
+if test "`uname -s`" = "SunOS"; then
+    cat $PINTOSDIR/src/misc/bochs-2.2.6-solaris-link.patch | patch -p1
+fi
+CFGOPTS="--with-x --with-x11 --with-term --with-nogui --prefix=$DSTDIR --enable-cpu-level=6"
+mkdir plain &&
+        cd plain && 
+        ../configure $CFGOPTS --enable-gdb-stub && 
+        make && 
+        make install &&
+        cd ..
+mkdir with-dbg &&
+        cd with-dbg &&
+        ../configure --enable-debugger $CFGOPTS &&
+        make &&
+        cp bochs $DSTDIR/bin/bochs-dbg &&
+        cd ..