--- a/ChangeLog	Wed Jul 22 15:10:10 2015 +0100
+++ b/ChangeLog	Wed Jul 22 15:22:58 2015 +0100
@@ -1,3 +1,18 @@
+2015-07-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR2342: Update README & INSTALL files
+	* INSTALL: Remove dead --with-xalan2-jar,
+	--with-xalan2-serializer-jar,
+	--with-xerces2-jar options. Document --with-jdk-home.
+	Move --enable-system-kerberos to be listed with other
+	system library options. Mention ARM32 JIT.
+	* NEWS: Updated.
+	* README: Mention ARM32 JIT and OpenJDK
+	compatibility testing page.
+	* acinclude.m4:
+	(IT_CHECK_FOR_JDK): Add plain java-1.6.0-openjdk to
+	ICEDTEA6_VMS.
+
 2014-06-12  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR2340: Fail early if there is no native HotSpot JIT

--- a/INSTALL	Wed Jul 22 15:10:10 2015 +0100
+++ b/INSTALL	Wed Jul 22 15:22:58 2015 +0100
@@ -91,6 +91,9 @@
   downloading and extracting a tarball.
 * --enable-system-lcms: Build using the system installation of LCMS2, not
   the version in-tree.
+* --enable-system-kerberos: Link against the system Kerberos library and
+  query it at runtime to obtain the cache location, rather than using a
+  hardcoded value.
 * --with-gcj: Compile ecj to native code with gcj prior to building.
 * --disable-bootstrap: Perform a quick build using an installed
   copy of IcedTea6.  If a directory is not specified, a check against
@@ -128,22 +131,6 @@
     - /usr/share/java/eclipse-ecj.jar
     - /usr/share/java/ecj.jar
     - /usr/share/eclipse-ecj-3.{2,3,4,5}/lib/ecj.jar
-* --with-xalan2-jar: Specify the location of a xalan2 JAR file.  By default, the
-  following paths are checked:
-    - /usr/share/java/xalan-j2.jar
-    - /usr/share/java/xalan2.jar
-    - /usr/share/xalan/lib/xalan.jar
-* --with-xalan2-serializer-jar: Specify the location of a xalan2 serializer JAR file.
-  By default, the following paths are checked:
-    - /usr/share/java/xalan-j2-serializer.jar
-    - /usr/share/xalan-serializer/lib/serializer.jar
-    - /usr/share/java/serializer.jar
-* --with-xerces2-jar: Specify the location of a xerces2 JAR file.  By default, the
-  following paths are checked:
-    - /usr/share/java/xerces-j2.jar
-    - /usr/share/java/xerces2.jar
-    - /usr/share/xerces-2/lib/xercesImpl.jar
-    - /usr/share/java/xercesImpl.jar
 * --with-openjdk-src-zip: Specify the location of the OpenJDK tarball to avoid downloading.
 * --with-hotspot-src-zip: Specify the location of the HotSpot tarball to avoid downloading.
 * --with-alt-jar: Use the specified jar binary in the second stage rather than the one just built.
@@ -174,9 +161,6 @@
 * --with-additional-vms=vm-list: Additional VMs to build using the system described
   below.
 * --enable-lcms2: Use LCMS 2 backport from OpenJDK 7 rather than LCMS 1.
-* --enable-system-kerberos: Link against the system Kerberos library and
-  query it at runtime to obtain the cache location, rather than using a
-  hardcoded value.
 
 Testing
 =======
@@ -289,6 +273,9 @@
 --enable-shark to configure.  Please note that Shark is still in
 development and builds are still likely to fail at present.
 
+On ARM32, there is also a native JIT port built on top of Zero, which
+is built on this platform by default.
+
 Support for Different Versions of HotSpot
 =========================================
 

--- a/NEWS	Wed Jul 22 15:10:10 2015 +0100
+++ b/NEWS	Wed Jul 22 15:22:58 2015 +0100
@@ -48,6 +48,7 @@
  * Bug fixes
   - PR2319: Checksum of policy JAR files changes on every build
   - PR2340: Fail early if there is no native HotSpot JIT & all other options are disabled
+  - PR2342: Update README & INSTALL files
   - PR2460: Policy JAR files should be timestamped with the date of the policy file they hold
   - PR2481, RH489586, RH1236619: OpenJDK can't handle spaces in zone names in /etc/sysconfig/clock
   - PR2486: JSSE server is still limited to 768-bit DHE

--- a/README	Wed Jul 22 15:10:10 2015 +0100
+++ b/README	Wed Jul 22 15:22:58 2015 +0100
@@ -32,8 +32,11 @@
 IcedTea6 is derived from OpenJDK6, Oracle's open-source implementation of
 the Java SE 6 platform and implements the Java SE 6 Platform
 Specification.  Binaries produced by IcedTea6 have been known to pass
-the TCK for Java 6.  IcedTea6 additionally provides autotools support,
-and ARM support.
+the TCK for Java 6.  IcedTea6 provides additional features including
+autotools support and ARM32 support.
+
+See http://openjdk.java.net/groups/conformance/ for information on
+compatibility testing.
 
 A Note About License Headers
 ----------------------------
@@ -41,7 +44,7 @@
 Some sources downloaded from openjdk.java.net do not display the GPL
 license header.  Instances are:
 
- - We are assuming that these files are owned by Sun:
+ - We are assuming that these files are owned by Sun/Oracle:
    openjdk/jdk/src/share/classes/**/resources/*.properties
 
 The Zero Assembler and Shark Ports
@@ -62,6 +65,9 @@
 
 Both Zero and Shark are now part of upstream OpenJDK.
 
+On ARM32, IcedTea6 adds a native JIT port built on top of Zero, which
+is built on this platform by default.
+
 CACAO as VM
 ===========
 

--- a/acinclude.m4	Wed Jul 22 15:10:10 2015 +0100
+++ b/acinclude.m4	Wed Jul 22 15:22:58 2015 +0100
@@ -1097,8 +1097,8 @@
       BOOTSTRAP_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk /usr/lib/jvm/cacao";
     fi
     ICEDTEA6_VMS="/usr/lib/jvm/icedtea-6 /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk
-    		  /usr/lib/jvm/java-1.6.0-openjdk.x86_64 /usr/lib64/jvm/java-1.6.0-openjdk
-		  /usr/lib/jvm/java-1.6.0"
+    		  /usr/lib/jvm/java-1.6.0-openjdk /usr/lib/jvm/java-1.6.0-openjdk.x86_64
+		  /usr/lib64/jvm/java-1.6.0-openjdk /usr/lib/jvm/java-1.6.0"
     for dir in ${BOOTSTRAP_VMS} ${ICEDTEA6_VMS} \
     	       /usr/lib/jvm/java-openjdk /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea \
 	       /etc/alternatives/java_sdk_openjdk ; do