Mercurial > hg > release > icedtea6-1.13
view patches/hotspot/hs23/zero_hs22.patch @ 3248:06179516eff2
Update to build against the b39 tarball & April 2016 security fixes.
Upstream changes:
- S4459600: java -jar fails to run Main-Class if classname followed by whitespace.
- S4963723: Implement SHA-224
- S6378099: RFE: Use libfontconfig to create/synthesise a fontconfig.properties
- S6414899: P11Digest should support cloning
- S6452854: Provide a flag to print the java configuration
- S6578658: Request for raw RSA (NONEwithRSA) Signature support in SunMSCAPI
- S6604496: Support for CKM_AES_CTR (counter mode)
- S6742159: (launcher) improve the java launching mechanism
- S6752622: java.awt.Font.getPeer throws "java.lang.InternalError: Not implemented" on Linux
- S6753664: Support SHA256 (and higher) in SunMSCAPI
- S6758881: (launcher) needs to throw NoClassDefFoundError instead of JavaRuntimeException
- S6812738: SSL stress test with GF leads to 32 bit max process size in less than 5 minutes with PCKS11 provider
- S6856415: Enabling java security manager will make program thrown wrong exception ( main method not found )
- S6892493: potential memory leaks in 2D font code indentified by parfait.
- S6924489: sun.security.pkcs11.wrapper.PKCS11Exception: CKR_OPERATION_NOT_INITIALIZED
- S6925851: Localize JRE into pt_BR
- S6956398: make ephemeral DH key match the length of the certificate key
- S6968053: (launcher) hide exceptions under certain launcher failures
- S6977738: Deadlock between java.lang.ClassLoader and java.util.Properties
- S6981001: (launcher) EnsureJREInstallation is not being called in order
- S7017734: jdk7 message drop 1 translation integration
- S7026184: (launcher) Regression: class with unicode name can't be launched by java.
- S7033170: Cipher.getMaxAllowedKeyLength(String) throws NoSuchAlgorithmException
- S7044060: Need to support NSA Suite B Cryptography algorithms
- S7104161: test/sun/tools/jinfo/Basic.sh fails on Ubuntu
- S7106773: 512 bits RSA key cannot work with SHA384 and SHA512
- S7125442: jar application located in two bytes character named folder cannot be run with JRE 7 u1/u2
- S7127906: (launcher) convert the launcher regression tests to java
- S7141141: Add 3 new test scenarios for testing Main-Class attribute in jar manifest file
- S7158988: jvm crashes while debugging on x86_32 and x86_64
- S7189944: (launcher) test/tools/launcher/Arrrrghs.java needs a couple of minor fixes
- S7193318: C2: remove number of inputs requirement from Node's new operator
- S8002116: This JdbReadTwiceTest.sh gets an exit 1
- S8004007: test/sun/tools/jinfo/Basic.sh fails on when runSA is set to true
- S8006935: Need to take care of long secret keys in HMAC/PRF compuation
- S8023990: Regression: postscript size increase from 6u18
- S8027705: com/sun/jdi/JdbMethodExitTest.sh fails when a background thread is generating events.
- S8028537: PPC64: Updated the JDK regression tests to run on AIX
- S8036132: Tab characters in test/com/sun/jdi files
- S8038963: com/sun/jdi tests fail because cygwin's ps sometimes misses processes
- S8039921: SHA1WithDSA with key > 1024 bits not working
- S8044419: TEST_BUG: com/sun/jdi/JdbReadTwiceTest.sh fails when run under root
- S8059661: Test SoftReference and OOM behavior
- S8067364: Printing to Postscript doesn't support dieresis
- S8072753: Nondeterministic wrong answer on arithmetic
- S8073735: [TEST_BUG] compiler/loopopts/CountedLoopProblem.java got OOME
- S8074146: [TEST_BUG] jdb has succeded to read an unreadable file
- S8075584: test for 8067364 depends on hardwired text advance
- S8087120: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms.
- S8129952: Ensure thread consistency
- S8132051: Better byte behavior
- S8134297: NPE in GSSNameElement nameType check
- S8134650: Xsl transformation gives different results in 8u66
- S8138593: Make DSA more fair
- S8141229: [Parfait] Null pointer dereference in cmsstrcasecmp of cmserr.c
- S8143002: [Parfait] JNI exception pending in fontpath.c:1300
- S8143167: Better buffering of XML strings
- S8144430: Improve JMX connections
- S8146477: [TEST_BUG] ClientJSSEServerJSSE.java failing again
- S8146494: Better ligature substitution
- S8146498: Better device table adjustments
- S8146967: [TEST_BUG] javax/security/auth/SubjectDomainCombiner/Optimize.java should use 4-args ProtectionDomain constructor
- S8147567: InterpreterRuntime::post_field_access not updated for boolean in JDK-8132051
- S8148446: (tz) Support tzdata2016a
- S8148475: Missing SA Bytecode updates.
- S8149170: Better byte behavior for native arguments
- S8149367: PolicyQualifierInfo/index_Ctor JCk test fails with IOE: Invalid encoding for PolicyQualifierInfo
- S8150012: Better byte behavior for reflection
- S8150790: 8u75 L10n resource file translation update
- S8154210: Zero: Better byte behaviour
- S8155261: Zero broken since HS23 update
- S8155699: Resolve issues created by backports in OpenJDK 6 b39
- S8155699: Resolve issues created by backports in OpenJDK 6 b39, part 2
- S8155746: Sync Windows export list in make/java/jli/Makefile with make/java/jli/mapfile-vers
ChangeLog:
2016-05-03 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(OPENJDK_DATE): Bump to b39 creation date;
3rd of May, 2016.
(OPENJDK_SHA256SUM): Update for b39 tarball.
2016-05-03 Andrew John Hughes <gnu.andrew@member.fsf.org>
* patches/openjdk/8039921-sha1_1024plus.patch:
Remove further b39 patch missed in earlier batch.
2016-05-03 Andrew John Hughes <gnu.andrew@member.fsf.org>
* patches/openjdk/4963723-implement_sha-224.patch,
* patches/openjdk/6578658-sunmscapi_nonewithrsa.patch,
* patches/openjdk/6753664-sunmscapi_sha-256.patch,
* patches/openjdk/6956398-ephemeraldhkeysize.patch,
* patches/openjdk/7033170-getmaxallowedkeylength_throws_exception.patch,
* patches/openjdk/7044060-support_nsa_suite_b.patch,
* patches/openjdk/7106773-512_bits_rsa.patch,
* patches/openjdk/8006935-long_keys_in_hmac_prf.patch,
* patches/openjdk/8087120-zero_gcc5.patch,
* patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch,
* patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch,
* patches/openjdk/p11cipher-6812738-native_cleanup.patch,
* patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch,
* patches/pr2486-768_dh.patch,
* patches/pr2488-1024_dh.patch:
Remove patches upstreamed in b39.
* Makefile.am:
(ICEDTEA_PATCHES): Remove above patches.
* NEWS: Updated.
* patches/openjdk/7170638-systemtap.patch:
Regenerated due to copyright header change in jni.cpp.
2016-05-03 Andrew John Hughes <gnu.andrew@redhat.com>
* patches/hotspot/hs23/zero_fixes.patch:
Remove fragments upstreamed in 8155261.
* patches/hotspot/hs23/zero_hs22.patch:
Likewise.
2016-01-29 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(OPENJDK_VERSION): Bump to next release, b39.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Wed, 04 May 2016 04:24:30 +0100 |
parents | a4e16f083f3b |
children |
line wrap: on
line source
diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make --- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2016-05-03 20:02:04.292927351 +0100 +++ openjdk/hotspot/make/linux/makefiles/defs.make 2016-05-03 20:13:14.185874164 +0100 @@ -232,6 +232,7 @@ # client and server subdirectories have symbolic links to ../libjsig.so EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) +ifneq ($(ZERO_BUILD), true) ifneq ($(STRIP_POLICY),no_strip) ifeq ($(ZIP_DEBUGINFO_FILES),1) EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz @@ -240,12 +241,14 @@ endif endif endif +endif EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client ifndef BUILD_CLIENT_ONLY EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) + ifneq ($(ZERO_BUILD), true) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ifneq ($(STRIP_POLICY),no_strip) ifeq ($(ZIP_DEBUGINFO_FILES),1) @@ -255,6 +258,7 @@ endif endif endif + endif endif ifneq ($(ZERO_BUILD), true) @@ -277,6 +281,7 @@ $(EXPORT_LIB_DIR)/sa-jdi.jar ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ $(EXPORT_LIB_DIR)/sa-jdi.jar +ifneq ($(ZERO_BUILD), true) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ifneq ($(STRIP_POLICY),no_strip) ifeq ($(ZIP_DEBUGINFO_FILES),1) @@ -288,6 +293,7 @@ endif endif endif +endif ADD_SA_BINARIES/ppc = ADD_SA_BINARIES/ia64 = ADD_SA_BINARIES/arm = diff -Nru openjdk.orig/hotspot/make/linux/platform_zero.in openjdk/hotspot/make/linux/platform_zero.in --- openjdk.orig/hotspot/make/linux/platform_zero.in 2010-06-14 19:53:45.000000000 +0100 +++ openjdk/hotspot/make/linux/platform_zero.in 2016-05-03 20:13:14.185874164 +0100 @@ -14,4 +14,4 @@ gnu_dis_arch = zero -sysdefs = -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\" +sysdefs = -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DTARGET_ARCH_NYI_6939861=1 -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\" diff -Nru openjdk.orig/hotspot/src/share/vm/shark/sharkCompiler.cpp openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp --- openjdk.orig/hotspot/src/share/vm/shark/sharkCompiler.cpp 2013-09-13 00:30:29.750950170 +0100 +++ openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp 2016-05-03 20:13:14.189874098 +0100 @@ -1,6 +1,6 @@ /* * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2008, 2009, 2010, 2011 Red Hat, Inc. + * Copyright 2008, 2009, 2010, 2011, 2012 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -319,7 +319,7 @@ // finish with the exception of the VM thread, so we can consider // ourself the owner of the execution engine lock even though we // can't actually acquire it at this time. - assert(Thread::current()->is_VM_thread(), "must be called by VM thread"); + assert(JavaThread::current()->thread_state() == _thread_in_vm, "must run in vm mode"); assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); SharkEntry *entry = (SharkEntry *) code;