Fix boot under Bochs when Pintos is compiled with recent GCC.
authorRuss Ross <russ@dixie.edu>
Thu, 25 Aug 2011 03:41:30 +0000 (20:41 -0700)
committerBen Pfaff <blp@cs.stanford.edu>
Thu, 25 Aug 2011 03:41:54 +0000 (20:41 -0700)
When compiled according to the instructions, bochs fails to load
the project 1 kernel.  This seems to be due to the latest gcc using an
instruction that bochs is not compiled to support.  Adding the
'--enable-cpu-level=6' configure option to Bochs, as this commit does,
seems to work.

src/misc/bochs-2.2.6-build.sh

index 1007fbe086ac643214990802de4d6247cfea6a21..befe3b4c922f42386ea98c43e441bf2cff72df71 100755 (executable)
@@ -26,7 +26,7 @@ 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"
+CFGOPTS="--with-x --with-x11 --with-term --with-nogui --prefix=$DSTDIR --enable-cpu-level=6"
 mkdir plain &&
         cd plain && 
         ../configure $CFGOPTS --enable-gdb-stub &&