From: Russ Ross Date: Thu, 25 Aug 2011 03:41:30 +0000 (-0700) Subject: Fix boot under Bochs when Pintos is compiled with recent GCC. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f011b3fa67f5d9dadcb588a547023bc6a322d52;p=pintos-anon Fix boot under Bochs when Pintos is compiled with recent GCC. 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. --- diff --git a/src/misc/bochs-2.2.6-build.sh b/src/misc/bochs-2.2.6-build.sh index 1007fbe..befe3b4 100755 --- a/src/misc/bochs-2.2.6-build.sh +++ b/src/misc/bochs-2.2.6-build.sh @@ -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 &&