--- a/ChangeLog	Tue Nov 06 18:28:55 2012 +0100
+++ b/ChangeLog	Tue Nov 20 16:12:30 2012 +0000
@@ -1,3 +1,22 @@
+2012-11-20  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	RH513605: Updating/Installing OpenJDK should recreate
+	the shared class-data archive
+	* Makefile.am:
+	(icedtea-against-icedtea): Depend on add-archive.
+	(clean-icedtea-against-icedtea): Depend on clean-add-archive.
+	(icedtea-debug-against-icedtea): Depend on add-archive-debug.
+	(clean-icedtea-against-icedtea): Depend on clean-add-archive-debug.
+	(add-archive): Run -Xshare:dump on the newly built JDK.
+	(clean-add-archive): Delete stamp.
+	(add-archive-debug): Same as add-archive for icedtea-debug.
+	(clean-add-archive-debug): Same as clean-add-archive for icedtea-debug.
+	(icedtea-ecj-against-icedtea): Depend on add-archive-ecj.
+	(clean-icedtea-against-icedtea): Depend on clean-add-archive-ecj.
+	(add-archive-ecj): Same as add-archive for icedtea-ecj.
+	(clean-add-archive-ecj): Same as clean-add-archive for icedtea-ecj.
+	* NEWS: Mention.
+
 2012-11-06  Xerxes Rånby  <xerxes@zafena.se>
 	    Stefan Ring  <stefan@complang.tuwien.ac.at>
 
@@ -20,7 +39,7 @@
 	Add Garbage Collection dtrace/systemtap probes to hotspot.
 	* tapset/hotspot_gc.stp.in:
 	Systemtap tapset allowing use of GC probes more comfortablely.
-										
+
 2012-10-31  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* NEWS: Correct bad CVE number given by Oracle.

--- a/Makefile.am	Tue Nov 06 18:28:55 2012 +0100
+++ b/Makefile.am	Tue Nov 20 16:12:30 2012 +0000
@@ -1514,25 +1514,27 @@
 
 stamps/icedtea-against-icedtea.stamp: stamps/icedtea.stamp \
  stamps/add-jamvm.stamp stamps/add-cacao.stamp stamps/add-zero.stamp \
- stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp stamps/add-nss.stamp stamps/add-tzdata-support.stamp
+ stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp stamps/add-nss.stamp stamps/add-tzdata-support.stamp \
+ stamps/add-archive.stamp
 	mkdir -p stamps
 	touch stamps/icedtea-against-icedtea.stamp
 
 clean-icedtea-against-icedtea: clean-add-jamvm clean-add-zero clean-add-cacao \
- clean-add-systemtap clean-add-pulseaudio \
- clean-add-nss clean-add-tzdata-support
+ clean-add-systemtap clean-add-pulseaudio clean-add-nss clean-add-tzdata-support \
+ clean-add-archive
 	rm -f stamps/icedtea-against-icedtea.stamp
 
 stamps/icedtea-debug-against-icedtea.stamp: stamps/icedtea-debug.stamp \
  stamps/add-jamvm-debug.stamp stamps/add-cacao-debug.stamp \
  stamps/add-zero-debug.stamp stamps/add-systemtap-debug.stamp stamps/add-pulseaudio-debug.stamp \
- stamps/add-nss-debug.stamp stamps/add-tzdata-support-debug.stamp
+ stamps/add-nss-debug.stamp stamps/add-tzdata-support-debug.stamp stamps/add-archive-debug.stamp
 	mkdir -p stamps
 	touch stamps/icedtea-debug-against-icedtea.stamp
 
 clean-icedtea-debug-against-icedtea: clean-add-zero-debug \
  clean-add-jamvm-debug clean-add-cacao-debug clean-add-systemtap-debug \
- clean-add-pulseaudio-debug clean-add-nss-debug clean-add-tzdata-support-debug
+ clean-add-pulseaudio-debug clean-add-nss-debug clean-add-tzdata-support-debug \
+ clean-add-archive-debug
 	rm -f stamps/icedtea-debug-against-icedtea.stamp
 
 stamps/add-systemtap.stamp: stamps/icedtea.stamp
@@ -1766,6 +1768,20 @@
 	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties
 	rm -f stamps/add-tzdata-support-debug.stamp
 
+stamps/add-archive.stamp: stamps/icedtea.stamp
+	$(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump
+	touch stamps/add-archive.stamp
+
+clean-add-archive:
+	rm -f stamps/add-archive.stamp
+
+stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp
+	$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump
+	touch stamps/add-archive-debug.stamp
+
+clean-add-archive-debug:
+	rm -f stamps/add-archive-debug.stamp
+
 # OpenJDK ecj Targets
 # ===================
 
@@ -1786,12 +1802,13 @@
 	rm -f stamps/icedtea-ecj.stamp
 
 stamps/icedtea-against-ecj.stamp: stamps/icedtea-ecj.stamp stamps/add-systemtap-ecj.stamp \
- stamps/add-pulseaudio-ecj.stamp stamps/add-nss-ecj.stamp stamps/add-tzdata-support-ecj.stamp
+ stamps/add-pulseaudio-ecj.stamp stamps/add-nss-ecj.stamp stamps/add-tzdata-support-ecj.stamp \
+ stamps/add-archive-ecj.stamp
 	mkdir -p stamps
 	touch stamps/icedtea-against-ecj.stamp
 
 clean-icedtea-against-ecj: clean-add-systemtap-ecj clean-add-pulseaudio-ecj clean-add-nss-ecj \
- clean-add-tzdata-support-ecj
+ clean-add-tzdata-support-ecj clean-add-archive-ecj
 	rm -f stamps/icedtea-against-ecj.stamp
 
 stamps/add-systemtap-ecj.stamp: stamps/icedtea-ecj.stamp
@@ -1910,6 +1927,13 @@
 	rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties
 	rm -f stamps/add-tzdata-support-ecj.stamp
 
+stamps/add-archive-ecj.stamp: stamps/icedtea-ecj.stamp
+	$(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump
+	touch stamps/add-archive-ecj.stamp
+
+clean-add-archive-ecj:
+	rm -f stamps/add-archive-ecj.stamp
+
 # Rebuild targets
 
 rebuild:
@@ -2495,6 +2519,12 @@
 # Target Aliases
 # ===============
 
+add-archive: stamps/add-archive.stamp
+
+add-archive-debug: stamps/add-archive-debug.stamp
+
+add-archive-ecj: stamps/add-archive-ecj.stamp
+
 bootstrap-directory-ecj: stamps/bootstrap-directory-ecj.stamp
 
 bootstrap-directory: stamps/bootstrap-directory.stamp

--- a/NEWS	Tue Nov 06 18:28:55 2012 +0100
+++ b/NEWS	Tue Nov 20 16:12:30 2012 +0000
@@ -56,6 +56,7 @@
     are actually missing from the boot JDK
   - PR1114: Provide option to turn off downloading of tarballs (--disable-downloading)
   - PR1176: Synchronise CACAO rules between IcedTea6/7/8 where possible
+  - RH513605: Updating/Installing OpenJDK should recreate the shared class-data archive
 * CACAO
   - PR1120: Unified version for icedtea6/7
   - CA166, CA167: check-langtools fixes for icedtea6