Date: Wed, 16 Jul 2014 15:21:39 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362066 - in head/java/openjdk7: . files Message-ID: <201407161521.s6GFLd1q041843@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Wed Jul 16 15:21:38 2014 New Revision: 362066 URL: http://svnweb.freebsd.org/changeset/ports/362066 QAT: https://qat.redports.org/buildarchive/r362066/ Log: . Update to 7u65. Deleted: head/java/openjdk7/files/patch-src-solaris-native-sun-nio-ch-NativeThread.c Modified: head/java/openjdk7/Makefile head/java/openjdk7/files/patch-set Modified: head/java/openjdk7/Makefile ============================================================================== --- head/java/openjdk7/Makefile Wed Jul 16 14:57:24 2014 (r362065) +++ head/java/openjdk7/Makefile Wed Jul 16 15:21:38 2014 (r362066) @@ -3,7 +3,6 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} -PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \ @@ -36,8 +35,8 @@ DEBUG_DESC= Enable extra debugging info POLICY_DESC= Install the Unlimited Strength Policy Files TZUPDATE_DESC= Update the time zone data -PORT_MINOR_VERSION= 60 -PORT_BUILD_NUMBER= 19 +PORT_MINOR_VERSION= 65 +PORT_BUILD_NUMBER= 17 JDK_MAJOR_VERSION= 7 JDK_MINOR_VERSION= 40 JDK_BUILD_NUMBER= 43 Modified: head/java/openjdk7/files/patch-set ============================================================================== --- head/java/openjdk7/files/patch-set Wed Jul 16 14:57:24 2014 (r362065) +++ head/java/openjdk7/files/patch-set Wed Jul 16 15:21:38 2014 (r362066) @@ -1,5 +1,5 @@ --- ./.hgtags 2013-09-06 11:20:33.000000000 -0700 -+++ ./.hgtags 2014-06-06 19:56:10.000000000 -0700 ++++ ./.hgtags 2014-07-15 23:25:11.000000000 -0700 @@ -123,6 +123,7 @@ 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01 @@ -40,7 +40,7 @@ da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32 3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33 a1ae13479e8767329fa20774b5cea5976aaeb37b jdk7u40-b34 -@@ -341,3 +358,83 @@ +@@ -341,3 +358,104 @@ 3af81bfe320c12758234233da6fa27c3c0ffcdc4 jdk7u40-b42 1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43 dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60 @@ -92,6 +92,7 @@ +b829c5947c6cd473f42cadfe2c61399fb67c2da6 jdk7u55-b02 +a72b902cdd39d9f2f2d353d5ad629e543cbc01ae jdk7u55-b03 +6a8ee38075621564dd276e8ed7be576d637acf79 jdk7u55-b04 ++92ac508efb9e00d88b04a2bd79ab8a55f450a048 jdk7u65-b00 +92ac508efb9e00d88b04a2bd79ab8a55f450a048 jdk7u55-b05 +6c7cd2146f69cf0823765b3cf84c338c1dc7157c jdk7u55-b06 +5cad0f56c685a0673944dbc5632ea9ae7b9340c7 jdk7u55-b07 @@ -105,6 +106,8 @@ +0820b4707cfa75f8211b88b0daa67bba8475f498 jdk7u55-b30 +997ab3897d6ede80b0decdda94b569e57dd7dd90 jdk7u55-b14 +1f52edec29fd44c8bacce11ba7440287b37d04d1 jdk7u55-b31 ++5b15555172019b3c92484abff7c92f066e162d29 jdk7u55-b32 ++fa5ead8cb7d2de49cd138d93fb86fa5a10b07037 jdk7u55-b33 +11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00 +88113cabda386320a087b288d43e792f523cc0ba jdk7u60-b01 +6bdacebbc97f0a03be45be48a6d5b5cf2f7fe77d jdk7u60-b02 @@ -122,10 +125,28 @@ +1ca6a368aec38ee91a41dc03899d7dc1037de44d jdk7u60-b14 +a95b821a2627295b90fb4ae8f3b8bc2ff9c64acc jdk7u60-b15 +19a3f6f48c541a8cf144eedffa0e52e108052e82 jdk7u60-b16 -+472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b18 +472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b17 ++472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b18 ++b9264ea7e0887d511318bf7b53d12f944760bbbb jdk7u65-b01 ++2a7a5e774023944f291ee27ca5b3ad89e0e62aaf jdk7u60-b19 ++3a683f1730a148bcc1ca6eb9137116db427093f6 jdk7u65-b02 ++c154a8de7d34128ab75f46a2b6a909796f63b6e3 jdk7u65-b03 ++62e22dbc36410d76716bfa5e9fd679fcb4b1d845 jdk7u65-b04 ++4cab26e4e27f8ff382b8d6487224af59dc7c1fa1 jdk7u65-b05 ++b2cd3babc4ca1fb48b6073665e627f8bfb65d547 jdk7u65-b06 ++bc5e69657c0f6d58775ac7441033bbcbbaee3268 jdk7u65-b07 ++48eb3345e05fe904d2e92067da0abd04a9b375e4 jdk7u65-b08 ++2e7881991d5294061023f8862b702e4730f2860d jdk7u65-b09 ++db03cbff389500c7ccfd4b476ab78319f6e24d2d jdk7u65-b10 ++9f629f70ec6c4249baadaadd05b0f32c9129ad05 jdk7u65-b11 ++71cd7866ca68b333e36330e179ab1d69d721aaee jdk7u65-b12 ++49dbfea9d3a4b709f3230d581a09d960c2de5109 jdk7u65-b13 ++0cfadcb9f8006ac5601bb0ce8b74211d6b223c11 jdk7u65-b14 ++3cce3737be368dc3d304508cd0d6e354f8a19f55 jdk7u65-b15 ++2c8b05ed9802cf4e5f61439a6d6286e7f7cd444e jdk7u65-b16 ++927d8d3db13c5221237b51efe45206054ee6e3f3 jdk7u65-b17 --- ./Makefile 2013-09-06 11:20:33.000000000 -0700 -+++ ./Makefile 2013-12-01 11:13:37.000000000 -0800 ++++ ./Makefile 2014-07-15 23:25:11.000000000 -0700 @@ -264,7 +264,7 @@ DEBUG_NAME=$(DEBUG_NAME) \ GENERATE_DOCS=false \ @@ -136,7 +157,7 @@ generic_build_repo_series --- ./corba/.hgtags 2013-09-06 11:20:46.000000000 -0700 -+++ ./corba/.hgtags 2014-06-06 19:56:11.000000000 -0700 ++++ ./corba/.hgtags 2014-07-15 23:25:10.000000000 -0700 @@ -123,6 +123,7 @@ 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01 @@ -168,7 +189,7 @@ ef8e6f8305d524f3b448a85f901aadf1adc81fc0 jdk7u25-b12 eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13 577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14 -@@ -343,3 +360,83 @@ +@@ -343,3 +360,104 @@ b4a480a039bc19b27bfb5fcbbbf75e651d2718b7 jdk7u40-b42 e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43 08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60 @@ -220,6 +241,7 @@ +db2e6d87bade9d2061646ff9a6b39b5159fba0ec jdk7u55-b02 +02ff18f156bd3382fe22e4758b138370f5238e97 jdk7u55-b03 +6a88a170331fb38af5046e54bf75f38176af5c41 jdk7u55-b04 ++a8d27c3fc4e4e6cd99fa164f04c30a71f474a2d6 jdk7u65-b00 +a8d27c3fc4e4e6cd99fa164f04c30a71f474a2d6 jdk7u55-b05 +af7f1808106bf4e9b4680d943677299829245d08 jdk7u55-b06 +44801796d42bebc90e8c4c7fb5bd79db04b10b75 jdk7u55-b07 @@ -233,6 +255,8 @@ +e041c52fe69128ec3439d26afef9b0fcba00684c jdk7u55-b30 +a0bfd0e80ae0ae6e3a29bf527b5911c83163b3f5 jdk7u55-b14 +55ff6957449cf6c79f5d5bb159df27f51ece1659 jdk7u55-b31 ++fba15e177b15873e3c63b0efc7c0f5647a243a79 jdk7u55-b32 ++6503115cbedda9216083fc1798e2fa5a2775f68a jdk7u55-b33 +c5b5886004e6446b8b27ccdc1fd073354c1dc614 jdk7u60-b00 +a531112cc6d0b0a1e7d4ffdaa3ba53addcd25cf4 jdk7u60-b01 +d81370c5b863acc19e8fb07315b1ec687ac1136a jdk7u60-b02 @@ -250,10 +274,28 @@ +02bdeb33754315f589bd650dde656d2c9947976d jdk7u60-b14 +e5946b2cf82bdea3a4b85917e903168e65a543a7 jdk7u60-b15 +e424fb8452851b56db202488a4e9a283934c4887 jdk7u60-b16 -+b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b18 +b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b17 ++b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b18 ++550ae238459e0f59d9a85d183bc2b4520adac05b jdk7u65-b01 ++5d1b39fe68944cff6380db56fbe2fbaa28091bf6 jdk7u60-b19 ++6a89d959cbade46fcd281f421ac40a804d098f0b jdk7u65-b02 ++afed3d62e8051fe65f431abe87dad50cbeba3800 jdk7u65-b03 ++38fabf72970ae509350f57ffad99f6ac8fc6fdad jdk7u65-b04 ++12c1621ce88defa65ebc1bdffb7141bd7d0089a6 jdk7u65-b05 ++5041c713522c0fc68239fc91f7fb9498dd7edebb jdk7u65-b06 ++144887a766dc17a139524dd43f1a0bc8f2a2a3a2 jdk7u65-b07 ++5b8210c41bc41135687028bcb000ca116e2090f6 jdk7u65-b08 ++1f7156e0a46129dbaf5b248802371564d92630a3 jdk7u65-b09 ++be3cbbea3ec1e14b6492acbbd5c08222c24a5061 jdk7u65-b10 ++fd7e4972cfefa174ce3d6dcb7f4b409df11a745b jdk7u65-b11 ++792ef0370bf7bcf83c9404d2b44f08722dcd73aa jdk7u65-b12 ++b95f46ae5207853a89d52b0453a2fb99fffee817 jdk7u65-b13 ++6efadedfe3295dbf2af4a350d813524af029b116 jdk7u65-b14 ++78966cf34d868ef18b8a3fa7edec368e1cc4739d jdk7u65-b15 ++d765ed30bd5ed2bdd71fda56c056333e1b4b0d7d jdk7u65-b16 ++cd642d59aca29ff2b56e7ed016be758828f199cd jdk7u65-b17 --- ./corba/make/Makefile 2013-09-06 11:20:46.000000000 -0700 -+++ ./corba/make/Makefile 2014-01-18 12:16:05.000000000 -0800 ++++ ./corba/make/Makefile 2014-07-15 23:25:08.000000000 -0700 @@ -160,7 +160,7 @@ # # CORBA @@ -1233,7 +1275,7 @@ - } -} --- ./corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2013-09-06 11:20:47.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -82,11 +82,18 @@ super((ORB)orb); } @@ -1259,7 +1301,7 @@ } --- ./corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved. @@ -1290,7 +1332,7 @@ protected CodeSetConversion.BTCConverter createCharBTCConverter() { --- ./corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved. @@ -1325,7 +1367,7 @@ protected CodeSetConversion.CTBConverter createCharCTBConverter() { --- ./corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. @@ -1361,7 +1403,7 @@ encap.setEnclosingInputStream(is); encap.makeEncapsulation(); --- ./corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java 2014-07-15 23:25:08.000000000 -0700 @@ -61,6 +61,8 @@ import java.math.BigInteger; import java.nio.ByteBuffer; @@ -1385,7 +1427,7 @@ //System.out.println("Created TypeCodeInputStream " + tcis + " with no parent"); //tcis.printBuffer(); --- ./corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java 2014-07-15 23:25:08.000000000 -0700 @@ -33,6 +33,8 @@ import com.sun.corba.se.spi.ior.iiop.GIOPVersion; import com.sun.corba.se.spi.logging.CORBALogDomains; @@ -1575,7 +1617,7 @@ - -} --- ./corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. @@ -1638,7 +1680,7 @@ com.sun.org.omg.SendingContext.CodeBase sender, int offset) --- ./corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java 2014-07-15 23:25:08.000000000 -0700 @@ -201,7 +201,7 @@ readObjectState.endDefaultReadObject(this); } @@ -1649,7 +1691,7 @@ abstract void readFields(java.util.Map fieldToValueMap) throws java.io.InvalidClassException, java.io.StreamCorruptedException, --- ./corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2014-04-19 01:27:00.000000000 -0700 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. @@ -2037,7 +2079,7 @@ return ((pkg1 == pkg2) || ((pkg1 != null) && (pkg1.equals(pkg2)))); } --- ./corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. @@ -2066,7 +2108,7 @@ return result ; } --- ./corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. @@ -2093,7 +2135,7 @@ ObjectKeyTemplate oktemp = create( is, fullKey, osh ) ; if (oktemp == null) --- ./corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -70,6 +70,8 @@ import com.sun.corba.se.impl.encoding.EncapsInputStream ; import com.sun.corba.se.impl.encoding.EncapsOutputStream ; @@ -2238,7 +2280,7 @@ - } -} --- ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java 2013-09-06 11:20:49.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java 2014-04-19 01:27:00.000000000 -0700 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved. @@ -2285,7 +2327,7 @@ classWithThisMethod = java.io.ObjectStreamClass.class; --- ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java 2013-09-06 11:20:49.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java 2014-04-19 01:27:00.000000000 -0700 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. @@ -2532,7 +2574,7 @@ } } --- ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties 2013-09-06 11:20:49.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties 2014-06-06 19:56:11.000000000 -0700 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties 2014-07-15 23:25:08.000000000 -0700 @@ -23,7 +23,7 @@ # questions. # @@ -2543,7 +2585,7 @@ servertool.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n -ORBInitialPort porta inicial (obrigat\u00F3rio)\n -ORBInitialHost nome de host inicial (obrigat\u00F3rio)\n servertool.banner=\n\nBem-vindo \u00E0 Ferramenta de Servidor IDL Java \ninsira os comandos no prompt \n --- ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java 2013-09-06 11:20:49.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java 2013-12-01 11:13:38.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -905,28 +905,4 @@ return contents.toString(); @@ -4009,7 +4051,7 @@ - -} --- ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java 2013-09-06 11:20:50.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java 2013-12-01 11:13:38.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -43,6 +43,8 @@ import com.sun.corba.se.spi.orbutil.proxy.DelegateInvocationHandlerImpl ; import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandler ; @@ -4055,7 +4097,7 @@ // If the method passed to invoke is not from DynamicStub or its superclasses, // it must be from an implemented interface, so we just handle --- ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java 2013-09-06 11:20:50.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. @@ -4107,7 +4149,7 @@ public abstract org.omg.CORBA.Object makeStub() ; } --- ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java 2013-09-06 11:20:50.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. @@ -4143,7 +4185,7 @@ } } --- ./corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java 2013-09-06 11:20:50.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. @@ -4171,7 +4213,7 @@ String msg = --- ./corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java 2013-09-06 11:20:50.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. @@ -4953,7 +4995,7 @@ - private IOR ior; // forwarded IOR -} --- ./corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java 2013-09-06 11:20:50.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. @@ -5695,7 +5737,7 @@ - -// End of file. --- ./corba/src/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java 2013-09-06 11:20:50.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java 2014-06-06 19:56:11.000000000 -0700 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -32,6 +32,7 @@ import java.net.ServerSocket; import java.nio.channels.SocketChannel; @@ -5747,7 +5789,7 @@ } --- ./corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java 2013-09-06 11:20:50.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java 2013-12-01 11:13:38.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. @@ -5765,7 +5807,7 @@ Thread implements --- ./corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java 2013-09-06 11:20:51.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java 2014-04-19 01:27:00.000000000 -0700 ++++ ./corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. @@ -5818,7 +5860,7 @@ /** Get the appropriate StubFactoryFactory. This --- ./corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java 2013-09-06 11:20:51.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -36,6 +36,7 @@ import com.sun.corba.se.spi.logging.CORBALogDomains ; @@ -5857,7 +5899,7 @@ + private static final long serialVersionUID = 4571178305984833743L; } --- ./corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java 2013-09-06 11:20:52.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved. @@ -5893,7 +5935,7 @@ // Now the input stream passed to a ServiceContext --- ./corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp 2013-09-06 11:20:53.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp 2014-07-15 23:25:08.000000000 -0700 @@ -110,7 +110,7 @@ ParseException.badCustom=%0 (\u884C%1): forward\u5024\u5BA3\u8A00\u306Fcustom\u3068\u3057\u3066\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093\u3002\n%2\n%3 ParseException.badRepIDAlreadyAssigned=%0 (\u884C%1): \u578B%2\u306B\u306F\u3001\u524D\u306EID\u30D7\u30E9\u30B0\u30DE\u30FB\u30C7\u30A3\u30EC\u30AF\u30C6\u30A3\u30D6\u306E\u30EA\u30DD\u30B8\u30C8\u30EAID\u304C\u3059\u3067\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u3066\u3044\u307E\u3059\u3002\n%3\n%4 @@ -5904,7 +5946,7 @@ ParseException.branchLabel=%0 (\u884C%1): case %2\u306F\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n%3\n%4 ParseException.branchName=%0 (\u884C%1): %2\u3068\u3044\u3046\u540D\u524D\u306E\u5206\u5C90\u306F\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n%3\n%4 --- ./corba/src/share/classes/javax/rmi/CORBA/Stub.java 2013-09-06 11:20:53.000000000 -0700 -+++ ./corba/src/share/classes/javax/rmi/CORBA/Stub.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/javax/rmi/CORBA/Stub.java 2014-07-15 23:25:08.000000000 -0700 @@ -61,13 +61,11 @@ private transient StubDelegate stubDelegate = null; private static Class stubDelegateClass = null; @@ -5939,7 +5981,7 @@ try { --- ./corba/src/share/classes/javax/rmi/CORBA/Util.java 2013-09-06 11:20:53.000000000 -0700 -+++ ./corba/src/share/classes/javax/rmi/CORBA/Util.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/javax/rmi/CORBA/Util.java 2014-07-15 23:25:08.000000000 -0700 @@ -60,14 +60,11 @@ public class Util { @@ -5978,7 +6020,7 @@ try { --- ./corba/src/share/classes/javax/rmi/PortableRemoteObject.java 2013-09-06 11:20:53.000000000 -0700 -+++ ./corba/src/share/classes/javax/rmi/PortableRemoteObject.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/javax/rmi/PortableRemoteObject.java 2014-07-15 23:25:08.000000000 -0700 @@ -65,17 +65,14 @@ */ public class PortableRemoteObject { @@ -6018,7 +6060,7 @@ try { --- ./corba/src/share/classes/org/omg/CORBA/ORB.java 2013-09-06 11:20:54.000000000 -0700 -+++ ./corba/src/share/classes/org/omg/CORBA/ORB.java 2014-04-19 01:27:00.000000000 -0700 ++++ ./corba/src/share/classes/org/omg/CORBA/ORB.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. @@ -6051,7 +6093,7 @@ // The global instance of the singleton ORB implementation which // acts as a factory for typecodes for generated Helper classes. // TypeCodes should be immutable since they may be shared across -@@ -294,22 +287,42 @@ +@@ -294,22 +287,26 @@ String className = getSystemProperty(ORBSingletonClassKey); if (className == null) className = getPropertyFromFile(ORBSingletonClassKey); @@ -6063,30 +6105,14 @@ + (className.equals("com.sun.corba.se.impl.orb.ORBSingleton"))) { + singleton = new com.sun.corba.se.impl.orb.ORBSingleton(); + } else { -+ singleton = create_impl_with_systemclassloader(className); ++ singleton = create_impl(className); + } } return singleton; } -- private static ORB create_impl(String className) { -+ private static ORB create_impl_with_systemclassloader(String className) { - -+ try { -+ ReflectUtil.checkPackageAccess(className); -+ ClassLoader cl = ClassLoader.getSystemClassLoader(); -+ Class<org.omg.CORBA.ORB> orbBaseClass = org.omg.CORBA.ORB.class; -+ Class<?> singletonOrbClass = Class.forName(className, true, cl).asSubclass(orbBaseClass); -+ return (ORB)singletonOrbClass.newInstance(); -+ } catch (Throwable ex) { -+ SystemException systemException = new INITIALIZE( -+ "can't instantiate default ORB implementation " + className); -+ systemException.initCause(ex); -+ throw systemException; -+ } -+ } -+ -+ private static ORB create_impl(String className) { + private static ORB create_impl(String className) { +- ClassLoader cl = Thread.currentThread().getContextClassLoader(); if (cl == null) cl = ClassLoader.getSystemClassLoader(); @@ -6100,7 +6126,7 @@ } catch (Throwable ex) { SystemException systemException = new INITIALIZE( "can't instantiate default ORB implementation " + className); -@@ -347,10 +360,12 @@ +@@ -347,10 +344,12 @@ className = getSystemProperty(ORBClassKey); if (className == null) className = getPropertyFromFile(ORBClassKey); @@ -6117,7 +6143,7 @@ orb.set_parameters(args, props); return orb; } -@@ -375,10 +390,12 @@ +@@ -375,10 +374,12 @@ className = getSystemProperty(ORBClassKey); if (className == null) className = getPropertyFromFile(ORBClassKey); @@ -6134,7 +6160,7 @@ orb.set_parameters(app, props); return orb; } -@@ -574,7 +591,7 @@ +@@ -574,7 +575,7 @@ try { // First try to load the OperationDef class String opDefClassName = "org.omg.CORBA.OperationDef"; @@ -6143,7 +6169,7 @@ ClassLoader cl = Thread.currentThread().getContextClassLoader(); if ( cl == null ) -@@ -584,7 +601,7 @@ +@@ -584,7 +585,7 @@ // OK, we loaded OperationDef. Now try to get the // create_operation_list(OperationDef oper) method. @@ -6153,7 +6179,7 @@ this.getClass().getMethod("create_operation_list", argc); --- ./corba/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java 2013-09-06 11:20:55.000000000 -0700 -+++ ./corba/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved. @@ -6217,7 +6243,7 @@ * Unmarshalls a value type from the input stream. * @return the value type unmarshalled from the input stream --- ./corba/src/share/classes/sun/corba/EncapsInputStreamFactory.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./corba/src/share/classes/sun/corba/EncapsInputStreamFactory.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/sun/corba/EncapsInputStreamFactory.java 2014-07-15 23:25:08.000000000 -0700 @@ -0,0 +1,153 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -6373,7 +6399,7 @@ + } +} --- ./corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java 2013-09-06 11:20:56.000000000 -0700 -+++ ./corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java 2013-12-01 11:13:38.000000000 -0800 ++++ ./corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. @@ -6526,7 +6552,7 @@ p.pln("(" + idExtInputStream + ") "+_in+";"); p.pO(); --- ./hotspot/.hgtags 2013-09-06 11:21:49.000000000 -0700 -+++ ./hotspot/.hgtags 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/.hgtags 2014-07-15 23:24:59.000000000 -0700 @@ -182,6 +182,7 @@ 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147 @@ -6560,7 +6586,7 @@ e3d2c238e29c421c3b5c001e400acbfb30790cfc jdk7u14-b14 860ae068f4dff62a77c8315f0335b7e935087e86 hs24-b34 12619005c5e29be6e65f0dc9891ca19d9ffb1aaa jdk7u14-b15 -@@ -550,3 +569,92 @@ +@@ -550,3 +569,113 @@ b8d8caf6df744d5342b5d284376a005e86c0b108 hs24-b56 eceae04782438987cd747e1c76e4085f50b43a18 jdk7u40-b43 af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60 @@ -6612,6 +6638,7 @@ +408028d410e316a99495c42df0031018890c22fe jdk7u55-b02 +50fb91504dd8cdf410eb956075442daf3aacf1db jdk7u55-b03 +3be3b8a032a5508646c1c5620cee18d3e69fc708 jdk7u55-b04 ++b86119fa2748bd91ae4984ff2264da92b6626f8c jdk7u65-b00 +b86119fa2748bd91ae4984ff2264da92b6626f8c jdk7u55-b05 +260d919d52e500a0b20f911fade2a7710474067a jdk7u55-b06 +8cf6e0a3a0651c4132ae034c2b68ddf4eb5c4d88 jdk7u55-b07 @@ -6625,6 +6652,8 @@ +d27b468d5f3be3329ff1ff342f3347e6b2e0303b jdk7u55-b30 +dff9147a781672f20bb0577a94233264ea4a95d1 jdk7u55-b14 +8175599864880938d68d0a515fa561043d7d5fd0 jdk7u55-b31 ++ba9270b8fb1f4852ff1d9dab15571eb9e0714495 jdk7u55-b32 ++0901a8cf66a0494b55bf104c9666d4e3c6ff93f0 jdk7u55-b33 +ae4adc1492d1c90a70bd2d139a939fc0c8329be9 jdk7u60-b00 +af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60 +cc83359f5e5eb46dd9176b0a272390b1a0a51fdc hs24.60-b01 @@ -6651,10 +6680,28 @@ +b226be2040f971855626f5b88cb41a7d5299fea0 jdk7u60-b14 +2871f345b7e5585e20dc7aa91035967fe774cfba jdk7u60-b15 +ec76bacbb5b90efc7988dee5345c656126b97561 jdk7u60-b16 -+617a6338e0c4f7699eed5061d7e8f576c3ace029 jdk7u60-b18 +617a6338e0c4f7699eed5061d7e8f576c3ace029 jdk7u60-b17 ++617a6338e0c4f7699eed5061d7e8f576c3ace029 jdk7u60-b18 ++4a9635c98a917cfcef506ca5d034c733a33c53f3 jdk7u65-b01 ++361493c7cdb5f75b28efc63389d6cebaaaa43a2c jdk7u60-b19 ++eb797fab50d3b440b17b3e7c5d83f42bfa73655e jdk7u65-b02 ++bb00df28ecdbd0da89ab4ed81f6f2b732fa512da jdk7u65-b03 ++848481af9003067546c7f34c166bb8d745b95d5f jdk7u65-b04 ++98a884fa64a9ef1753a28691106efe10942b9d70 jdk7u65-b05 ++6f1dddf9c632bfb14121c9521d17b64bd0be0cd2 jdk7u65-b06 ++a053d3d805355ffcd85c17e653182e17d4456bd5 jdk7u65-b07 ++6f03dfb50363d26599fcf726586ea3f6d0e0347d jdk7u65-b08 ++b4930eb1ea7630b4d8609e2efe6f000d3dc83235 jdk7u65-b09 ++4736382ac9d999044b05eb26932ab6fc59dbb159 jdk7u65-b10 ++7345c7bf20fd8c91492240a95082af9a201b3a96 jdk7u65-b11 ++28b81694b89f88541e28bbc767d78e77ec66cce6 jdk7u65-b12 ++f4ed018b4c51dae699da835617b19e8a49c124a4 jdk7u65-b13 ++7ec585caae47f7202fb5357607f9ad058b03870e jdk7u65-b14 ++7058f0d30de6826b6866ce2d146c63e943be33af jdk7u65-b15 ++f1b2970a2564c3360db420431cfbba215da6ae43 jdk7u65-b16 ++4c6df9a369cb9d54fe2d898452883a22b8ec6640 jdk7u65-b17 --- ./hotspot/agent/src/os/bsd/ps_proc.c 2013-09-06 11:21:50.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/ps_proc.c 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/ps_proc.c 2014-07-15 23:24:51.000000000 -0700 @@ -131,7 +131,7 @@ static bool ptrace_continue(pid_t pid, int signal) { @@ -6665,7 +6712,7 @@ return false; } --- ./hotspot/agent/src/os/linux/ps_core.c 2013-09-06 11:21:50.000000000 -0700 -+++ ./hotspot/agent/src/os/linux/ps_core.c 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/agent/src/os/linux/ps_core.c 2014-07-15 23:24:51.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -6754,7 +6801,7 @@ // process segments from interpreter (ld.so or ld-linux.so) --- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2013-09-06 11:21:51.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2014-07-15 23:24:52.000000000 -0700 @@ -33,6 +33,7 @@ import sun.jvm.hotspot.debugger.remote.*; import sun.jvm.hotspot.debugger.windbg.*; @@ -6764,7 +6811,7 @@ import sun.jvm.hotspot.oops.*; import sun.jvm.hotspot.runtime.*; --- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2013-09-06 11:21:52.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2014-07-15 23:24:52.000000000 -0700 @@ -35,6 +35,7 @@ import sun.jvm.hotspot.debugger.windbg.*; import sun.jvm.hotspot.debugger.linux.*; @@ -6774,7 +6821,7 @@ import sun.jvm.hotspot.livejvm.*; import sun.jvm.hotspot.memory.*; --- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java 2013-09-06 11:21:55.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. @@ -6806,7 +6853,7 @@ def(_fast_aldc_w , "fast_aldc_w" , "bJJ" , null , BasicType.getTObject(), 1, true, _ldc_w ); --- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/JVMTIThreadState.java 2013-09-06 11:21:56.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/JVMTIThreadState.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/JVMTIThreadState.java 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. @@ -6828,7 +6875,7 @@ public static final int JVMTI_THREAD_STATE_PARKED = 0x0200; public static final int JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER = 0x0400; --- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/OSThread.java 2013-09-06 11:21:57.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/OSThread.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/OSThread.java 2014-07-15 23:24:52.000000000 -0700 @@ -32,7 +32,7 @@ // to the sys_thread_t structure of the classic JVM implementation. public class OSThread extends VMObject { @@ -6857,7 +6904,7 @@ } --- ./hotspot/make/bsd/Makefile 2013-09-06 11:21:59.000000000 -0700 -+++ ./hotspot/make/bsd/Makefile 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/Makefile 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -6888,7 +6935,7 @@ # Synonyms for win32-like targets. compiler2: jvmg product --- ./hotspot/make/bsd/makefiles/arm.make 2013-09-06 11:21:59.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/arm.make 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/arm.make 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. @@ -6907,7 +6954,7 @@ CFLAGS += -DVM_LITTLE_ENDIAN --- ./hotspot/make/bsd/makefiles/build_vm_def.sh 2013-09-06 11:21:59.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh 2014-07-15 23:24:52.000000000 -0700 @@ -7,6 +7,16 @@ NM=nm fi @@ -6926,7 +6973,7 @@ ' +fi --- ./hotspot/make/bsd/makefiles/buildtree.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/buildtree.make 2014-06-06 19:57:03.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/buildtree.make 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,6 @@ # # Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. @@ -6978,7 +7025,7 @@ .dbxrc: $(BUILDTREE_MAKE) @echo Creating $@ ... --- ./hotspot/make/bsd/makefiles/gcc.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/gcc.make 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/gcc.make 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,6 @@ # # Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7025,7 +7072,7 @@ # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp. --- ./hotspot/make/bsd/makefiles/jsig.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/jsig.make 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/jsig.make 2014-07-15 23:24:52.000000000 -0700 @@ -36,9 +36,16 @@ LIBJSIG_G = lib$(JSIG_G).so endif @@ -7079,7 +7126,7 @@ .PHONY: install_jsig --- ./hotspot/make/bsd/makefiles/launcher.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/launcher.make 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/launcher.make 2014-07-15 23:24:52.000000000 -0700 @@ -50,7 +50,7 @@ LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) else @@ -7090,7 +7137,7 @@ # The gamma launcher runs the JDK from $JAVA_HOME, overriding the JVM with a # freshly built JVM at ./libjvm.{so|dylib}. This is accomplished by setting --- ./hotspot/make/bsd/makefiles/mapfile-vers-product 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7570,7 +7617,7 @@ +}; --- ./hotspot/make/bsd/makefiles/ppc.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/ppc.make 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/ppc.make 2014-07-15 23:24:52.000000000 -0700 @@ -28,3 +28,6 @@ # Must also specify if CPU is big endian CFLAGS += -DVM_BIG_ENDIAN @@ -7579,7 +7626,7 @@ +ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1 +endif --- ./hotspot/make/bsd/makefiles/saproc.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/saproc.make 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/saproc.make 2014-07-15 23:24:52.000000000 -0700 @@ -36,6 +36,11 @@ LIBSAPROC_G = lib$(SAPROC_G).so endif @@ -7637,7 +7684,7 @@ fi --- ./hotspot/make/bsd/makefiles/vm.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/vm.make 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/vm.make 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,6 @@ # # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. @@ -7670,7 +7717,7 @@ LFLAGS_VM += $(LLVM_LDFLAGS) endif --- ./hotspot/make/hotspot_version 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/hotspot_version 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/make/hotspot_version 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7688,13 +7735,13 @@ HS_MAJOR_VER=24 -HS_MINOR_VER=0 -HS_BUILD_NUMBER=56 -+HS_MINOR_VER=60 -+HS_BUILD_NUMBER=09 ++HS_MINOR_VER=65 ++HS_BUILD_NUMBER=04 JDK_MAJOR_VER=1 JDK_MINOR_VER=7 --- ./hotspot/make/linux/makefiles/arm.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/linux/makefiles/arm.make 2014-04-19 01:27:07.000000000 -0700 ++++ ./hotspot/make/linux/makefiles/arm.make 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. @@ -7713,7 +7760,7 @@ CFLAGS += -DVM_LITTLE_ENDIAN --- ./hotspot/make/linux/makefiles/buildtree.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/linux/makefiles/buildtree.make 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/make/linux/makefiles/buildtree.make 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,6 @@ # # Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. @@ -7739,7 +7786,7 @@ echo "# Used for platform dispatching"; \ echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ --- ./hotspot/make/linux/makefiles/gcc.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/linux/makefiles/gcc.make 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/make/linux/makefiles/gcc.make 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,6 @@ # # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. @@ -7761,7 +7808,7 @@ CFLAGS += $(LLVM_CFLAGS) endif --- ./hotspot/make/linux/makefiles/vm.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/linux/makefiles/vm.make 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/make/linux/makefiles/vm.make 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,6 @@ # # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. @@ -7803,7 +7850,7 @@ LFLAGS_VM += $(LLVM_LDFLAGS) endif --- ./hotspot/make/solaris/makefiles/defs.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/solaris/makefiles/defs.make 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/solaris/makefiles/defs.make 2014-07-15 23:24:52.000000000 -0700 @@ -221,8 +221,8 @@ endif ifeq ($(JVM_VARIANT_CLIENT),true) @@ -7816,7 +7863,7 @@ ifeq ($(ARCH_DATA_MODEL),32) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) --- ./hotspot/make/windows/makefiles/compile.make 2013-09-06 11:22:01.000000000 -0700 -+++ ./hotspot/make/windows/makefiles/compile.make 2013-12-01 11:14:01.000000000 -0800 ++++ ./hotspot/make/windows/makefiles/compile.make 2014-07-15 23:24:52.000000000 -0700 @@ -172,6 +172,7 @@ PRODUCT_OPT_OPTION = /O2 /Oy- FASTDEBUG_OPT_OPTION = /O2 /Oy- @@ -7856,7 +7903,7 @@ # If NO_OPTIMIZATIONS is defined in the environment, turn everything off --- ./hotspot/make/windows/makefiles/sa.make 2013-09-06 11:22:01.000000000 -0700 -+++ ./hotspot/make/windows/makefiles/sa.make 2013-12-01 11:14:01.000000000 -0800 ++++ ./hotspot/make/windows/makefiles/sa.make 2014-07-15 23:24:52.000000000 -0700 @@ -107,6 +107,9 @@ !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" SA_LFLAGS = $(SA_LFLAGS) -map -debug @@ -7868,7 +7915,7 @@ # Note that we do not keep sawindbj.obj around as it would then # get included in the dumpbin command in build_vm_def.sh --- ./hotspot/src/cpu/sparc/vm/assembler_sparc.cpp 2013-09-06 11:22:01.000000000 -0700 -+++ ./hotspot/src/cpu/sparc/vm/assembler_sparc.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/cpu/sparc/vm/assembler_sparc.cpp 2014-07-15 23:24:52.000000000 -0700 @@ -4512,7 +4512,7 @@ #define __ masm. address start = __ pc(); @@ -7895,7 +7942,7 @@ // Use return-from-leaf __ retl(); --- ./hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp 2013-09-06 11:22:01.000000000 -0700 -+++ ./hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp 2014-07-15 23:24:52.000000000 -0700 @@ -36,6 +36,9 @@ #include "runtime/signature.hpp" #include "runtime/vframeArray.hpp" @@ -7932,7 +7979,7 @@ // Use return-from-leaf __ retl(); --- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2014-07-15 23:24:52.000000000 -0700 @@ -71,7 +71,11 @@ define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteFrequentPairs, true); @@ -7946,7 +7993,7 @@ // GC Ergo Flags define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread --- ./hotspot/src/cpu/sparc/vm/sparc.ad 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/sparc/vm/sparc.ad 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/cpu/sparc/vm/sparc.ad 2014-07-15 23:24:52.000000000 -0700 @@ -3399,8 +3399,8 @@ interface(CONST_INTER); %} @@ -8029,7 +8076,7 @@ size(4); --- ./hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. @@ -8064,7 +8111,7 @@ __ dispatch_next(vtos); // end of JVMTI PopFrame support --- ./hotspot/src/cpu/x86/vm/assembler_x86.cpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/assembler_x86.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/assembler_x86.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -8754,13 +8754,18 @@ const Register card_addr = tmp; lea(card_addr, as_Address(ArrayAddress(cardtable, index))); @@ -8087,7 +8134,7 @@ cmpl(queue_index, 0); jcc(Assembler::equal, runtime); --- ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -1686,14 +1686,6 @@ } @@ -8119,7 +8166,7 @@ if (op->fast_check()) { --- ./hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -1395,19 +1395,18 @@ addr = new LIR_Address(src.result(), offset, type); } @@ -8146,7 +8193,7 @@ // Seems to be a precise address post_barrier(LIR_OprFact::address(addr), data); --- ./hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -37,6 +37,9 @@ #include "runtime/signature.hpp" #include "runtime/vframeArray.hpp" @@ -8178,7 +8225,7 @@ __ cmpl(queue_index, 0); __ jcc(Assembler::equal, runtime); --- ./hotspot/src/cpu/x86/vm/frame_x86.cpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/frame_x86.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/frame_x86.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -94,12 +94,6 @@ // other generic buffer blobs are more problematic so we just assume they are // ok. adapter blobs never have a frame complete and are never ok. @@ -8205,7 +8252,7 @@ // On Intel the return_address is always the word on the stack sender_pc = (address) *(sender_sp-1); --- ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -62,7 +62,7 @@ // due to lack of optimization caused by C++ compiler bugs define_pd_global(intx, StackShadowPages, NOT_WIN64(20) WIN64_ONLY(6) DEBUG_ONLY(+2)); @@ -8216,7 +8263,7 @@ define_pd_global(intx, PreInflateSpin, 10); --- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. @@ -8253,7 +8300,7 @@ // end of PopFrame support --- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. @@ -8290,7 +8337,7 @@ // end of PopFrame support --- ./hotspot/src/cpu/x86/vm/x86_32.ad 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/x86_32.ad 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/x86_32.ad 2014-07-15 23:24:53.000000000 -0700 @@ -3919,6 +3919,17 @@ interface(CONST_INTER); %} @@ -8326,7 +8373,7 @@ "AND $dst.lo,$mask" %} ins_encode %{ --- ./hotspot/src/cpu/x86/vm/x86_64.ad 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/x86_64.ad 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/x86_64.ad 2014-07-15 23:24:52.000000000 -0700 @@ -3142,6 +3142,17 @@ interface(CONST_INTER); %} @@ -8362,7 +8409,7 @@ ins_encode %{ Register Rdst = $dst$$Register; --- ./hotspot/src/cpu/zero/vm/entryFrame_zero.hpp 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/cpu/zero/vm/entryFrame_zero.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/cpu/zero/vm/entryFrame_zero.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -1,6 +1,6 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -8383,7 +8430,7 @@ public: --- ./hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -1,6 +1,6 @@ /* * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8402,7 +8449,7 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407161521.s6GFLd1q041843>