/hg/icedtea: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jul 14 16:55:21 PDT 2011
changeset 3b8e8ce0aede in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3b8e8ce0aede
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jul 14 21:12:04 2011 +0100
Prepare for 8.
2011-07-14 Andrew John Hughes <ahughes at redhat.com>
Update for 8.
* Makefile.am: (OPENJDK_VERSION): Set to b00.
(ICEDTEA_PREFIX): Set to icedtea8-forest. (OPENJDK_HG_URL):
Use OpenJDK8 tree. (CACIOCAVALLO_HG_URL): Likewise.
(ICEDTEA_NAME): Change to IcedTea8.
changeset 217390811b61 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=217390811b61
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jul 15 00:55:03 2011 +0100
Support tip of IcedTea8 forest.
2011-07-13 Andrew John Hughes <ahughes at redhat.com>
Bump to tip.
* Makefile.am: (CORBA_CHANGESET): Updated.
(HOTSPOT_CHANGESET): Likewise. (JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET):
Likewise. (CORBA_SHA256SUM): Likewise.
(HOTSPOT_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM):
Likewise. (JAXWS_DROP_ZIP): Likewise.
(JAXWS_DROP_SHA256SUM): Likewise. (JAXP_DROP_ZIP): Likewise.
(JAXP_DROP_SHA256SUM): Likewise. (bootstrap-directory-
stage1): Use our script for javah.
* configure.ac: Generate script for javah.
* javah.in: Filter -X commands from javah.
* patches/boot/ecj-autoboxing.patch: Updated to apply against
b147.
* patches/boot/ecj-diamond.patch,
* patches/boot/ecj-stringswitch.patch: Likewise and add new
cases.
* patches/boot/xbootclasspath.patch: Updated against IcedTea8
forest.
diffstat:
ChangeLog | 49 +-
Makefile.am | 48 +-
configure.ac | 1 +
javah.in | 4 +
patches/boot/ecj-autoboxing.patch | 56 +-
patches/boot/ecj-diamond.patch | 1862 +++++++++++++++-------------------
patches/boot/ecj-stringswitch.patch | 119 +-
patches/boot/xbootclasspath.patch | 24 +-
8 files changed, 1023 insertions(+), 1140 deletions(-)
diffs (truncated from 3896 to 500 lines):
diff -r 5abf79d696a1 -r 217390811b61 ChangeLog
--- a/ChangeLog Thu Jul 14 11:32:39 2011 +0200
+++ b/ChangeLog Fri Jul 15 00:55:03 2011 +0100
@@ -1,7 +1,52 @@
+2011-07-13 Andrew John Hughes <ahughes at redhat.com>
+
+ Bump to tip.
+ * Makefile.am:
+ (CORBA_CHANGESET): Updated.
+ (HOTSPOT_CHANGESET): Likewise.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (HOTSPOT_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (JAXWS_DROP_ZIP): Likewise.
+ (JAXWS_DROP_SHA256SUM): Likewise.
+ (JAXP_DROP_ZIP): Likewise.
+ (JAXP_DROP_SHA256SUM): Likewise.
+ (bootstrap-directory-stage1): Use our
+ script for javah.
+ * configure.ac:
+ Generate script for javah.
+ * javah.in: Filter -X commands from javah.
+ * patches/boot/ecj-autoboxing.patch:
+ Updated to apply against b147.
+ * patches/boot/ecj-diamond.patch,
+ * patches/boot/ecj-stringswitch.patch:
+ Likewise and add new cases.
+ * patches/boot/xbootclasspath.patch:
+ Updated against IcedTea8 forest.
+
+2011-07-14 Andrew John Hughes <ahughes at redhat.com>
+
+ Update for 8.
+ * Makefile.am:
+ (OPENJDK_VERSION): Set to b00.
+ (ICEDTEA_PREFIX): Set to icedtea8-forest.
+ (OPENJDK_HG_URL): Use OpenJDK8 tree.
+ (CACIOCAVALLO_HG_URL): Likewise.
+ (ICEDTEA_NAME): Change to IcedTea8.
+
2011-07-14 Mark Wielaard <mark at klomp.org>
- * Makefile.am (CORBA_SHA256SUM): Updated for new icedtea hg server
- settings.
+ * Makefile.am (CORBA_SHA256SUM): Updated for new
+ icedtea hg server settings.
(HOTSPOT_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
diff -r 5abf79d696a1 -r 217390811b61 Makefile.am
--- a/Makefile.am Thu Jul 14 11:32:39 2011 +0200
+++ b/Makefile.am Fri Jul 15 00:55:03 2011 +0100
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b143
+OPENJDK_VERSION = b00
-CORBA_CHANGESET = 279c876d1001
-HOTSPOT_CHANGESET = f7e8b10f51c6
-JAXP_CHANGESET = d8cdc48a42bd
-JAXWS_CHANGESET = e514ae6ec042
-JDK_CHANGESET = d28f54a421b1
-LANGTOOLS_CHANGESET = 1316e51b3995
-OPENJDK_CHANGESET = 2108c94c0d3d
+CORBA_CHANGESET = 635ebbe236a9
+HOTSPOT_CHANGESET = dc6631a3d175
+JAXP_CHANGESET = bf4b076e4556
+JAXWS_CHANGESET = 8ff499dc157f
+JDK_CHANGESET = dc5df74132b6
+LANGTOOLS_CHANGESET = 8caec3672381
+OPENJDK_CHANGESET = 5057eaa7e88a
-CORBA_SHA256SUM = c13569b05931c858c0bb999e160aa89208b507ce5591b068d9b8b672fba34b19
-HOTSPOT_SHA256SUM = 6fd67e0875b0dbba01b0162c1660deee7642b53acd7358bc207f09ff5a2ad828
-JAXP_SHA256SUM = 5cbc5f855815cc327fc59452c87116521c2417d7bcbe42229fbb0f7a872dc691
-JAXWS_SHA256SUM = 9695be9ec5d394bd9212093f03c4064ce4cf29119163e66944692976700a1956
-JDK_SHA256SUM = 7fa59b0e0d803b603c176b1b1d34375adb417567e31a3735e6e229810266f027
-LANGTOOLS_SHA256SUM = 41d51de84b8865718fa9085f76bb2f64a2ec5af03d458a7fd2cf49c2fd5e4d7e
-OPENJDK_SHA256SUM = adb23e8fe1e2e4fd2f34cfdf57ede78aa3e6f983af113bb8fd7dfe073f343d17
+CORBA_SHA256SUM = 7a1169d8f6e61bb3a24eba710ad4d278ddeedbb60760eb1dda7f2792171be8cb
+HOTSPOT_SHA256SUM = 4fe84dbe91df547c076119c4f7608ebecbf0423bc4613c8a1638a0ba62e163bc
+JAXP_SHA256SUM = 4032185df59e093e9401160e2b474507055d64a8d7b6e7d5580c721c13e7050c
+JAXWS_SHA256SUM = 6d3ce845a2cec9a321cb23fd8039e1c6dce3ad78610f5fc92016ca1a042e1687
+JDK_SHA256SUM = 28694bd1a0ec60c5dd1829829074ce57c920a4c9b3df6ca4d95629af3dcf39a3
+LANGTOOLS_SHA256SUM = e200d58705b1c144f367679ae2091ab070ecd8c9bc9c06c95b0508fb5a252c1f
+OPENJDK_SHA256SUM = c0a48e6c8c5251ed86efb4adee0638587052b8308237e4933b4b2448b51dd962
CACAO_VERSION = d6264eb66506
CACAO_SHA256SUM = 94ea7899e806ccbc33a732b5113a8f969d8b1f4ce7ffd27cf04577054f65f63c
@@ -31,21 +31,21 @@
JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
JAXWS_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXWS_DROP_ZIP = jdk7-jaxws2_2_4-b02-2011_05_09.zip
-JAXWS_DROP_SHA256SUM = 2fd874aae97a4206c8f4cd93ee419c09f95c3f684349182b66b6ee9010c72f84
+JAXWS_DROP_ZIP = jdk7-jaxws2_2_4-b03-2011_05_27.zip
+JAXWS_DROP_SHA256SUM = 05ae7259b75d0f2307276d61ece1887fcd437cb4ecda42fab8c22d4b537effd6
JAF_DROP_URL = http://icedtea.classpath.org/download/drops
JAF_DROP_ZIP = jdk7-jaf-2010_08_19.zip
JAF_DROP_SHA256SUM = e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e
JAXP_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXP_DROP_ZIP = jaxp-1_4_5.zip
-JAXP_DROP_SHA256SUM = 8145a789a61d21d0ff9902e4dc1c7ba492bb407ee614187dc933321922249ddb
+JAXP_DROP_ZIP = jaxp145_01.zip
+JAXP_DROP_SHA256SUM = c5924c6188988e2e8397ee5143bd8eaa062569d052567afd2ac9326a54a848cb
-ICEDTEA_PREFIX = icedtea7-forest
+ICEDTEA_PREFIX = icedtea8-forest
ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX)
-OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
+OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk8/jdk8
CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/
CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/
-CACIOCAVALLO_HG_URL = http://hg.openjdk.java.net/caciocavallo/jdk7/
+CACIOCAVALLO_HG_URL = http://hg.openjdk.java.net/caciocavallo/jdk8/
BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port
NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/
@@ -424,7 +424,7 @@
JDK_UPDATE_VERSION = $(shell echo $(OPENJDK_VERSION) | sed -e "s/^b//")
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-ICEDTEA_NAME = IcedTea7
+ICEDTEA_NAME = IcedTea8
if HAS_ICEDTEA_REVISION
ICEDTEA_REV = +${ICEDTEA_REVISION}
endif
@@ -1671,7 +1671,7 @@
stamps/bootstrap-directory-stage1.stamp: stamps/native-ecj.stamp
mkdir -p $(STAGE1_BOOT_DIR)/bin stamps/
ln -sf $(JAVA) $(STAGE1_BOOT_DIR)/bin/java
- ln -sf $(JAVAH) $(STAGE1_BOOT_DIR)/bin/javah
+ ln -sf ../../../javah $(STAGE1_BOOT_DIR)/bin/javah
ln -sf $(RMIC) $(STAGE1_BOOT_DIR)/bin/rmic
ln -sf $(JAR) $(STAGE1_BOOT_DIR)/bin/jar
ln -sf $(NATIVE2ASCII) $(STAGE1_BOOT_DIR)/bin/native2ascii
diff -r 5abf79d696a1 -r 217390811b61 configure.ac
--- a/configure.ac Thu Jul 14 11:32:39 2011 +0200
+++ b/configure.ac Fri Jul 15 00:55:03 2011 +0100
@@ -107,6 +107,7 @@
fi
AC_CONFIG_FILES([javac], [chmod +x javac])
AC_CONFIG_FILES([javap], [chmod +x javap])
+AC_CONFIG_FILES([javah], [chmod +x javah])
IT_JAVAH
IT_LIBRARY_CHECK
diff -r 5abf79d696a1 -r 217390811b61 javah.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/javah.in Fri Jul 15 00:55:03 2011 +0100
@@ -0,0 +1,4 @@
+#!/usr/bin/perl -w
+use strict;
+
+exec '@JAVAH@', (grep !/^-X/, @ARGV) ;
diff -r 5abf79d696a1 -r 217390811b61 patches/boot/ecj-autoboxing.patch
--- a/patches/boot/ecj-autoboxing.patch Thu Jul 14 11:32:39 2011 +0200
+++ b/patches/boot/ecj-autoboxing.patch Fri Jul 15 00:55:03 2011 +0100
@@ -1,7 +1,7 @@
-diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/CallSite.java
---- openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java Wed Apr 20 04:38:36 2011 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java Sat Apr 30 02:38:41 2011 +0100
-@@ -309,7 +309,7 @@
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/CallSite.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/CallSite.java 2011-07-12 12:43:47.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java 2011-07-12 15:12:13.210932096 +0100
+@@ -329,7 +329,7 @@
private static Object maybeReBox(Object x) {
if (x instanceof Integer) {
@@ -10,10 +10,10 @@
if (xi == (byte) xi)
x = xi; // must rebox; see JLS 5.1.7
}
-diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/FromGeneric.java
---- openjdk-boot/jdk/src/share/classes/java/lang/invoke/FromGeneric.java Wed Apr 20 04:38:36 2011 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/FromGeneric.java Sat Apr 30 02:38:41 2011 +0100
-@@ -502,10 +502,10 @@
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/FromGeneric.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/FromGeneric.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/FromGeneric.java 2011-06-11 00:38:08.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/FromGeneric.java 2011-07-12 15:12:13.210932096 +0100
+@@ -505,10 +505,10 @@
protected A0 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
{ return new A0(e, i, c, t); }
protected Object invoke_L0() throws Throwable { return convert_L((Object)invoker.invokeExact(target)); }
@@ -28,7 +28,7 @@
}
static class A1 extends Adapter {
protected A1(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
-@@ -514,10 +514,10 @@
+@@ -517,10 +517,10 @@
protected A1 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
{ return new A1(e, i, c, t); }
protected Object invoke_L1(Object a0) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0)); }
@@ -43,7 +43,7 @@
}
static class A2 extends Adapter {
protected A2(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
-@@ -526,10 +526,10 @@
+@@ -529,10 +529,10 @@
protected A2 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
{ return new A2(e, i, c, t); }
protected Object invoke_L2(Object a0, Object a1) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1)); }
@@ -58,7 +58,7 @@
}
static class A3 extends Adapter {
protected A3(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
-@@ -538,10 +538,10 @@
+@@ -541,10 +541,10 @@
protected A3 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
{ return new A3(e, i, c, t); }
protected Object invoke_L3(Object a0, Object a1, Object a2) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2)); }
@@ -73,7 +73,7 @@
}
static class A4 extends Adapter {
protected A4(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
-@@ -550,10 +550,10 @@
+@@ -553,10 +553,10 @@
protected A4 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
{ return new A4(e, i, c, t); }
protected Object invoke_L4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3)); }
@@ -88,7 +88,7 @@
}
static class A5 extends Adapter {
protected A5(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
-@@ -562,10 +562,10 @@
+@@ -565,10 +565,10 @@
protected A5 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
{ return new A5(e, i, c, t); }
protected Object invoke_L5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4)); }
@@ -103,7 +103,7 @@
}
static class A6 extends Adapter {
protected A6(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
-@@ -574,10 +574,10 @@
+@@ -577,10 +577,10 @@
protected A6 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
{ return new A6(e, i, c, t); }
protected Object invoke_L6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); }
@@ -118,7 +118,7 @@
}
static class A7 extends Adapter {
protected A7(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
-@@ -586,10 +586,10 @@
+@@ -589,10 +589,10 @@
protected A7 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
{ return new A7(e, i, c, t); }
protected Object invoke_L7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); }
@@ -133,7 +133,7 @@
}
static class A8 extends Adapter {
protected A8(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
-@@ -598,10 +598,10 @@
+@@ -601,10 +601,10 @@
protected A8 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
{ return new A8(e, i, c, t); }
protected Object invoke_L8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); }
@@ -148,7 +148,7 @@
}
static class A9 extends Adapter {
protected A9(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
-@@ -610,10 +610,10 @@
+@@ -613,10 +613,10 @@
protected A9 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
{ return new A9(e, i, c, t); }
protected Object invoke_L9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); }
@@ -163,7 +163,7 @@
}
static class A10 extends Adapter {
protected A10(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
-@@ -622,9 +622,9 @@
+@@ -625,9 +625,9 @@
protected A10 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)
{ return new A10(e, i, c, t); }
protected Object invoke_L10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }
@@ -177,10 +177,10 @@
+ protected Object invoke_D10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); }
}
}
-diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/MethodHandleImpl.java
---- openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Wed Apr 20 04:38:36 2011 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Sat Apr 30 02:38:41 2011 +0100
-@@ -832,52 +832,52 @@
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2011-07-12 12:43:47.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2011-07-12 15:12:13.214932157 +0100
+@@ -956,52 +956,52 @@
return addTypeString(target, this);
}
private Object invoke_V(Object... av) throws Throwable {
@@ -243,10 +243,10 @@
return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7);
return fallback.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7);
}
-diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/ToGeneric.java
---- openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java Wed Apr 20 04:38:36 2011 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java Sat Apr 30 02:38:41 2011 +0100
-@@ -390,10 +390,10 @@
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/ToGeneric.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/ToGeneric.java 2011-06-11 00:38:08.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java 2011-07-12 15:12:13.214932157 +0100
+@@ -394,10 +394,10 @@
// Code to run when the generic target has finished and produced a value.
protected Object return_L(Object res) throws Throwable { return (Object)convert.invokeExact(res); }
@@ -261,22 +261,22 @@
static private final String CLASS_PREFIX; // "java.lang.invoke.ToGeneric$"
static {
-diff -r d28f54a421b1 src/share/classes/sun/invoke/util/ValueConversions.java
---- openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java Mon Jun 13 15:58:42 2011 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java Thu Jun 23 17:29:41 2011 +0100
-@@ -209,9 +209,9 @@
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2011-07-12 14:52:51.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2011-07-12 15:12:50.499499088 +0100
+@@ -223,9 +223,9 @@
if (x instanceof Number) {
res = (Number) x;
} else if (x instanceof Boolean) {
-- res = ((boolean)x ? 1 : 0);
-+ res = ((Boolean)x ? 1 : 0);
+- res = ((boolean)x ? ONE_INT : ZERO_INT);
++ res = ((Boolean)x ? ONE_INT : ZERO_INT);
} else if (x instanceof Character) {
- res = (int)(char)x;
+ res = (int)(Character)x;
} else {
// this will fail with the required ClassCastException:
res = (Number) x;
-@@ -371,7 +371,7 @@
+@@ -386,7 +386,7 @@
static int unboxRawInteger(Object x) {
if (x instanceof Integer)
diff -r 5abf79d696a1 -r 217390811b61 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Thu Jul 14 11:32:39 2011 +0200
+++ b/patches/boot/ecj-diamond.patch Fri Jul 15 00:55:03 2011 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-04-14 01:29:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-06-14 02:06:39.313002689 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-07-12 16:56:06.686259706 +0100
@@ -104,9 +104,9 @@
return this.def.compareTo(that.def);
}
@@ -72,8 +72,8 @@
for (int i = 0; i < layout.length(); i++) {
if (layout.charAt(i++) != '[')
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-06-14 01:54:53.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-06-14 02:06:39.329002971 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-07-12 15:23:26.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-07-12 16:56:06.702259970 +0100
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -136,8 +136,8 @@
return true;
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-06-14 01:54:52.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-06-14 02:06:39.329002971 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-07-12 15:23:26.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-07-12 16:56:06.702259970 +0100
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -149,7 +149,7 @@
new InnerClass(readClassRef(),
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2011-04-14 01:29:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2011-06-14 02:06:39.329002971 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2011-07-12 16:56:06.702259970 +0100
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -187,7 +187,7 @@
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2011-04-14 01:29:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2011-06-14 02:06:39.329002971 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2011-07-12 16:56:06.702259970 +0100
@@ -402,7 +402,7 @@
private static Map<Coding, Coding> codeMap;
@@ -199,7 +199,7 @@
if (x1 == null) codeMap.put(x0, x1 = x0);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2011-04-14 01:29:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2011-06-14 02:06:39.329002971 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2011-07-12 16:56:06.702259970 +0100
@@ -919,7 +919,7 @@
public static
Index[] partition(Index ix, int[] keys) {
@@ -228,8 +228,8 @@
Entry e = work.previous();
work.remove(); // pop stack
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-06-14 01:54:53.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-06-14 02:06:39.329002971 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-07-12 15:23:26.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-07-12 16:56:06.702259970 +0100
@@ -59,7 +59,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
@@ -268,7 +268,7 @@
String[] words = optline.split("\\p{Space}+");
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2011-04-14 01:29:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2011-06-14 02:06:39.329002971 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2011-07-12 16:56:06.702259970 +0100
@@ -45,7 +45,7 @@
private final ArrayList<E> flist;
@@ -279,8 +279,8 @@
for (int i = 0 ; i < capacity ; i++) {
flist.add(null);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-06-14 01:54:52.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-06-14 02:06:39.333003042 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-07-12 15:23:26.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-07-12 16:56:06.702259970 +0100
@@ -112,7 +112,7 @@
public static final Attribute.Layout attrSourceFileSpecial;
public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -436,8 +436,8 @@
// Add to the end of ths list:
if (!fileSet.contains(cls.file))
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2011-06-14 01:54:53.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2011-06-14 02:06:39.333003042 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2011-07-12 15:23:26.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2011-07-12 16:56:06.702259970 +0100
@@ -686,7 +686,7 @@
cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
cp_Signature_classes.readFrom(in);
@@ -551,8 +551,8 @@
ClassEntry thisClass = curClass.thisClass;
ClassEntry superClass = curClass.superClass;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2011-06-14 01:54:53.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2011-06-14 02:06:39.333003042 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2011-07-12 15:23:26.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2011-07-12 16:56:06.706260036 +0100
@@ -116,7 +116,7 @@
int[][] attrCounts; // count attr. occurences
@@ -609,7 +609,7 @@
if (!cls.hasInnerClasses()) continue;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2011-04-14 01:29:58.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2011-06-14 02:06:39.333003042 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2011-07-12 16:56:06.710260102 +0100
@@ -183,8 +183,8 @@
final Map<Attribute.Layout, Attribute> attrDefs;
final Map<Attribute.Layout, String> attrCommands;
@@ -641,7 +641,7 @@
InFile inFile = new InFile(jf, je);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2011-04-14 01:29:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2011-06-14 02:06:39.333003042 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2011-07-12 16:56:06.714260168 +0100
@@ -309,7 +309,7 @@
// As each new value is added, we assert that the value
// was not already in the set.
@@ -652,8 +652,8 @@
maxForDebug += fillp;
int min = Integer.MIN_VALUE; // farthest from the center
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2011-06-14 01:54:53.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2011-06-14 02:06:39.333003042 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2011-07-12 15:23:26.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2011-07-12 16:56:06.714260168 +0100
@@ -48,8 +48,8 @@
*/
@@ -685,7 +685,7 @@
return res;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java
--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2011-04-14 01:29:59.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2011-06-14 02:06:39.333003042 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2011-07-12 16:56:06.714260168 +0100
@@ -58,12 +58,12 @@
private final Map<String, MemberEntry> memberEntries;
@@ -706,8 +706,8 @@
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
More information about the distro-pkg-dev
mailing list