# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1374862574 -3600
# Node ID 57c98935315a7ab9e258351c95d94bef548910fe
# Parent  bd984d4f1e71db42be467bffc8c42e7c2cc9fdac
Bring in forest changes for 2.3.12.

2013-07-26  Andrew John Hughes  <gnu.andrew@member.fsf.org>

	* Makefile.am:
	(CORBA_CHANGESET): Update to IcedTea 2.3.12 tag.
	(JAXP_CHANGESET): Likewise.
	(JAXWS_CHANGESET): Likewise.
	(JDK_CHANGESET): Likewise.
	(LANGTOOLS_CHANGESET): Likewise.
	(OPENJDK_CHANGESET): Likewise.
	(CORBA_SHA256SUM): Likewise.
	(JAXP_SHA256SUM): Likewise.
	(JAXWS_SHA256SUM): Likewise.
	(JDK_SHA256SUM): Likewise.
	(LANGTOOLS_SHA256SUM): Likewise.
	(OPENJDK_SHA256SUM): Likewise.
	* NEWS: Add changes from forest.
	* hotspot.map: Update default to IcedTea 2.3.12 HotSpot
	tag.

diff -r bd984d4f1e71 -r 57c98935315a ChangeLog
--- a/ChangeLog	Fri Jul 26 19:14:38 2013 +0100
+++ b/ChangeLog	Fri Jul 26 19:16:14 2013 +0100
@@ -1,4 +1,23 @@
-2013-07-25  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+2013-07-26  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to IcedTea 2.3.12 tag.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	* NEWS: Add changes from forest.
+	* hotspot.map: Update default to IcedTea 2.3.12 HotSpot
+	tag.
+
+2013-07-26  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* configure.ac: Bump to 2.3.12pre.
 	* NEWS: Add section for 2.3.12.
diff -r bd984d4f1e71 -r 57c98935315a Makefile.am
--- a/Makefile.am	Fri Jul 26 19:14:38 2013 +0100
+++ b/Makefile.am	Fri Jul 26 19:16:14 2013 +0100
@@ -4,19 +4,19 @@
 JDK_UPDATE_VERSION = 25
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
-CORBA_CHANGESET = eda3895cb67e
-JAXP_CHANGESET = 181faea8867b
-JAXWS_CHANGESET = 5dc89903bfc7
-JDK_CHANGESET = 0a482b2f7c35
-LANGTOOLS_CHANGESET = e2c5f493844a
-OPENJDK_CHANGESET = f143f229bd12
+CORBA_CHANGESET = ea108ff3be9a
+JAXP_CHANGESET = 332f0234a53e
+JAXWS_CHANGESET = fdc4ad9f30c6
+JDK_CHANGESET = 4a0cf2c05cc6
+LANGTOOLS_CHANGESET = 6c9b532f4281
+OPENJDK_CHANGESET = e62743867f54
 
-CORBA_SHA256SUM = 7e1201261a38b588c1e87224c3480602b5eedd5d821d7c6cb41fdcf1271c2201
-JAXP_SHA256SUM = 71309e488b91266008c8573a32933f66502ddc10e31f808cb8f5fc04caa30f84
-JAXWS_SHA256SUM = 6fac4c4f6afd4ea61d2926987f24f0661f34c71e8947dd86340a0081c2988703
-JDK_SHA256SUM = c24a265ca703e32e742496447f95a49648f49a5577b0fb097865bed32a698032
-LANGTOOLS_SHA256SUM = e964e25b137d5c8a145df60b7cfee67538417191f9f6dd3c59dfe388a40c3b6f
-OPENJDK_SHA256SUM = 80b1aba00ebd6ea0abc0b857ec7fc86c99a7b476d93c78dd35518034ce85956f
+CORBA_SHA256SUM = 818f5613b218fe2a2036e6c65622b970839986c0c1ca95563f911b379a52b765
+JAXP_SHA256SUM = a3f99615331cdc3d5e38e7169bb4b03dc43ede25c73834114240b8768207b9dc
+JAXWS_SHA256SUM = b149c1fab323a586eae9b4459ccd929f0db8b35769e42dd7f4fbadc48b803dab
+JDK_SHA256SUM = badbbf50c820325ffe592762a2eff3414df71e286460b75716a2100d7f6f2aa0
+LANGTOOLS_SHA256SUM = b9e2e3c97393f566b0c4dc2b0ca826bfb3b3841f5522a850b82d1ff23745839b
+OPENJDK_SHA256SUM = 7bc64e2285b5bfefeb6a3900729c58beb2f04f2c57184a4fe48341c5087c3f61
 
 CACAO_VERSION = a567bcb7f589
 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
diff -r bd984d4f1e71 -r 57c98935315a NEWS
--- a/NEWS	Fri Jul 26 19:14:38 2013 +0100
+++ b/NEWS	Fri Jul 26 19:16:14 2013 +0100
@@ -12,6 +12,12 @@
 
 New in release 2.3.12 (2013-XX-XX):
 
+* ARM Port
+  - Set Zero flags for ARM32 in jdk_generic_profile.sh
+  - Tell gcc explicitly that the bytecodes_arm.def input from stdin is C++, allowing C++ flags to be used.
+  - Use $(CC) as before for bytecodes_arm.s and mkoffsets targets
+  - Include $(CFLAGS) in assembler stage
+
 New in release 2.3.11 (2013-07-24):
 
 * System LCMS 2 support again enabled by default, requiring 2.5 or above.
diff -r bd984d4f1e71 -r 57c98935315a hotspot.map
--- a/hotspot.map	Fri Jul 26 19:14:38 2013 +0100
+++ b/hotspot.map	Fri Jul 26 19:16:14 2013 +0100
@@ -1,2 +1,2 @@
 # version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4413a836dcc7 f04724b1a971ea9fd12a57ecc0670d88e6f43af8024655173a6df38b8de17305
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 37b254871acb 60268f9d792575ec26b8796753246aca70282937327c2fa855b3f0010638605e