/hg/release/icedtea7-2.5: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Apr 2 19:10:41 UTC 2014
changeset 6058e8604054 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=6058e8604054
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Apr 02 20:07:23 2014 +0100
Update to 2.5pre03, which updates OpenJDK to u60b12.
2014-04-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(BUILD_VERSION): Bump to b12.
(CORBA_CHANGESET): Update to icedtea-2.5pre03 tag.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
(ICEDTEA_PREFIX): Change to 2.5 branch.
(ICEDTEA_HG_URL): Likewise.
* NEWS: Updated.
* configure.ac: Bump to 2.5pre03.
* hotspot.map: Update to icedtea-2.5pre03 tag.
* patches/boot/ecj-diamond.patch,
* patches/boot/ecj-trywithresources.patch:
Updated.
changeset d3eb8e1c6de5 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=d3eb8e1c6de5
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Apr 02 20:10:19 2014 +0100
PR1713: Support AArch64 port
2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
* acinclude.m4:
(IT_ENABLE_ZERO_BUILD): Default to off on aarch64/arm64.
(IT_WITH_HOTSPOT_BUILD): Default to aarch64 port on aarch64.
diffstat:
ChangeLog | 31 +
Makefile.am | 30 +-
NEWS | 81 +-
acinclude.m4 | 8 +-
configure.ac | 2 +-
hotspot.map | 2 +-
patches/boot/ecj-diamond.patch | 3141 +++++++++++++++---------------
patches/boot/ecj-trywithresources.patch | 229 +-
8 files changed, 1814 insertions(+), 1710 deletions(-)
diffs (truncated from 5596 to 500 lines):
diff -r d6111697298d -r d3eb8e1c6de5 ChangeLog
--- a/ChangeLog Wed Apr 02 13:07:21 2014 +0100
+++ b/ChangeLog Wed Apr 02 20:10:19 2014 +0100
@@ -1,3 +1,34 @@
+2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * acinclude.m4:
+ (IT_ENABLE_ZERO_BUILD): Default to off on aarch64/arm64.
+ (IT_WITH_HOTSPOT_BUILD): Default to aarch64 port on aarch64.
+
+2014-04-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (BUILD_VERSION): Bump to b12.
+ (CORBA_CHANGESET): Update to icedtea-2.5pre03 tag.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (ICEDTEA_PREFIX): Change to 2.5 branch.
+ (ICEDTEA_HG_URL): Likewise.
+ * NEWS: Updated.
+ * configure.ac: Bump to 2.5pre03.
+ * hotspot.map: Update to icedtea-2.5pre03 tag.
+ * patches/boot/ecj-diamond.patch,
+ * patches/boot/ecj-trywithresources.patch:
+ Updated.
+
2014-04-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Add release notes for 2.3.14 & 2.4.6.
diff -r d6111697298d -r d3eb8e1c6de5 Makefile.am
--- a/Makefile.am Wed Apr 02 13:07:21 2014 +0100
+++ b/Makefile.am Wed Apr 02 20:10:19 2014 +0100
@@ -1,22 +1,22 @@
# Dependencies
JDK_UPDATE_VERSION = 60
-BUILD_VERSION = b03
+BUILD_VERSION = b12
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = 16906c5a09da
-JAXP_CHANGESET = d7085aad637f
-JAXWS_CHANGESET = 4aeccc3040fa
-JDK_CHANGESET = 3162252ff26b
-LANGTOOLS_CHANGESET = f75a642c2913
-OPENJDK_CHANGESET = fc5d15cc35b4
+CORBA_CHANGESET = 3a7c12d7b1cf
+JAXP_CHANGESET = 1fef0a819b0a
+JAXWS_CHANGESET = c3f7dc317cdb
+JDK_CHANGESET = 06f771c9a7b7
+LANGTOOLS_CHANGESET = f38810d86876
+OPENJDK_CHANGESET = 9e3f6f4585c5
-CORBA_SHA256SUM = 29dec824dd068c8ba89e9d079bc63e5c408ccc915118098381734495a0ef6610
-JAXP_SHA256SUM = 68540ee04cc159e4fb1dcc6f138242049fb870e907c4268b163039ad8ab5cae3
-JAXWS_SHA256SUM = 773022f057151aefb8c632670f0059e49a1e9b1d95a45e86e2450b0b5aaf6619
-JDK_SHA256SUM = 8680fd2a56dc388abaa9c3350d79f38f6638099406e81bc665d8f1a1f09273e5
-LANGTOOLS_SHA256SUM = 61363d33c482ead26951ba60eef75a2f8410178b2bed1eea012365cbf6f26ad4
-OPENJDK_SHA256SUM = 5f1548010cce513537e232609557d12ab854ff17d4fbaa83a830e1b3216fc0ee
+CORBA_SHA256SUM = 5482758eb6ba5953b100dd8754b11905bcfc839741f1987c301fd16f26222a74
+JAXP_SHA256SUM = 1fa313b7d1bddc6d52cfd344a281ed9d5fffd79bdc83499b9761581aacb6dd1e
+JAXWS_SHA256SUM = f6c9d4da5581d08ba5b0cc692d84dea7b90d665d10e0c1eedcfe8c706bc779ef
+JDK_SHA256SUM = d3a87a47e2919e76abe9f616378852546300f6630804cb2ec1defb642d113f31
+LANGTOOLS_SHA256SUM = 7b77d3083347edd22a9227175cce2749844e59bcad737c22b4ede925c25cb34d
+OPENJDK_SHA256SUM = f13b6a59399b388875bf71c8b864bff025d2cf2beb494fa00df60034ca4267bb
CACAO_VERSION = e215e36be9fc
CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
@@ -30,8 +30,8 @@
JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
-ICEDTEA_PREFIX = icedtea7-forest
-ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX)
+ICEDTEA_PREFIX = icedtea7-forest-2.5
+ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/release/$(ICEDTEA_PREFIX)
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/
CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/
diff -r d6111697298d -r d3eb8e1c6de5 NEWS
--- a/NEWS Wed Apr 02 13:07:21 2014 +0100
+++ b/NEWS Wed Apr 02 20:10:19 2014 +0100
@@ -16,9 +16,12 @@
* OpenJDK
- S5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
+ - S6412968: CMS: Long initial mark pauses
+ - S6571600: JNI use results in UnsatisfiedLinkError looking for libmawt.so
- S6889597: TEST_BUG: javax/management/remote/mandatory/URLTest.java test should be updated in jdk7 Workspace
- S6900441: PlatformEvent.park(millis) on Linux could still be affected by changes to the time-of-day clock
- S6989981: jstack causes "fatal error: ExceptionMark destructor expects no pending exceptions"
+ - S7074436: (sc) SocketChannel can do short gathering writes when channel configured blocking (win)
- S7123493: (proxy) Proxy.getProxyClass doesn't scale under high load
- S7124232: [TEST_BUG] [macosx] JSplitPane has wrong divider location
- S7124314: [TEST_BUG] [macosx] Aqua LAF: JTree doesn't select element by keyboards left and right keys
@@ -28,52 +31,103 @@
- S7133122: SA throws sun.jvm.hotspot.debugger.UnmappedAddressException when it should not
- S7133146: [macosx] closed/javax/swing/JInternalFrame/4193219/IconCoord fails on MacOS
- S7133154: [TEST_BUG] [macosx] closed/javax/swing/JInternalFrame/4251301/bug4251301.java fails on MacOS
+ - S7145569: G1: optimize nmethods scanning
- S7147084: (process) appA hangs when read output stream of appB which starts appC that runs forever
- S7171591: getDefaultScopeID() in src/solaris/native/java/net/net_util_md.c should return a value
- S7173464: Clipboard.getAvailableDataFlavors: Comparison method violates contract
+ - S7186887: Test T6567415.java can fail on a slow machine
+ - S7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
- S7191817: -XX:+UseSerialGC -XX:+UseLargePages crashes with SIGFPE on MacOS X
+ - S7194607: VerifyLocalVariableTableOnRetransformTest.sh fails after JSR-292 merge
- S7197210: java/lang/invoke/CallSiteTest.java failing on armsflt.
+ - S7199674: (props) user.home property does not return an accessible location in sandboxed environment [macosx]
+ - S8003253: TEST_BUG: java/nio/channels/AsynchronousChannelGroup/Unbounded.java hang intermittently [win]
- S8003262: reverse translation required changes in xalan resource bundles
+ - S8003285: TEST_BUG: java/nio/channels/AsynchronousChannelGroup/Unbounded.java fails again [macosx]
+ - S8003895: java/nio/channels/AsynchronousChannelGroup/Unbounded.java failing again [win64]
- S8004032: [TEST_BUG] [macosx] There is no effect when double clicking on the Icon, after right clicking on the Icon and the Icon disappear
- S8004051: assert(_oprs_len[mode] < maxNumberOfOperands) failed: array overflow
- S8004476: XSLT Extension Functions Don't Work in WebStart
+ - S8005128: JSR 292: the mlvm redefineClassInBootstrap test crashes in ConstantPool::compare_entry_to
- S8006395: Race in async socket close on Linux
+ - S8006542: JSR 292: the VM_RedefineClasses::append_entry() must support invokedynamic entry kinds
+ - S8006546: JSR 292: typos in the ConstantPool::copy_cp_impl()
+ - S8006628: NEED_TEST for JDK-8002870
+ - S8006731: JSR 292: the VM_RedefineClasses::rewrite_cp_refs_in_method() must support invokedynamic
+ - S8007037: JSR 292: the VM_RedefineClasses::append_entry() should do cross-checks with indy operands
- S8007454: (process) SetHandleInformation parameters DWORD (not BOOLEAN)
- S8008118: (process) Possible null pointer dereference in jdk/src/solaris/native/java/lang/UNIXProcess_md.c
+ - S8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
- S8008733: Psr:perf:osb performance regression (18%) in wss_bodyenc
+ - S8009062: poor performance of JNI AttachCurrentThread after fix for 7017193
- S8009213: sun/management/jdp/JdpTest.sh fails with exit code 1
+ - S8009222: java.lang.IllegalArgumentException: not invocable, no method type when attempting to get getter method handle for a static field
+ - S8011194: Apps launched via double-clicked .jars have file.encoding value of US-ASCII on Mac OS X
+ - S8011343: Add new flag for verifying the heap during startup
+ - S8011944: Sort fails with ArrayIndexOutOfBoundsException
- S8011955: Lunar screen reader crashes intermittently in WindowsAccessBridge-32.DLL
+ - S8012244: java/net/Socket/asyncClose/Race.java fails intermittently on Windows
- S8012326: Deadlock occurs when Charset.availableCharsets() is called by several threads at the same time
- S8012615: Realm.getRealmsList returns realms list in wrong
- S8012925: [parfait] Missing return value in jdk/src/macosx/native/sun/awt/AWTEvent.m
+ - S8013132: Add a flag to turn off the output of the verbose verification code
+ - S8013895: G1: G1SummarizeRSetStats output on Linux needs improvement
+ - S8013945: CMS fatal error: must own lock MemberNameTable_lock
+ - S8014052: JSR292: assert(end_offset == next_offset) failed: matched ending
+ - S8014078: G1: improve remembered set summary information by providing per region type information
+ - S8014240: G1: Add remembered set size information to output of G1PrintRegionLivenessInfo
+ - S8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
+ - S8014394: (fs) WatchService failing when watching \\server\$d
+ - S8014555: G1: Memory ordering problem with Conc refinement and card marking
- S8015092: SchemaFactory cannot parse schema if whitespace added within patterns in Selector XPath expression
- S8015243: SchemaFactory does not catch enum. value that is not in the value space of the base type, anyURI
+ - S8015244: G1: Verification after a full GC is incorrectly placed.
- S8015599: [TEST_BUG] [macosx] Test closed/javax/swing/Popup/TaskbarPositionTest.java fails since JDK 8 b75 on MacOSX
- S8015600: [TEST_BUG] [macosx] Test closed/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java fails since JDK 8 b75 on MacOSX
- S8016018: Typo in AbstractStringBuilder#indexOf and #lastIndexOf descriptions
- S8016271: wsimport -clientjar does not create portable jars on Windows due to hardcoded backslash
+ - S8016328: Regression : Javadoc i18n regression caused by fix for 8012375
- S8016500: Unlocalized warnings.
- S8017180: [macosx] [TEST_BUG] alt-key doesn't work on macos for menu
- S8017195: Introduce option to setKeepAlive parameter on CORBA sockets
+ - S8017456: [TEST_BUG] java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html: test frames remain after test execution
+ - S8017498: JVM crashes when native code calls sigaction(sig) where sig>=0x20
+ - S8017779: java/net/Authenticator/B4769350.java fails
+ - S8019184: MethodHandles.catchException() fails when methods have 8 args + varargs
+ - S8019389: SA-JDI JSR292: sun.jvm.hotspot.jdi.StackFrame.thisObject() throws sun.jvm.hotspot.utilities.AssertionFailure: sanity check
- S8019396: SA-JDI: OSThread class initialization throws an exception
+ - S8019853: Break logging and AWT circular dependency
+ - S8020123: Test gc/g1/TestPrintRegionRememberedSetInfo.java fails with "test result: Error. No action after @build"
+ - S8020191: System.getProperty("os.name") returns "Windows NT (unknown)" on Windows 8.1
+ - S8020530: Non heap memory size calculated incorrectly
+ - S8020791: [TESTBUG] runtime/jsig/Test8017498.sh failed to compile native code
- S8021257: com.sun.corba.se.** should be on restricted package list
+ - S8021296: [TESTBUG] Test8017498.sh fails to find "gcc" and fails to compile on some Linux releases
- S8021368: Launch of Java Web Start app fails with ClassCircularityError exception in 7u25
- S8021898: Broken JIT compiler optimization for loop unswitching
- S8021943: FileDialog getFile returns corrupted string after previous setFile
- S8022213: Intermittent test failures in java/net/URLClassLoader
+ - S8022452: Hotspot needs to know about Windows 8.1 and Windows Server 2012 R2
- S8022507: SIGSEGV at ParMarkBitMap::verify_clear()
- S8022584: Memory leak in some NetworkInterface methods
- S8022585: VM crashes when ran with -XX:+PrintInlining
+ - S8022698: javax/script/GetInterfaceTest.java fails since 7u45 b04 with -agentvm option
- S8022993: Convert MAX_UNROLL constant to LoopMaxUnroll C2 flag
+ - S8023004: JSR 292: java.lang.RuntimeException: Original target method was called.
- S8023130: (process) ProcessBuilder#inheritIO does not work on Windows
+ - S8023145: G1: G1CollectedHeap::mark_strong_code_roots() needs to handle ParallelGCThreads=0
- S8023472: C2 optimization breaks with G1
- S8023580: Add jtreg test for 8004051 and 8005722
- S8023720: (hotspot) setjmp/longjmp changes the process signal mask on OS X
- S8023786: (jdk) setjmp/longjmp changes the process signal mask on OS X
+ - S8023881: IDN.USE_STD3_ASCII_RULES option is too strict to use Unicode in IDN.toASCII
+ - S8023956: Provide a work-around to broken Linux 32 bit "Exec Shield" using CS for NX emulation (crashing with SI_KERNEL)
- S8024027: Test sun/misc/IoTrace/IoTraceSocketReadWrite.java crashes VM
- S8024163: [macosx] NullPointerException at javax.swing.TransferHandler$DropHandler.handleDrag since jdk8b93, 7u40b28
- S8024521: (process) Async close issues with Process InputStream
+ - S8024648: 7141246 & 8016131 break Zero port
- S8024707: TransformerException : item() return null with node list of length != 1
+ - S8024788: (fs) Files.readAllBytes uses FileChannel which may not be supported by all providers
- S8024830: SEGV in org.apache.lucene.codecs.compressing.CompressingTermVectorsReader.get
- S8024861: Incomplete token triggers GSS-API NullPointerException
- S8024876: [TEST_BUG] javax/xml/jaxp/parsers/8022548/XOMParserTest.java failed when testbase dir has read only permissions
@@ -83,33 +137,43 @@
- S8025205: Intermittent test failure: javax/management/remote/mandatory/connection/BrokenConnectionTest.java
- S8025206: Intermittent test failure: javax/management/monitor/NullAttributeValueTest.java
- S8025207: Intermittent test failure: javax/management/monitor/CounterMonitorThresholdTest.java
+ - S8025305: Cleanup CardTableModRefBS usage in G1
- S8025512: NPE with logging while launching webstart on jre7u40 if logging is disabled
+ - S8025541: G1: assert "assert(thread < _num_vtimes) failed: just checking" fails when G1ConcRefinementThreads > ParallelGCThreads
- S8025713: Syncing indendation/comment/copyright year differences with upstream projects
- S8025775: JNI warnings in TryXShmAttach
- S8025860: new hotspot build - hs24.60-b02
- S8025861: Set minor version for hotspot in 7u60 to 60 and build number to b01
- S8025920: webrev.ksh does not provide any details about changes in zip files
- S8026293: Schedule part of G1 pre-barrier late
+ - S8026404: Logging in Applet can trigger ACE: access denied ("java.lang.RuntimePermission" "modifyThreadGroup")
- S8026405: javax/xml/ws/clientjar/TestWsImport.java failing on JDK 8 nightly aurora test runs
- S8026486: Significant slowdown due to transparent huge pages
- S8026502: java/lang/invoke/MethodHandleConstants.java fails on all platforms
- S8026794: Test tools/pack200/TimeStamp.java fails while opening golden.jar.native.IST on linux-ppc(v2)
+ - S8026848: -XX:+G1SummarizeRSetStats can result in wrong exit code and crash
- S8027066: XMLDecoder in java 7 cannot properly deserialize object arrays
- S8027172: new hotspot build - hs24.60-b03
- S8027351: (ref) Private finalize method invoked in preference to protected superclass method
- S8027426: String.toLowerCase incorrectly increases length, if string contains \u0130 char
+ - S8027454: Do not traverse string table during G1 remark when treating them as strong roots during initial mark
+ - S8027476: Improve performance of Stringtable unlink
- S8027579: new hotspot build - hs24.60-b04
+ - S8027756: assert(!hr->isHumongous()) failed: code root in humongous region?
- S8027839: C1 crashes in Weblogic with G1 enabled
- S8027840: C2 allows safepoint checks to leak into G1 pre-barriers
- S8027860: [TEST_BUG] File not closed in javax/xml/jaxp/parsers/8022548/XOMParserTest.java
+ - S8027973: javax/xml/jaxp/transform/jdk8004476/XSLTExFuncTest.java hangs (win)
- S8027997: G1: SPECjbb2013 crashes due to a broken object reference
- S8028054: com.sun.beans.finder.MethodFinder has unsynchronized access to a static Map
- S8028208: (aio) Assertion in clearPendingIoMap when closing at around time file lock is acquired immediately (win)
- S8028351: JWS doesn't get authenticated when using kerberos auth proxy
+ - S8028391: Make the Min/MaxHeapFreeRatio flags manageable
- S8028412: AsyncGetCallTrace() is broken on x86 in JDK 7u40
- S8028520: JVM should not throw VerifyError when a private method overrides a final method
- S8028583: Add helper methods to test libraries
- S8028814: new hotspot build - hs24.60-b06
+ - S8029281: Synchronization issues in Logger and LogManager
- S8029304: JFR broken in 7u train for JDK Linux for ARM or OpenJDK
- S8029318: Native Windows ccache still reads DES tickets
- S8029366: ShouldNotReachHere error when creating an array with component type of void
@@ -117,7 +181,21 @@
- S8029903: Add a type safe alternative for working with counter based data
- S8030061: new hotspot build - hs24.60-b05
- S8030070: Test java/io/File/CheckPermission.java fails due to unfinished recursion (java.lang.StackOverflowError) when JIT'ed code (-client,-server) is running
+ - S8030698: Several GUI labels in jconsole need correction
- S8031787: Remove fix JDK-8026887 from 7u60
+ - S8031980: Add new j.u.l deadlock test for JDK-8027670 and JDK-8029281
+ - S8032013: new hotspot build - hs24.60-b08
+ - S8032207: C2: assert(VerifyOops || MachNode::size(ra_) <= (3+1)*4) failed: bad fixed size
+ - S8032771: The flag VerifySilently misses a test case
+ - S8032960: Running forms URL throws NullPointerException in Javaconsole.
+ - S8032986: new hotspot build - hs24.60-b09
+ - S8033294: javac, spurious warning for instanceof operator
+ - S8033443: Test8000311 fails after latest changes to parallelize string and symbol table unlink
+ - S8033487: Improve GC option handling
+ - S8035893: JVM_GetVersionInfo fails to zero structure
+ - S8035897: Better memory allocation for file descriptors greater than 1024 on macosx
+ - S8035988: 7u60 l10n resource file translation update 1
+ - S8036584: Review comments from 8035897
* Backports
- S7103549: Remove dependencies on libjava and libjvm from security libraries
- S8000204: Memory leak in com/sun/security/auth/module/Unix.c
@@ -127,7 +205,7 @@
- S8008509: 6588413 changed JNIEXPORT visibility for GCC on HSX, jdk's jni_md.h needs similar change
- S8014307: Memory leak ... security/jgss/wrapper/GSSLibStub.c
* Bug fixes
- - Fix implicit function declarations
+ - Fix implicit function declarations in j2secmod_md.c introduced by 7103549.
- PR1617: Include defs.make in vm.make so zeroshark.make is included
- Remove binary files and unlicensed generated files
- PR1655: Don't add IcedTea-Web jars to bootclasspath
@@ -152,6 +230,7 @@
- Remove duplicate ElfFuncDescTable code in elfSymbolTable.cpp
- Remove duplicate ElfFuncDescTable code in elfSymbolTable.hpp
- PR1726: configure fails looking for ecj.jar before even trying to find javac
+ - PR1699: Support building the SunEC provider with system NSS
* PPC & AIX port
- Add AIX-specific build instructions to README-ppc.html
- Added AIX as testing platform for more jtreg tests written in shell-script
diff -r d6111697298d -r d3eb8e1c6de5 acinclude.m4
--- a/acinclude.m4 Wed Apr 02 13:07:21 2014 +0100
+++ b/acinclude.m4 Wed Apr 02 20:10:19 2014 +0100
@@ -692,6 +692,8 @@
use_zero=yes;
else
case "${host_cpu}" in
+ aarch64) ;;
+ arm64) ;;
i?86) ;;
sparc) ;;
x86_64) ;;
@@ -953,7 +955,11 @@
AC_DEFUN_ONCE([IT_WITH_HOTSPOT_BUILD],
[
AC_REQUIRE([IT_ENABLE_ZERO_BUILD])
- DEFAULT_BUILD="default"
+ if test "x$JRE_ARCH_DIR" = "xaarch64"; then
+ DEFAULT_BUILD="aarch64"
+ else
+ DEFAULT_BUILD="default"
+ fi
AC_MSG_CHECKING([which HotSpot build to use])
AC_ARG_WITH([hotspot-build],
[AS_HELP_STRING(--with-hotspot-build=BUILD,the HotSpot build to use [[BUILD=default]])],
diff -r d6111697298d -r d3eb8e1c6de5 configure.ac
--- a/configure.ac Wed Apr 02 13:07:21 2014 +0100
+++ b/configure.ac Wed Apr 02 20:10:19 2014 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.5pre02], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.5pre03], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r d6111697298d -r d3eb8e1c6de5 hotspot.map
--- a/hotspot.map Wed Apr 02 13:07:21 2014 +0100
+++ b/hotspot.map Wed Apr 02 20:10:19 2014 +0100
@@ -1,3 +1,3 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot f30e87f16d90 871fa08b8e9d7a2958cee844f940752c39b1946146dc382c005269e86b687a49
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/hotspot 903304e152fc 74c1ba2ddd7130bf8a5d85fad48886ece9b81ac41dee8d4be5f51a459db8e9c9
aarch64 http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot f50993b6c38d 64c2d0bfa71d6eecf18ab28fd64d5bd79af096f77548d80de7953c306fd9c22c
diff -r d6111697298d -r d3eb8e1c6de5 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Wed Apr 02 13:07:21 2014 +0100
+++ b/patches/boot/ecj-diamond.patch Wed Apr 02 20:10:19 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 2013-12-26 19:50:41.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2013-12-26 22:23:06.678103309 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-04-02 02:15:58.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-04-02 17:41:00.051402827 +0100
@@ -58,7 +58,7 @@
private CorbaConnection conn;
@@ -11,8 +11,8 @@
public static synchronized void cleanCache( ORB orb ) {
synchronized (iorMapLock) {
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 2013-12-26 19:50:41.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-12-26 22:23:06.678103309 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-04-02 02:15:58.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-04-02 17:41:00.051402827 +0100
@@ -1315,7 +1315,7 @@
protected void shutdownServants(boolean wait_for_completion) {
Set<ObjectAdapterFactory> oaset;
@@ -23,8 +23,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 2013-12-26 19:50:41.000000000 +0000
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2013-12-26 22:23:06.678103309 +0000
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-04-02 02:15:58.000000000 +0100
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-04-02 17:41:00.051402827 +0100
@@ -108,7 +108,7 @@
private ThreadGroup threadGroup;
@@ -44,8 +44,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 2013-12-26 22:21:55.853021204 +0000
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2013-12-26 22:23:06.678103309 +0000
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-04-02 17:31:38.095077810 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-04-02 17:41:00.051402827 +0100
@@ -297,8 +297,8 @@
//
private final static class EncodingInfos {
@@ -66,9 +66,26 @@
while (keys.hasMoreElements()) {
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-04-02 02:16:12.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-04-02 17:41:00.051402827 +0100
+@@ -63,9 +63,10 @@
+ */
+ public final class DocumentHandler extends DefaultHandler {
+ private final AccessControlContext acc = AccessController.getContext();
+- private final Map<String, Class<? extends ElementHandler>> handlers = new HashMap<>();
+- private final Map<String, Object> environment = new HashMap<>();
+- private final List<Object> objects = new ArrayList<>();
++ private final Map<String, Class<? extends ElementHandler>> handlers =
++ new HashMap<String, Class<? extends ElementHandler>>();
++ private final Map<String, Object> environment = new HashMap<String, Object>();
++ private final List<Object> objects = new ArrayList<Object>();
+
+ 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 2013-12-26 19:50:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2013-12-26 22:23:06.678103309 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-04-02 02:16:12.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-04-02 17:41:00.051402827 +0100
@@ -46,7 +46,7 @@
*/
public final class TypeResolver {
@@ -87,26 +104,9 @@
prepare(map, actual);
CACHE.put(actual, map);
}
-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 2013-12-26 19:50:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-12-26 22:23:06.678103309 +0000
-@@ -62,9 +62,10 @@
- */
- public final class DocumentHandler extends DefaultHandler {
- private final AccessControlContext acc = AccessController.getContext();
-- private final Map<String, Class<? extends ElementHandler>> handlers = new HashMap<>();
-- private final Map<String, Object> environment = new HashMap<>();
-- private final List<Object> objects = new ArrayList<>();
-+ private final Map<String, Class<? extends ElementHandler>> handlers =
-+ new HashMap<String, Class<? extends ElementHandler>>();
-+ private final Map<String, Object> environment = new HashMap<String, Object>();
-+ private final List<Object> objects = new ArrayList<Object>();
-
- private Reference<ClassLoader> loader;
- private ExceptionListener listener;
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 2013-12-26 22:27:51.086449155 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2013-12-26 22:32:25.923332967 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-04-02 02:16:12.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-04-02 17:41:00.051402827 +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 +153,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 2013-12-26 19:50:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2013-12-26 22:23:06.678103309 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-04-02 02:16:12.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-04-02 17:41:00.051402827 +0100
@@ -104,9 +104,9 @@
return this.def.compareTo(that.def);
}
@@ -226,8 +226,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 2013-12-26 22:21:55.889021755 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2013-12-26 22:23:06.678103309 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-04-02 17:31:38.115078106 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-04-02 17:41:00.051402827 +0100
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -290,8 +290,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 2013-12-26 22:21:55.753019677 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2013-12-26 22:23:06.678103309 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-04-02 17:31:36.579055349 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-04-02 17:41:00.051402827 +0100
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -301,21 +301,9 @@
for (int i = 0; i < nc; i++) {
InnerClass ic =
new InnerClass(readClassRef(),
-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 2013-12-26 19:50:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2013-12-26 22:23:06.678103309 +0000
-@@ -402,7 +402,7 @@
- private static Map<Coding, Coding> codeMap;
-
- private static synchronized Coding of(int B, int H, int S, int del) {
-- if (codeMap == null) codeMap = new HashMap<>();
-+ if (codeMap == null) codeMap = new HashMap<Coding, Coding>();
- Coding x0 = new Coding(B, H, S, del);
- 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/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 2013-12-26 19:50:56.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2013-12-26 22:23:06.678103309 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-04-02 02:16:12.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-04-02 17:41:00.051402827 +0100
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -351,9 +339,21 @@
for (int i = start; i < end; i++) {
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-04-02 02:16:12.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-04-02 17:41:00.051402827 +0100
More information about the distro-pkg-dev
mailing list