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 3245b4289889330f0f75cb34deee5223479a79f3..befe3b4c922f42386ea98c43e441bf2cff72df71 100755 (executable)
--- a/src/misc/bochs-2.2.6-build.sh
+++ b/src/misc/bochs-2.2.6-build.sh
@@ -17,19 +17,25 @@ cd bochs-2.2.6
 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.patch | patch -p1
+    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"
+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 ..
+        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 ..
+        cd with-dbg &&
+        ../configure --enable-debugger $CFGOPTS &&
+        make &&
+        cp bochs $DSTDIR/bin/bochs-dbg &&
+        cd ..