From: Ben Pfaff <blp@cs.stanford.edu>
Date: Wed, 5 Apr 2006 17:59:30 +0000 (+0000)
Subject: Explain new patches.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a83158ac08bc6ff903a6826d94431d825a19ef56;p=pintos-anon

Explain new patches.
---

diff --git a/src/misc/bochs-2.2.6.README b/src/misc/bochs-2.2.6.README
index cd5bc96..3d38b54 100644
--- a/src/misc/bochs-2.2.6.README
+++ b/src/misc/bochs-2.2.6.README
@@ -12,9 +12,20 @@ patches for this version of Bochs are included:
 	Adds the `jitter' feature described in the project documentation,
 	in which timer interrupts are delivered at random intervals.
 
+    bochs-2.2.6-ms-extensions.patch
+
+        Needed for Bochs to compile with GCC on some hosts.  Probably
+        harmless elsewhere.
+
+    bochs-2.2.6-solaris.patch
+
+        Needed on Solaris hosts.  Do not apply it elsewhere.
+
 To apply all the patches, cd into the Bochs directory, then type
 	patch -p1 < $PINTOSDIR/src/misc/bochs-2.2.6-big-endian.patch
 	patch -p1 < $PINTOSDIR/src/misc/bochs-2.2.6-jitter.patch
+	patch -p1 < $PINTOSDIR/src/misc/bochs-2.2.6-ms-extensions.patch
+	patch -p1 < $PINTOSDIR/src/misc/bochs-2.2.6-solaris.patch
 You will have to supply the proper $PINTOSDIR, of course.  You can use
 patch's --dry-run option if you want to test whether the patches would
 apply cleanly before trying to apply them.