* README: Update URLs, add more info.

        * resource/orp-1.0.9.patch: New file.
        * doc/www.gnu.org/doc/orp.wml: Update for ORP 1.0.9 release.

4 files changed, 63 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 50a024925..7fba80b5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-07  Mark Wielaard  <mark@klomp.org>
+
+	* README: Update URLs, add more info.
+	* resource/orp-1.0.9.patch: New file.
+	* doc/www.gnu.org/doc/orp.wml: Update for ORP 1.0.9 release.
+
 2002-02-07  C. Brian Jones <cbj@gnu.org>
 
 	* native/jni/java-lang/Makefile.am: removed empty SUBDIRS
diff --git a/README b/README
index 071fba4c1..f96806ef4 100644
--- a/README
+++ b/README
@@ -8,18 +8,29 @@ javadoc, javap, javah, and others.
 Eventually, these essential libraries for Java will work with as many 
 free JVMs as possible.  Virtual machines known to use GNU Classpath
 include:
-	* GCJ 		(http://sources.redhat.com/java/)
-	* ORP		(http://www.intel.com/research/mrl/orp/)
+	* GCJ 		(http://gcc.gnu.org/java/)
+	* ORP		(http://orp.sourceforge.net/)
 	* Kissme	(http://kissme.sourceforge.net/)
 	* SableVM	(http://www.sablevm.org/)
 	* Jupiter	(http://www.eecg.toronto.edu/~doylep/jupiter/)
+	* Joas		(http://www.oberon.ethz.ch/jaos/)
 
 This is a development release only and is not ready for general
 purpose use.
 
+GNU Classpath has been tested to work out of the box with the latest ORP
+release. Instructions for building ORP with this GNU Classpath release can
+be found at <http://www.gnu.org/software/classpath/doc/orp.html>.
+Most JVMs come with their own customized version of GNU Classpath.
+Please check if there is a customised version available for the JVM you
+use before trying the bare bones GNU Classpath release. We are working with
+the JVM creators to keep the differences between the core classes as small
+as possible. Please tell us if you make GNU Classpath work with a new JVM.
+
 See the file INSTALL for details on installing GNU Classpath.
 See the file NEWS for details on what is included in this release.
 See the file TODO for the latest to do list.
+See the file HACKING for working on (non-released) CVS development versions.
 
 Homepage: http://www.classpath.org/ or http://www.gnu.org/software/classpath/
 
diff --git a/doc/www.gnu.org/doc/orp.wml b/doc/www.gnu.org/doc/orp.wml
index 722f22507..3e069273d 100644
--- a/doc/www.gnu.org/doc/orp.wml
+++ b/doc/www.gnu.org/doc/orp.wml
@@ -8,7 +8,7 @@
 <lang:new id=en short>
 <lang:star:slice:>
 
-<set-var last-modified-author="<cbj>">
+<set-var last-modified-author="<mjw>">
 
 #include <include/macros.wml>
 
@@ -16,34 +16,30 @@
 <en>
 <p>
 The Open Runtime Platform (<link
-url="http://www.intel.com/research/mrl/orp/" name="ORP">) provides a
+url="http://orp.sourceforge.net/" name="ORP">) provides a
 covenient and simple platform for both using and testing GNU
-Classpath.  With the release of ORP 1.0.8, GNU Classpath's native
-libraries are finally supported almost out of the box.  A small patch
-is needed to correct a problem not detected before the release of this
-version of ORP and all subsequent versions are expected to work without
-it.  This patch is in Classpath's CVS tree,
-classpath/resource/orp-1.0.8.patch.
+Classpath.  With the release of ORP 1.0.9, GNU Classpath's native
+libraries are supported out of the box. 
 </p>
 
 <H4>Steps to use ORP+GNU Classpath on GNU/Linux</H4>
 <p>
-Example assumes ORP 1.0.8, see above.  In the example, Classpath CVS
-is in ~/cvs/classpath/.
+Example assumes ORP 1.0.9, see above.  In the example, GNU Classpath sources
+are in ~/src/classpath/.
 </p>
 <UL>
-  <LI>Obtain <link url="http://orp.sourceforge.net/" 
-       name="ORP"> from Sourceforge</LI>
+  <LI>Obtain <link url="http://sourceforge.net/projects/orp/" 
+       name="ORP"> from the Sourceforge project page</LI>
   <OL>
     <LI><tt>wget
-    http://prdownloads.sourceforge.net/orp/orp20011116.tgz</tt></LI>
-    <LI><tt>tar -xzvf orp20011116.tgz</tt></LI>
-    <LI><tt>mv orp orp-1.0.8</tt></LI>
+    http://prdownloads.sourceforge.net/orp/orp-1.0.9.tgz</tt></LI>
+    <LI><tt>tar -xzvf orp-1.0.9.tgz</tt></LI>
   </OL>
-  <LI>Apply the patch</LI>
+  <LI>On some systems you might need to apply a patch to work around
+  gcc compile problems</LI>
   <OL>
-    <LI><tt>cd orp-1.0.8</tt></LI>
-    <LI><tt>patch -p1 < ~/cvs/classpath/resource/orp-1.0.8.patch</tt></LI>
+    <LI><tt>cd orp-1.0.9</tt></LI>
+    <LI><tt>patch -p1 < ~/src/classpath/resource/orp-1.0.9.patch</tt></LI>
   </OL>
   <LI>Build ORP</LI>
   <OL>
@@ -51,7 +47,7 @@ is in ~/cvs/classpath/.
   </OL>
 </UL>
 <p>
-ORP should now be built and ready, orp-1.0.8/mains/orp/Linux/dbg/orp.
+ORP should now be built and ready, orp-1.0.9/mains/orp/Linux/dbg/orp.
 </p>
 <H4>Using ORP+GNU Classpath on GNU/Linux</H4>
 <p>
@@ -78,12 +74,14 @@ the default prefix.
 <UL>
   <LI>Running HelloWorld with ORP</LI>
   <OL>
-    <LI><tt>orp-1.0.8/mains/orp/Linux/dbg/orp -swapjit 0 1 -classpath
+    <LI>Create a <tt>HelloWorld.java</tt> file and compile to a class file
+    with <tt>jikes</tt> or <tt>gcj -C</tt></LI>
+    <LI><tt>orp-1.0.9/mains/orp/Linux/dbg/orp -swapjit 0 1 -classpath
     $CLASSPATH HelloWorld</tt></LI>
   </OL>
 </UL>
 <p>
-ORP contains two JITs at this time.  By default ORP 1.0.8 uses a
+ORP contains two JITs at this time.  By default ORP uses a
 so-called JIT 3 and for some things it appears to have more problems
 than when using JIT 1.  This is the reasoning behind adding the
 -swapjit 0 1 argument to ORP.  ORP does not have the ability at this
diff --git a/resource/orp-1.0.9.patch b/resource/orp-1.0.9.patch
new file mode 100644
index 000000000..1b84d8ac6
--- /dev/null
+++ b/resource/orp-1.0.9.patch
@@ -0,0 +1,25 @@
+diff -r -u orp-1.0.9.orig/arch/ia32/base/root_set_enum_ia32.cpp orp-1.0.9/arch/ia32/base/root_set_enum_ia32.cpp
+--- orp-1.0.9.orig/arch/ia32/base/root_set_enum_ia32.cpp	Thu Jan 17 06:49:40 2002
++++ orp-1.0.9/arch/ia32/base/root_set_enum_ia32.cpp	Thu Feb  7 15:13:02 2002
+@@ -35,9 +35,6 @@
+ #include "../x86/x86.h"
+ 
+ #ifdef ORP_POSIX
+-#ifdef __linux__
+-#include <asm/spinlock.h>
+-#endif
+ #include "platform2.h"
+ #endif
+ 
+diff -r -u orp-1.0.9.orig/base_natives/common_olv2/mon_enter_exit.cpp orp-1.0.9/base_natives/common_olv2/mon_enter_exit.cpp
+--- orp-1.0.9.orig/base_natives/common_olv2/mon_enter_exit.cpp	Thu Jan 17 06:49:40 2002
++++ orp-1.0.9/base_natives/common_olv2/mon_enter_exit.cpp	Thu Feb  7 15:13:57 2002
+@@ -294,7 +294,7 @@
+ #else
+ 		"nop;nop;nop"
+ #endif
+-		::: "memory"
++		: : : "memory"
+ 	);
+ 
+ #else