From b5951493cb20b27398413552d8287c054994a8a5 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Tue, 4 Jan 2005 08:07:05 +0000
Subject: [PATCH] Update Bochs and toolchain build summaries.

---
 src/misc/TODO              |  9 ++++++---
 src/misc/bochs-2.1.1.patch | 24 +++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/misc/TODO b/src/misc/TODO
index dc13ba3..60dacf9 100644
--- a/src/misc/TODO
+++ b/src/misc/TODO
@@ -6,10 +6,12 @@
 
 * Cross-compile notes:
 
+PINTOSROOT=$HOME/private/pintos
+
 cd /tmp
 bzcat ~/binutils-2.15.tar.bz2 | tar x
 tar xzf ~/newlib-1.12.0.tar.gz
-tar xzf ~/gcc-core-3.3.2.tar.gz
+bzcat ~/gcc-core-3.3.5.tar.bz2 | tar x
 tar xzf ~/gdb-6.2.1.tar.gz
 
 PATH=$PATH:/usr/class/cs140/i386/bin
@@ -21,7 +23,8 @@ cd i386
 make LDFLAGS=-lintl
 make install
 
-cd /tmp/gcc-3.3.2
+cd /tmp/gcc-3.3.5
+patch gcc/config/elfos.h < $PINTOSROOT/src/misc/gcc-3.3.5.patch
 mkdir i386
 cd i386
 ../configure --target=i386-elf --prefix=/usr/class/cs140/i386 --with-gnu-as --with-as=/usr/class/cs140/i386/bin/i386-elf-as --with-gnu-ld --with-ld=/usr/class/cs140/i386/bin/i386-elf-ld --with-headers=/tmp/newlib-1.12.0/newlib/libc/include --with-newlib
@@ -32,5 +35,5 @@ cd /tmp/gdb-6.2.1
 mkdir i386
 cd i386
 ../configure --target=i386-elf --prefix=/usr/class/cs140/i386 --disable-tui
-make
+make LDFLAGS=-lintl
 make install
diff --git a/src/misc/bochs-2.1.1.patch b/src/misc/bochs-2.1.1.patch
index beb23b9..42fafc5 100644
--- a/src/misc/bochs-2.1.1.patch
+++ b/src/misc/bochs-2.1.1.patch
@@ -19,7 +19,7 @@ project documentation, in which timer interrupts are delivered at
 random intervals.
 
 To apply all the patches, cd into the Bochs directory, then type
-	patch -p1 < ~/pintos/src/misc/bochs-2.1.1.patch
+	patch -p1 < $PINTOSROOT/src/misc/bochs-2.1.1.patch
 You will have to supply the proper path to the patch, of course.  You
 can provide the --dry-run option to patch if you want to test whether
 the patch would apply cleanly before actually patching.
@@ -33,6 +33,28 @@ the `pintos' utility:
 If you want the gdb stub, add --enable-gdb-stub
 If you want the internal debugger, add --enable-debugger
 
+Here are the commands used to build and install all the versions of
+Bochs we make available on the elaines:
+
+cd /tmp && tar xzf ~/bochs-2.1.1.tar.gz && cd bochs-2.1.1
+patch -p1 < $PINTOSROOT/src/misc/bochs-2.1.1.patch
+CFGOPTS="--with-x --with-x11 --with-term --with-nogui --prefix=/usr/class/cs140/i386"
+(mkdir plain &&
+ cd plain && 
+ ../configure $CFGOPTS && 
+ make && 
+ make install)
+(mkdir with-gdb &&
+ cd with-gdb &&
+ ../configure --enable-gdb-stub $CFGOPTS &&
+ make &&
+ cp bochs /usr/class/cs140/i386/bin/bochs-gdb)
+(mkdir with-dbg &&
+ cd with-dbg &&
+ ../configure --enable-debugger $CFGOPTS &&
+ make &&
+ cp bochs /usr/class/cs140/i386/bin/bochs-dbg)
+
 diff -urp orig/bochs-2.1.1/Makefile.in bochs-2.1.1/Makefile.in
 --- orig/bochs-2.1.1/Makefile.in	2004-02-11 14:28:02.000000000 -0800
 +++ bochs-2.1.1/Makefile.in	2004-09-13 15:05:26.281550000 -0700
-- 
2.30.2