/hg/icedtea7: Update to icedtea-2.6pre07.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Aug 27 23:15:05 UTC 2014
changeset 09cfe444b2eb in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=09cfe444b2eb
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Aug 27 23:03:26 2014 +0100
Update to icedtea-2.6pre07.
PR1948: Only try and symlink debuginfo if STRIP_POLICY is other than no_strip
PR1948: Fix indenting
S4963723: Implement SHA-224
S4991647: PNGMetadata.getAsTree() sets bitDepth to invalid value
S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec
S6984762: Invalid close of file descriptor '-1' in findZoneinfoFile
S6993873: java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java test indicates ".a frame wasn't focused on click" jdk7 issue on linux
S7036518: TEST_BUG: add cygwin support to test/java/nio/charset/coders/CheckSJISMappingProp.sh
S7044060, RH1131221: Need to support NSA Suite B Cryptography algorithms
S7095856: OutputStreamHook doesn't handle null values
S8011646: SEGV in compiled code with loop predication
S8016545: java.beans.XMLEncoder.writeObject output is wrong
S8019834: InetAddress.getByName hangs for bad IPv6 literals
S8021804: Certpath validation fails if validity period of root cert does not include validity period of intermediate cert
S8025051: Update resource files for TimeZone display names
S8028074: InetAddress.getByName fails with UHE "invalid IPv6 address" if host name starts with a-f
S8029837: NPE seen in XMLDocumentFragmentScannerImpl.setProperty since 7u40b33
S8030192: TESTFAIL: java/util/logging/TestLoggerBundleSync.java failed with NPE
S8031046: Native Windows ccache might still get unsupported ticket
S8031068: java/util/logging/ParentLoggersTest.java: checkLoggers: getLoggerNames() returned unexpected loggers
S8031290: Adjust call to getisax() for additional words returned
S8031435: Ftp download does not work properly for ftp user without password
S8032864: [macosx] sigsegv (0Xb) Being Generated When Starting JDev With Voiceover Running
S8032901: WaitForMultipleObjects() return value not handled appropriately
S8032908: getTextContent doesn't return string in JAXP
S8036709: Java 7 jarsigner displays warning about cert policy tree
S8040076: Memory leak: java.awt.List objects allowing multiple selections are not GC-ed.
S8041918: BootstrapMethods attribute cannot be empty.
S8041990: [macosx] Language specific keys does not work in applets when opened outside the browser
S8042465: Applet menus not rendering when browser is full screen on Mac
S8042982: Unexpected RuntimeExceptions being thrown by SSLEngine
S8043129: JAF initialisation in SAAJ clashing with the one in javax.mail
S8043200: Decrease the preference mode of RC4 in the enabled cipher suite list
S8043206: Fix signed vs. unsigned comparison warning in copy_sparc.hpp
S8043354: OptimizePtrCompare too aggressive when allocations are present
S8044614: [macosx] Focus issue with 2 applets in firefox
S8044659: Java SecureRandom on SPARC T4 much slower than on x86/Linux
S8046024: JDI shared memory transport failed with "Observed abandoned IP mutex"
S8046269: Build broken : THIS_FILE : undeclared identifier
S8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX
S8046495: KeyEvent can not be accepted in quick mouse clicking
S8046559: NPE when changing Windows theme
S8046769: Set T family feature bit on Niagara systems
S8048080: (smartcardio) javax.smartcardio.Card.openLogicalChannel() dosn't work on MacOSX
S8048271: Minor GC times doubled from JDK 6u35 to JDK 7u51
S8048506: [macosx] javax.swing.PopupFactory issue with null owner
S8048887: SortingFocusTraversalPolicy throws IllegalArgumentException from the sort method
S8049250: Need a flag to invert the Card.disconnect(reset) argument
S8049480: Current versions of Java can't verify jars signed and timestamped with Java 9
S8049514: FEATURE_SECURE_PROCESSING can not be turned off on a validator through SchemaFactory
S8049542: C2: assert(size_in_words <= (julong)max_jint) failed: no overflow
S8050165: linux-sparcv9: NMT detail causes assert((intptr_t*)younger_sp[FP->sp_offset_in_saved_window()] == (intptr_t*)((intptr_t)sp - STACK_BIAS)) failed: younger_sp must be valid
S8050167: linux-sparcv9: hs_err file does not show any stack information
S8050386: javac, follow-up of fix for JDK-8049305
S8051004: javac, incorrect bug id in tests for JDK-8050386
S8051012: Regression in verifier for <init> method call from inside of a branch
S8051844: BootstrapMethods attribute cannot be empty again
S8052159: TEST_BUG: javax/swing/JTextField/8036819/bug8036819.java fails to compile
S8054841: (process) ProcessBuilder leaks native memory
diffstat:
ChangeLog | 26 +
Makefile.am | 26 +-
NEWS | 65 +-
configure.ac | 2 +-
hotspot.map | 2 +-
patches/boot/ecj-diamond.patch | 1224 ++++++++++++++++++------------------
patches/boot/ecj-multicatch.patch | 77 ++
7 files changed, 790 insertions(+), 632 deletions(-)
diffs (truncated from 3470 to 500 lines):
diff -r 9f91f8d8857f -r 09cfe444b2eb ChangeLog
--- a/ChangeLog Wed Aug 13 21:21:16 2014 +0100
+++ b/ChangeLog Wed Aug 27 23:03:26 2014 +0100
@@ -1,3 +1,29 @@
+2014-08-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am,
+ (BUILD_VERSION): Set to b01.
+ (CORBA_CHANGESET): Update to icedtea-2.6pre07.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ * NEWS: Updated. Cleanup duplicates.
+ * configure.ac: Bump to 2.6pre07.
+ * hotspot.map: Update to icedtea-2.6pre07.
+ * patches/boot/ecj-diamond.patch:
+ Regenerated. Add new case in OutputStreamHook.
+ * patches/boot/ecj-multicatch.patch:
+ Regenerated. Add new cases in
+ SortingFocusTraversalPolicy, SecureRandom and
+ ECDHCrypt.
+
2014-08-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am,
diff -r 9f91f8d8857f -r 09cfe444b2eb Makefile.am
--- a/Makefile.am Wed Aug 13 21:21:16 2014 +0100
+++ b/Makefile.am Wed Aug 27 23:03:26 2014 +0100
@@ -1,22 +1,22 @@
# Dependencies
JDK_UPDATE_VERSION = 80
-BUILD_VERSION = b01
+BUILD_VERSION = b02
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = 250d1a2def5b
-JAXP_CHANGESET = 75513ef5e265
-JAXWS_CHANGESET = 37d1831108b5
-JDK_CHANGESET = 21eee0ed9be9
-LANGTOOLS_CHANGESET = f43a81252f82
-OPENJDK_CHANGESET = b07e2aed0a26
+CORBA_CHANGESET = 30f5a9254154
+JAXP_CHANGESET = 614b7c12f276
+JAXWS_CHANGESET = f21a65d1832c
+JDK_CHANGESET = 0cc91db3a787
+LANGTOOLS_CHANGESET = 3eab691bd9ac
+OPENJDK_CHANGESET = 390d699dae61
-CORBA_SHA256SUM = f2ed859b08a092db05bffb86605849644d21c951204b4db0e813e0203360d558
-JAXP_SHA256SUM = 39491a205465326b1d2f6d74ee14c79191b2acd475916617a290725c9b7d4df7
-JAXWS_SHA256SUM = 4288b5140ed7f6f368be5897ccea56ee5a63e07d57833f8bac4206af87d11afd
-JDK_SHA256SUM = 45dede8c62e8768df2d8141043610a5a5a9afea974252ad87b77676ab179c561
-LANGTOOLS_SHA256SUM = f9678c341aa7f0c6d248502c9f7746ba3abbd2c01fa542751f4e70fee5eb9131
-OPENJDK_SHA256SUM = 7583c81af29e727d6234fcf5760e88c71f07c51288ab4d9afd22461fcef832d0
+CORBA_SHA256SUM = 0e3d6de86d961eb78fb8772551736d2714a4243bfa2564e97cdccdab46744482
+JAXP_SHA256SUM = 1fd51eba3addba7fb23803dc31a1d4f4690a36e4813c9e3cb8280a063591cbe8
+JAXWS_SHA256SUM = 15131dfd51691567024e4217653bfdf30c4481aee1282f6c1b9ba097271d16cd
+JDK_SHA256SUM = 2f7160feb741a0b953318ced15f6749e74e708a7ef7c2cf6f2ff0ca0cbc64202
+LANGTOOLS_SHA256SUM = c67866825e43a4ccde0c87fba0de9df2c41049d4d9ad8853e0997a40531ab04b
+OPENJDK_SHA256SUM = 4870d912c1e09534ddfb453577708fb986b15dd8c514f2be9135082f4dd1c1a1
DROP_URL = http://icedtea.classpath.org/download/drops
diff -r 9f91f8d8857f -r 09cfe444b2eb NEWS
--- a/NEWS Wed Aug 13 21:21:16 2014 +0100
+++ b/NEWS Wed Aug 27 23:03:26 2014 +0100
@@ -15,13 +15,19 @@
New in release 2.6.0 (2014-XX-XX):
* OpenJDK
+ - S4991647: PNGMetadata.getAsTree() sets bitDepth to invalid value
- S5036554: unmarshal error on CORBA alias type in CORBA any
+ - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec
- S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems
+ - S6984762: Invalid close of file descriptor '-1' in findZoneinfoFile
+ - S6993873: java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java test indicates ".a frame wasn't focused on click" jdk7 issue on linux
+ - S7036518: TEST_BUG: add cygwin support to test/java/nio/charset/coders/CheckSJISMappingProp.sh
- S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true
- S7052170: javadoc -charset option generates wrong meta tag
- S7076487: (sctp) SCTP API classes does not exist in JDK for Mac
- S7084032: test/java/net/Inet6Address/B6558853.java fails on Windows XP/2003 if IPv6
- S7090324: gclog rotation via external tool
+ - S7095856: OutputStreamHook doesn't handle null values
- S7094099: DropDown List of JComboBox detached
- S7121403: [TESTBUG] runtime/7051189/Xchecksig.sh fails on 64bit solaris
- S7122142: (ann) Race condition between isAnnotationPresent and getAnnotations
@@ -39,13 +45,17 @@
- S8002148: [TEST_BUG] The four lines printed are not the bold typeface.
- S8006023: Embedded Builds fail management test because of requirement for UsePerfData being enabled.
- S8010738: G1: Output for full GCs with +PrintGCDetails should contain perm gen/meta data size change info
+ - S8011646: SEGV in compiled code with loop predication
- S8011795: DOM Serializer prints stack traces to System.err
- S8012026: [macosx] Component.getMousePosition() does not work in an applet on MacOS
- S8013098: [macosx] localized aqua_xx.properties are not included in rt.jar
- S8015421: NegativeArraySizeException occurs in ChunkedOutputStream() with Integer.MAX_VALUE
+ - S8016545: java.beans.XMLEncoder.writeObject output is wrong
- S8019623: Lack of synchronization in AppContext.getAppContext()
- S8019800: Test sun/tools/jcmd/jcmd-f.sh failing after JDK-8017011
+ - S8019834: InetAddress.getByName hangs for bad IPv6 literals
- S8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address
+ - S8021804: Certpath validation fails if validity period of root cert does not include validity period of intermediate cert
- S8022070: Compilation error in stubGenerator_sparc.cpp with some compilers
- S8022531: [TEST_BUG] After double-click on the folder names , there is no 'OK' button in the dialog.
- S8022836: JVM crashes in JVMTIENVBASE::GET_CURRENT_CONTENDED_MONITOR and GET_OWNED_MONITOR
@@ -53,12 +63,14 @@
- S8024675: java/net/NetworkInterface/UniqueMacAddressesTest.java fails on Windows
- S8024677: [TESTBUG] Move tests for classes in /testlibrary
- S8024932: [TEST_BUG] [macosx] javax/swing/text/StyledEditorKit/8016833/bug8016833.java failed
+ - S8025051: Update resource files for TimeZone display names
- S8025710: Proxied HTTPS connections reused by HttpClient can send CONNECT to the server
- S8026792: HOTSPOT: licensee reports a JDK8 build failure after 8005849/8005008 fixes integrated.
- S8027026: Change keytool -genkeypair to use -keyalg RSA
- S8027348: (process) Enhancement of handling async close of ProcessInputStream
- S8027359: XML parser returns incorrect parsing results
- S8028073: race condition in ObjectMonitor implementation causing deadlocks
+ - S8028074: InetAddress.getByName fails with UHE "invalid IPv6 address" if host name starts with a-f
- S8028192: Use of PKCS11-NSS provider in FIPS mode broken
- S8028616: Htmleditorkit parser doesn't handle leading slash (/)
- S8028617: Dvorak keyboard mapping not honored when ctrl key pressed
@@ -66,11 +78,17 @@
- S8028627: Unsynchronized code path from javax.crypto.Cipher to the WeakHashMap used by JceSecurity to store codebase mappings
- S8028726: (prefs) Check src/solaris/native/java/util/FileSystemPreferences.c for JNI pending exceptions
- S8029073: (corba) New connection reclaimed when number of connection is greater than highwatermark
+ - S8029837: NPE seen in XMLDocumentFragmentScannerImpl.setProperty since 7u40b33
- S8030114: [parfait] warnings from b119 for jdk.src.share.native.sun.security.smartcardio: JNI exception pending
+ - S8030192: TESTFAIL: java/util/logging/TestLoggerBundleSync.java failed with NPE
- S8030698: Several GUI labels in jconsole need correction
- S8030712: TEST_BUG : java/lang/ProcessBuilder/BasicLauncher.java fails if java output contains VM warning
- S8030878: JConsole issues meaningless message if SSL connection fails
+ - S8031046: Native Windows ccache might still get unsupported ticket
- S8031061: new hotspot build - hs24.60-b07
+ - S8031068: java/util/logging/ParentLoggersTest.java: checkLoggers: getLoggerNames() returned unexpected loggers
+ - S8031290: Adjust call to getisax() for additional words returned
+ - S8031435: Ftp download does not work properly for ftp user without password
- S8031572: jarsigner -verify exits with 0 when a jar file is not properly signed
- S8031743: C2: loadI2L_immI broken for negative memory values
- S8031764: tmtools/jmap/heap_config tests fail on Linux-ia32 because it Cant attach to the core file
@@ -79,9 +97,12 @@
- S8032669: Mouse release not being delivered to Swing component in 7u45
- S8032788: ImageIcon constructor throws an NPE and hangs when passed a null String parameter
- S8032832: Applet/browser deadlocks, when IIS integrated authentication is used
+ - S8032864: [macosx] sigsegv (0Xb) Being Generated When Starting JDev With Voiceover Running
- S8032872: [macosx] Cannot select from JComboBox in a JWindow
- S8032874: ArrayIndexOutOfBoundsException in JTable while clearing data in JTable
- S8032878: Editable combos in table do not behave as expected
+ - S8032901: WaitForMultipleObjects() return value not handled appropriately
+ - S8032908: getTextContent doesn't return string in JAXP
- S8032909: XSLT string-length returns incorrect length when string includes complementary chars
- S8033113: wsimport fails on WSDL:header parameter name customization
- S8033524: Set minor version for hotspot in 7u80 to 80 and build number to b01
@@ -97,6 +118,7 @@
- S8035973: NPE in ForwardBuilder
- S8035988: 7u60 l10n resource file translation update 1
- S8036022: D3D: rendering with XOR composite causes InternalError.
+ - S8036709: Java 7 jarsigner displays warning about cert policy tree
- S8036778: new hotspot build - hs24.80-b05
- S8036819: JAB: mneumonics not read for textboxes
- S8036863: Update jdk7 testlibrary to match jdk8 in hotspot
@@ -120,27 +142,65 @@
- S8039396: NPE when writing a class descriptor object to a custom ObjectOutputStream
- S8039891: Remove ppcsflt builds from JPRT
- S8039899: Missing licence headers in test for JDK-8033113
+ - S8040076: Memory leak: java.awt.List objects allowing multiple selections are not GC-ed.
- S8040664: Revert temporary fix JDK-8038785
- S8040790: [TEST_BUG] tools/javac/innerClassFile/Driver.sh fails to cleanup files after it
- S8041351: Crash in src/share/vm/opto/loopnode.cpp:3215 - assert(! had_error) failed: bad dominance
- S8041451: com.sun.jndi.ldap.Connection:ReadTimeout should abandon ldap request
- S8041507: Java Access Bridge version strings need to be fixed
- S8041725: Nimbus JList selection colors persist across L&F changes
+ - S8041918: BootstrapMethods attribute cannot be empty.
- S8041931: test/sun/net/www/http/HttpClient/B8025710.java fails with cannot find keystore
+ - S8041990: [macosx] Language specific keys does not work in applets when opened outside the browser
- S8042059: Various fixes to linux/sparc
- S8042247: Make 7u60 the default jprt release for hs24.80
- S8042250: Misleading command line output for ReservedCodeCacheSize validation
+ - S8042465: Applet menus not rendering when browser is full screen on Mac
- S8042857: 14 stuck threads waiting for notification on LDAPRequest
+ - S8042982: Unexpected RuntimeExceptions being thrown by SSLEngine
+ - S8043129: JAF initialisation in SAAJ clashing with the one in javax.mail
+ - S8043200: Decrease the preference mode of RC4 in the enabled cipher suite list
- S8043205: Incorrect system traps.h include path
+ - S8043206: Fix signed vs. unsigned comparison warning in copy_sparc.hpp
- S8043207: Add const to Address argument for Assembler::swap
- S8043210: Add _BIG_ENDIAN define on linux/sparc
+ - S8043354: OptimizePtrCompare too aggressive when allocations are present
- S8043507: javax.smartcardio.CardTerminals.list() fails on MacOSX
- S8043720: (smartcardio) Native memory should be handled more accurately
+ - S8044614: [macosx] Focus issue with 2 applets in firefox
+ - S8044659: Java SecureRandom on SPARC T4 much slower than on x86/Linux
+ - S8046024: JDI shared memory transport failed with "Observed abandoned IP mutex"
+ - S8046269: Build broken : THIS_FILE : undeclared identifier
+ - S8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX
+ - S8046495: KeyEvent can not be accepted in quick mouse clicking
+ - S8046559: NPE when changing Windows theme
+ - S8046769: Set T family feature bit on Niagara systems
+ - S8048080: (smartcardio) javax.smartcardio.Card.openLogicalChannel() dosn't work on MacOSX
+ - S8048271: Minor GC times doubled from JDK 6u35 to JDK 7u51
+ - S8048506: [macosx] javax.swing.PopupFactory issue with null owner
+ - S8048887: SortingFocusTraversalPolicy throws IllegalArgumentException from the sort method
+ - S8049250: Need a flag to invert the Card.disconnect(reset) argument
+ - S8049480: Current versions of Java can't verify jars signed and timestamped with Java 9
+ - S8049514: FEATURE_SECURE_PROCESSING can not be turned off on a validator through SchemaFactory
+ - S8049542: C2: assert(size_in_words <= (julong)max_jint) failed: no overflow
+ - S8050165: linux-sparcv9: NMT detail causes assert((intptr_t*)younger_sp[FP->sp_offset_in_saved_window()] == (intptr_t*)((intptr_t)sp - STACK_BIAS)) failed: younger_sp must be valid
+ - S8050167: linux-sparcv9: hs_err file does not show any stack information
+ - S8050386: javac, follow-up of fix for JDK-8049305
+ - S8051004: javac, incorrect bug id in tests for JDK-8050386
+ - S8051012: Regression in verifier for <init> method call from inside of a branch
+ - S8051844: BootstrapMethods attribute cannot be empty again
+ - S8052159: TEST_BUG: javax/swing/JTextField/8036819/bug8036819.java fails to compile
+ - S8054841: (process) ProcessBuilder leaks native memory
+* Backports
+ - S4963723: Implement SHA-224
+ - S7044060, RH1131221: Need to support NSA Suite B Cryptography algorithms
* Bug fixes
- PR1786: Allow x86 build to occur on x86_64 using a previously built x86_64 build
- PR1846: Build fails when using IcedTea7 as bootstrap JDK with native ecj
- PR1847: Synchronise javac.in with IcedTea6
- PR1903: [REGRESSION] Bug reports now lack IcedTea version & distribution packaging information
+ - PR1948: Only try and symlink debuginfo if STRIP_POLICY is other than no_strip
+ - PR1948: Fix indenting
* PPC & AIX port
- Adapt AIX port to 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
- Adapt aix to 8022507
@@ -321,22 +381,17 @@
- S8023990: Regression: postscript size increase from 6u18
- S8024283: 10 nashorn tests fail with similar stack trace InternalError with cause being NoClassDefFoundError
- S8024616: JSR292: lazily initialize core NamedFunctions used for bootstrapping
- - S8025030: Enhance stream handling
- - S8026188: Enhance envelope factory
- S8027212: java/nio/channels/Selector/SelectAfterRead.java fails intermittently
- S8028285: RMI Thread can no longer call out to AWT
- S8029177: [Parfait] warnings from b117 for jdk.src.share.native.com.sun.java.util.jar: JNI exception pending
- S8031075: [Regression] focus disappears with shift+tab on dialog having one focus component
- S8032585: JSR292: IllegalAccessError when attempting to invoke protected method from different package
- - S8032686: Issues with method invoke
- S8033278: Missed access checks for Lookup.unreflect* after 8032585
- - S8033618: Correct logging output
- S8034926: Attribute classes properly
- S8035613: With active Securitymanager JAXBContext.newInstance fails
- S8035834: InetAddress.getLocalHost() can hang after JDK-8030731 was fixed
- S8035923: Set minor version for hotspot in 7u65 to 65 and build number to b01
- S8036786: Update jdk7 testlibrary to match jdk8
- - S8036794: Manage JavaScript instances
- S8039324: Increment hsx 24.65 build to b02 for 7u65-b07
- S8040156: Increment hsx 24.65 build to b03 for 7u65-b08
- S8041264: Increment hsx 24.65 build to b04 for 7u65-b09
diff -r 9f91f8d8857f -r 09cfe444b2eb configure.ac
--- a/configure.ac Wed Aug 13 21:21:16 2014 +0100
+++ b/configure.ac Wed Aug 27 23:03:26 2014 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6pre06], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.6pre07], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AM_MAINTAINER_MODE([enable])
AC_CONFIG_FILES([Makefile])
diff -r 9f91f8d8857f -r 09cfe444b2eb hotspot.map
--- a/hotspot.map Wed Aug 13 21:21:16 2014 +0100
+++ b/hotspot.map Wed Aug 27 23:03:26 2014 +0100
@@ -1,3 +1,3 @@
# version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7 b517477362d1 9c8fc60f6c697d4799b74aef01fb17d59c1773ce2895c710030d0201560857aa
+default drop http://icedtea.classpath.org/download/drops/icedtea7 8ffb87775f56 4ebe884633a09388f1801303e77307ceb1987d2228963c6f517939ac5f26cd0c
aarch64 hg http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot f50993b6c38d 64c2d0bfa71d6eecf18ab28fd64d5bd79af096f77548d80de7953c306fd9c22c
diff -r 9f91f8d8857f -r 09cfe444b2eb patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Wed Aug 13 21:21:16 2014 +0100
+++ b/patches/boot/ecj-diamond.patch Wed Aug 27 23:03:26 2014 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-05-02 20:39:22.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-05-07 09:16:14.295618203 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-08-26 17:33:01.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-08-27 20:14:12.708188437 +0100
@@ -58,7 +58,7 @@
private CorbaConnection conn;
@@ -10,9 +10,21 @@
public static synchronized void cleanCache( ORB orb ) {
synchronized (iorMapLock) {
+diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2014-08-27 20:52:41.924822884 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2014-08-27 20:51:46.160036468 +0100
+@@ -50,7 +50,7 @@
+ */
+ private class HookPutFields extends ObjectOutputStream.PutField
+ {
+- private Map<String,Object> fields = new HashMap<>();
++ private Map<String,Object> fields = new HashMap<String,Object>();
+
+ /**
+ * Put the value of the named boolean field into the persistent field.
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-05-02 20:39:22.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-05-07 09:16:14.295618203 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-08-26 17:33:01.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-08-27 20:14:12.708188437 +0100
@@ -1315,7 +1315,7 @@
protected void shutdownServants(boolean wait_for_completion) {
Set<ObjectAdapterFactory> oaset;
@@ -23,8 +35,8 @@
for (ObjectAdapterFactory oaf : oaset)
diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-05-02 20:39:22.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-05-07 09:16:14.295618203 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-08-26 17:33:01.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-08-27 20:14:12.708188437 +0100
@@ -108,7 +108,7 @@
private ThreadGroup threadGroup;
@@ -44,8 +56,8 @@
for (WorkerThread wt : copy) {
diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-05-07 09:02:02.658962232 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-05-07 09:16:14.295618203 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-08-27 20:02:23.754188862 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-08-27 20:14:12.708188437 +0100
@@ -297,8 +297,8 @@
//
private final static class EncodingInfos {
@@ -67,8 +79,8 @@
final String javaName = (String) keys.nextElement();
final String[] mimes = parseMimeTypes(props.getProperty(javaName));
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-05-02 20:39:34.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-05-07 09:16:14.295618203 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-08-27 18:40:41.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-08-27 20:14:12.708188437 +0100
@@ -63,9 +63,10 @@
*/
public final class DocumentHandler extends DefaultHandler {
@@ -84,8 +96,8 @@
private Reference<ClassLoader> loader;
private ExceptionListener listener;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-05-02 20:39:34.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-05-07 09:16:14.295618203 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-08-27 18:40:41.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-08-27 20:14:12.708188437 +0100
@@ -46,7 +46,7 @@
*/
public final class TypeResolver {
@@ -105,8 +117,8 @@
CACHE.put(actual, map);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-05-02 20:39:34.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-05-07 09:16:14.295618203 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-08-27 18:40:41.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-08-27 20:14:12.708188437 +0100
@@ -45,7 +45,7 @@
private final Kind keyKind; // a reference kind for the cache keys
private final Kind valueKind; // a reference kind for the cache values
@@ -153,8 +165,8 @@
};
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 2014-05-02 20:39:34.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-05-07 09:16:14.295618203 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-08-27 18:40:41.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-08-27 20:14:12.708188437 +0100
@@ -104,9 +104,9 @@
return this.def.compareTo(that.def);
}
@@ -226,8 +238,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 2014-05-07 09:02:02.682962584 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-05-07 09:16:14.299618264 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-08-27 20:02:25.262210201 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-08-27 20:14:12.712188492 +0100
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -290,8 +302,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 2014-05-07 09:02:02.590961236 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-05-07 09:16:14.299618264 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-08-27 20:02:23.526185635 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-08-27 20:14:12.712188492 +0100
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -302,8 +314,8 @@
InnerClass ic =
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 2014-05-02 20:39:34.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-05-07 09:16:14.299618264 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-08-27 18:40:41.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-08-27 20:14:12.712188492 +0100
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -340,8 +352,8 @@
if (popset.add(values[i])) popvals.add(values[i]);
}
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 2014-05-02 20:39:34.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-05-07 09:16:14.299618264 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-08-27 18:40:41.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-08-27 20:14:12.712188492 +0100
@@ -402,7 +402,7 @@
private static Map<Coding, Coding> codeMap;
@@ -352,8 +364,8 @@
Coding x1 = codeMap.get(x0);
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 2014-05-02 20:39:34.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-05-07 09:16:14.299618264 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-08-27 18:40:41.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-08-27 20:14:12.712188492 +0100
@@ -921,7 +921,7 @@
public static
Index[] partition(Index ix, int[] keys) {
@@ -382,8 +394,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 2014-05-07 09:02:02.682962584 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-05-07 09:16:14.299618264 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-08-27 20:02:25.682216144 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-08-27 20:14:12.712188492 +0100
@@ -61,7 +61,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
@@ -421,8 +433,8 @@
for (String optline : options.split("\n")) {
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 2014-05-02 20:39:34.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-05-07 09:16:14.299618264 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-08-27 18:40:41.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-08-27 20:14:12.712188492 +0100
@@ -45,7 +45,7 @@
private final ArrayList<E> flist;
@@ -433,8 +445,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 2014-05-07 09:02:02.590961236 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-05-07 09:16:14.299618264 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-08-27 20:02:23.586186484 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-08-27 20:14:12.712188492 +0100
@@ -112,7 +112,7 @@
public static final Attribute.Layout attrSourceFileSpecial;
public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -590,8 +602,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 2014-05-07 09:02:02.682962584 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-05-07 09:16:14.299618264 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-08-27 20:02:25.682216144 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-08-27 20:14:12.712188492 +0100
@@ -686,7 +686,7 @@
cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
cp_Signature_classes.readFrom(in);
@@ -705,8 +717,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 2014-05-07 09:02:02.686962643 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-05-07 09:16:14.299618264 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-08-27 20:02:25.682216144 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-08-27 20:14:12.712188492 +0100
@@ -116,7 +116,7 @@
int[][] attrCounts; // count attr. occurences
@@ -762,8 +774,8 @@
for (Class cls : pkg.classes) {
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 2014-05-02 20:39:34.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2014-05-07 09:16:14.299618264 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2014-08-27 18:40:41.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2014-08-27 20:14:12.712188492 +0100
@@ -183,8 +183,8 @@
final Map<Attribute.Layout, Attribute> attrDefs;
final Map<Attribute.Layout, String> attrCommands;
@@ -794,8 +806,8 @@
for (JarEntry je : Collections.list(jf.entries())) {
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
More information about the distro-pkg-dev
mailing list