From: Russ Ross Date: Thu, 25 Aug 2011 03:40:10 +0000 (-0700) Subject: Fix Bochs build with recent GCC. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d5d792bc8f8a577fffd997f10bd2cea8873ff3c;p=pintos-anon Fix Bochs build with recent GCC. bochs-2.2.6 failed to compile with the latest version of gcc. This commit fixes the problem --- diff --git a/src/misc/bochs-2.2.6-build.sh b/src/misc/bochs-2.2.6-build.sh index a8a44e3..1007fbe 100755 --- a/src/misc/bochs-2.2.6-build.sh +++ b/src/misc/bochs-2.2.6-build.sh @@ -22,6 +22,7 @@ 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 diff --git a/src/misc/bochs-2.2.6-namespace.patch b/src/misc/bochs-2.2.6-namespace.patch new file mode 100644 index 0000000..5f03814 --- /dev/null +++ b/src/misc/bochs-2.2.6-namespace.patch @@ -0,0 +1,10 @@ +--- bochs-2.2.6/bx_debug/symbols.cc 2011-08-19 11:04:11.760139836 -0600 ++++ bochs-2.2.6-patched/bx_debug/symbols.cc 2011-08-19 11:04:04.980139837 -0600 +@@ -92,6 +92,7 @@ + #endif + + using namespace std; ++namespace std { using namespace __gnu_cxx; } + + struct symbol_entry_t + {