# HG changeset patch # User Andrew John Hughes # Date 1363124043 0 # Node ID 87982c9fedc594dc148ad004a687d9505af6f1ef # Parent 18742f5233f69a6a414c8804b48bff50bf3bad06 Sync with forest tip, removing unneeded local patches. 2013-03-12 Andrew John Hughes * patches/8006179-lookup_using_findvirtual.patch, * patches/8006882-sun.proxy.patch, * patches/pr1303-ifdef_fix.patch: Remove patches that are upstream. * Makefile.am: (CORBA_CHANGESET): Update to IcedTea7 2.3 forest head, syncing with upstream jdk7u17b02 changesets. (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. (ICEDTEA_PATCHES): Drop upstream patches. * hotspot.map: Sync default with 2.3 HEAD as other changes above. diff -r 18742f5233f6 -r 87982c9fedc5 ChangeLog --- a/ChangeLog Tue Mar 12 19:23:19 2013 +0000 +++ b/ChangeLog Tue Mar 12 21:34:03 2013 +0000 @@ -1,3 +1,27 @@ +2013-03-12 Andrew John Hughes + + * patches/8006179-lookup_using_findvirtual.patch, + * patches/8006882-sun.proxy.patch, + * patches/pr1303-ifdef_fix.patch: + Remove patches that are upstream. + * Makefile.am: + (CORBA_CHANGESET): Update to IcedTea7 2.3 forest head, + syncing with upstream jdk7u17b02 changesets. + (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. + (ICEDTEA_PATCHES): Drop upstream patches. + * hotspot.map: Sync default with 2.3 HEAD as other + changes above. + 2013-03-12 Andrew John Hughes * configure.ac: Bump to 2.3.9pre. @@ -45,7 +69,7 @@ 2013-03-07 Andrew John Hughes * Makefile.am, - (JDK_UPDATE_VERSION): Bump to 15. + (JDK_UPDATE_VERSION): Bump to 17. (OPENJDK_VERSION): Bump to b02. (CORBA_CHANGESET): Update to IcedTea7 2.3 forest head, bringing in security fixes & backports. diff -r 18742f5233f6 -r 87982c9fedc5 Makefile.am --- a/Makefile.am Tue Mar 12 19:23:19 2013 +0000 +++ b/Makefile.am Tue Mar 12 21:34:03 2013 +0000 @@ -4,19 +4,19 @@ JDK_UPDATE_VERSION = 17 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 516aae5f27cf -JAXP_CHANGESET = 1fbe99283d97 -JAXWS_CHANGESET = 3c7be82314bf -JDK_CHANGESET = deac45dc94f0 -LANGTOOLS_CHANGESET = 41426c72b802 -OPENJDK_CHANGESET = ed02a059ea15 +CORBA_CHANGESET = 47a6bf94ce11 +JAXP_CHANGESET = a2c49387365b +JAXWS_CHANGESET = 8eb0bc947ad4 +JDK_CHANGESET = 850b9e5f2c64 +LANGTOOLS_CHANGESET = 23907f495db8 +OPENJDK_CHANGESET = 12b96a57263c -CORBA_SHA256SUM = 181ceb85a4dade1a8d8465e2d69255ee3612dbc5a50699a59a4f21e69be7a1c6 -JAXP_SHA256SUM = ed3a963c4309316fba654f0a60ba4bec21b2d170e64423eddfa2ba635ac76572 -JAXWS_SHA256SUM = 4abe7366900327a0de21caee8a7b0ea5494821507a02bfb07cffc980cebe90ad -JDK_SHA256SUM = 00e3e4cb436f4153434faa2d1063114a9028e9c8a7eacf558873053c47365215 -LANGTOOLS_SHA256SUM = cbef395a2af27673a3611ed50d84a76ae9f9539a7c42ed8e06e171bfc1ac030c -OPENJDK_SHA256SUM = 865030303330856c988e353bf1bc86fc95669179b0958a4072538fc59d9a073b +CORBA_SHA256SUM = 7346565688c3f01872af2c16a491233325ad5e924475dc89ff01f50582814934 +JAXP_SHA256SUM = 835a175fa72efd097218cb0f052e1874392afde738f940ebd59ca498483e5cb8 +JAXWS_SHA256SUM = a68a47d136d9b205bc9cac3728e33dce979ca9799740f65b39769b8e0af5b07e +JDK_SHA256SUM = 613ca91c4244198bad568352e24c1a82abd1018140f9b59c825d33c437ded3b9 +LANGTOOLS_SHA256SUM = 8bbf80e096352b4e26407b94c405ea7d529f002057d7a1e0e1d108a5d8feb51c +OPENJDK_SHA256SUM = 651f99364e451d79156c879b8c8e47b8568fb3b4e4d28ebc38d36028acbed8bc CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 @@ -241,9 +241,6 @@ # Patch list ICEDTEA_PATCHES = \ - patches/8006179-lookup_using_findvirtual.patch \ - patches/8006882-sun.proxy.patch \ - patches/pr1303-ifdef_fix.patch \ patches/revert-7017193.patch # Conditional patches diff -r 18742f5233f6 -r 87982c9fedc5 hotspot.map --- a/hotspot.map Tue Mar 12 19:23:19 2013 +0000 +++ b/hotspot.map Tue Mar 12 21:34:03 2013 +0000 @@ -1,3 +1,3 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot a152dced63a1 eac2313e3012653afa7549257765d56e4348c775363eee0733968d32a7c1eeae +default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 23888f3dec52 6d77e26134d47e62621a35b259c70d8e98070724af9a718ec2b85cf84b954614 zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot d8b22e079abe 28883ebefcfff1ba8b356a7fabf8e449c25fe7fffe1d563f1f58f887100063f0 diff -r 18742f5233f6 -r 87982c9fedc5 patches/8006179-lookup_using_findvirtual.patch --- a/patches/8006179-lookup_using_findvirtual.patch Tue Mar 12 19:23:19 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -# HG changeset patch -# User jrose -# Date 1358570871 28800 -# Node ID 4bb16e8e663ad133e0950406bda2261169f3920f -# Parent 33b30ad1689805e74c85f6df29d2033c796baedb -8006179: JSR292 MethodHandles lookup with interface using findVirtual() -Reviewed-by: twisti - -diff --git a/src/share/classes/java/lang/invoke/DirectMethodHandle.java b/src/share/classes/java/lang/invoke/DirectMethodHandle.java ---- openjdk/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java -+++ openjdk/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java -@@ -44,6 +44,15 @@ - if (!m.isResolved()) - throw new InternalError(); - -+ if (m.getDeclaringClass().isInterface() && !m.isAbstract()) { -+ // Check for corner case: invokeinterface of Object method. -+ MemberName m2 = new MemberName(Object.class, m.getName(), m.getMethodType(), m.getModifiers()); -+ m2 = MemberName.getFactory().resolveOrNull(m2, false, null); -+ if (m2 != null && m2.isPublic()) { -+ m = m2; -+ } -+ } -+ - MethodHandleNatives.init(this, (Object) m, doDispatch, lookupClass); - } - diff -r 18742f5233f6 -r 87982c9fedc5 patches/8006882-sun.proxy.patch --- a/patches/8006882-sun.proxy.patch Tue Mar 12 19:23:19 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,106 +0,0 @@ -# HG changeset patch -# User mchung -# Date 1359414910 28800 -# Node ID cbbb166b38eb15f5d5c68e913ee18f6f352b7af0 -# Parent 044ea56a339dfd92b723a5e81941b646f9d26071 -8006882: Proxy generated classes in sun.proxy package breaks JMockit -Reviewed-by: alanb, ahgross - -diff --git a/src/share/classes/java/lang/reflect/Proxy.java b/src/share/classes/java/lang/reflect/Proxy.java ---- openjdk/jdk/src/share/classes/java/lang/reflect/Proxy.java -+++ openjdk/jdk/src/share/classes/java/lang/reflect/Proxy.java -@@ -609,7 +609,7 @@ - } - - if (proxyPkg == null) { -- // if no non-public proxy interfaces, use sun.proxy package -+ // if no non-public proxy interfaces, use com.sun.proxy package - proxyPkg = ReflectUtil.PROXY_PACKAGE + "."; - } - -diff --git a/src/share/classes/sun/reflect/misc/ReflectUtil.java b/src/share/classes/sun/reflect/misc/ReflectUtil.java ---- openjdk/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java -+++ openjdk/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java -@@ -202,5 +202,5 @@ - } - } - -- public static final String PROXY_PACKAGE = "sun.proxy"; -+ public static final String PROXY_PACKAGE = "com.sun.proxy"; - } -diff --git a/src/share/lib/security/java.security b/src/share/lib/security/java.security ---- openjdk/jdk/src/share/lib/security/java.security -+++ openjdk/jdk/src/share/lib/security/java.security -@@ -130,6 +130,7 @@ - com.sun.imageio.,\ - com.sun.istack.internal.,\ - com.sun.jmx.,\ -+ com.sun.proxy.,\ - com.sun.org.apache.xerces.internal.utils.,\ - com.sun.org.apache.xalan.internal.utils.,\ - com.sun.org.glassfish.external.,\ -@@ -152,6 +153,7 @@ - com.sun.imageio.,\ - com.sun.istack.internal.,\ - com.sun.jmx.,\ -+ com.sun.proxy.,\ - com.sun.org.apache.xerces.internal.utils.,\ - com.sun.org.apache.xalan.internal.utils.,\ - com.sun.org.glassfish.external.,\ -diff --git a/src/share/lib/security/java.security-macosx b/src/share/lib/security/java.security-macosx ---- openjdk/jdk/src/share/lib/security/java.security-macosx -+++ openjdk/jdk/src/share/lib/security/java.security-macosx -@@ -131,6 +131,7 @@ - com.sun.imageio.,\ - com.sun.istack.internal.,\ - com.sun.jmx.,\ -+ com.sun.proxy.,\ - com.sun.org.apache.xerces.internal.utils.,\ - com.sun.org.apache.xalan.internal.utils.,\ - com.sun.org.glassfish.external.,\ -@@ -154,6 +155,7 @@ - com.sun.imageio.,\ - com.sun.istack.internal.,\ - com.sun.jmx.,\ -+ com.sun.proxy.,\ - com.sun.org.apache.xerces.internal.utils.,\ - com.sun.org.apache.xalan.internal.utils.,\ - com.sun.org.glassfish.external.,\ -diff --git a/src/share/lib/security/java.security-solaris b/src/share/lib/security/java.security-solaris ---- openjdk/jdk/src/share/lib/security/java.security-solaris -+++ openjdk/jdk/src/share/lib/security/java.security-solaris -@@ -132,6 +132,7 @@ - com.sun.imageio.,\ - com.sun.istack.internal.,\ - com.sun.jmx.,\ -+ com.sun.proxy.,\ - com.sun.org.apache.xerces.internal.utils.,\ - com.sun.org.apache.xalan.internal.utils.,\ - com.sun.org.glassfish.external.,\ -@@ -154,6 +155,7 @@ - com.sun.imageio.,\ - com.sun.istack.internal.,\ - com.sun.jmx.,\ -+ com.sun.proxy.,\ - com.sun.org.apache.xerces.internal.utils.,\ - com.sun.org.apache.xalan.internal.utils.,\ - com.sun.org.glassfish.external.,\ -diff --git a/src/share/lib/security/java.security-windows b/src/share/lib/security/java.security-windows ---- openjdk/jdk/src/share/lib/security/java.security-windows -+++ openjdk/jdk/src/share/lib/security/java.security-windows -@@ -131,6 +131,7 @@ - com.sun.imageio.,\ - com.sun.istack.internal.,\ - com.sun.jmx.,\ -+ com.sun.proxy.,\ - com.sun.org.apache.xerces.internal.utils.,\ - com.sun.org.apache.xalan.internal.utils.,\ - com.sun.org.glassfish.external.,\ -@@ -153,6 +154,7 @@ - com.sun.imageio.,\ - com.sun.istack.internal.,\ - com.sun.jmx.,\ -+ com.sun.proxy.,\ - com.sun.org.apache.xerces.internal.utils.,\ - com.sun.org.apache.xalan.internal.utils.,\ - com.sun.org.glassfish.external.,\ diff -r 18742f5233f6 -r 87982c9fedc5 patches/pr1303-ifdef_fix.patch --- a/patches/pr1303-ifdef_fix.patch Tue Mar 12 19:23:19 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1362758030 0 -# Node ID ec275f96d030eff83f7e6cfcdd7daa9cda2b4802 -# Parent deac45dc94f0504ba17b8afcb54db1fba4e6f9d5 -PR1303: Correct #ifdef to #if - -diff --git a/src/share/native/sun/awt/splashscreen/splashscreen_gif.c b/src/share/native/sun/awt/splashscreen/splashscreen_gif.c ---- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c -@@ -316,7 +316,7 @@ - int - SplashDecodeGifStream(Splash * splash, SplashStream * stream) - { --#ifdef GIFLIB_MAJOR >= 5 -+#if GIFLIB_MAJOR >= 5 - int error = 0; - GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc, &error); -