/hg/icedtea8-forest/jdk: 14 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Mar 29 03:22:23 UTC 2016
changeset 9a843dc6f959 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=9a843dc6f959
author: asaha
date: Tue Dec 22 12:30:11 2015 -0800
Added tag jdk8u72-b15 for changeset f3e86cc60726
changeset c740e8a471fb in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=c740e8a471fb
author: asaha
date: Wed Jan 27 21:58:08 2016 -0800
Added tag jdk8u74-b00 for changeset 9a843dc6f959
changeset 9b77d3ca0d66 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=9b77d3ca0d66
author: asaha
date: Wed Jan 27 21:53:16 2016 -0800
Added tag jdk8u73-b00 for changeset 892eb9ab1796
changeset 2ab13901d6f1 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=2ab13901d6f1
author: asaha
date: Thu Jan 28 12:08:38 2016 -0800
Added tag jdk8u73-b01 for changeset 9b77d3ca0d66
changeset e829ab80dfd8 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=e829ab80dfd8
author: asaha
date: Thu Jan 28 12:31:40 2016 -0800
Merge
changeset d69d1d1a48fb in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=d69d1d1a48fb
author: asaha
date: Thu Jan 28 12:38:00 2016 -0800
Added tag jdk8u74-b01 for changeset e829ab80dfd8
changeset 63827079a5e0 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=63827079a5e0
author: asaha
date: Fri Jan 29 13:43:24 2016 -0800
Added tag jdk8u73-b02 for changeset 2ab13901d6f1
changeset 32c49f4a1659 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=32c49f4a1659
author: asaha
date: Fri Jan 29 13:59:56 2016 -0800
Merge
changeset 02e120964805 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=02e120964805
author: asaha
date: Fri Jan 29 14:14:55 2016 -0800
Added tag jdk8u74-b02 for changeset 32c49f4a1659
changeset f08584a0fde9 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=f08584a0fde9
author: asaha
date: Mon Mar 21 13:31:09 2016 -0700
Added tag jdk8u77-b00 for changeset 02e120964805
changeset 1a3e81c05703 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=1a3e81c05703
author: asaha
date: Mon Mar 21 13:31:56 2016 -0700
Added tag jdk8u77-b01 for changeset f08584a0fde9
changeset 6d4565e23839 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=6d4565e23839
author: asaha
date: Mon Mar 21 13:34:18 2016 -0700
Added tag jdk8u77-b02 for changeset 1a3e81c05703
changeset c44179bce874 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=c44179bce874
author: poonam
date: Mon Mar 21 13:37:11 2016 -0700
8152335: Improve MethodHandle consistency
Reviewed-by: vlivanov, acorn, jrose
changeset e917bc6b356b in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=e917bc6b356b
author: andrew
date: Tue Mar 29 04:19:56 2016 +0100
Merge jdk8u77-b03
diffstat:
.hgtags | 41 +-
.jcheck/conf | 2 -
make/CompileDemos.gmk | 6 +-
make/CompileLaunchers.gmk | 4 +-
make/CompileNativeLibraries.gmk | 10 +-
make/CreateJars.gmk | 83 +-
make/CreateSecurityJars.gmk | 82 +-
make/Images.gmk | 2 +-
make/Setup.gmk | 2 +-
make/gensrc/GensrcMisc.gmk | 6 +-
make/lib/Awt2dLibraries.gmk | 114 +-
make/lib/NioLibraries.gmk | 5 +-
make/lib/SecurityLibraries.gmk | 19 +-
make/lib/SoundLibraries.gmk | 40 +
make/mapfiles/libsunec/mapfile-vers | 2 +
src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java | 9 +-
src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java | 5 +-
src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 2 +-
src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 2 +-
src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java | 3 +-
src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java | 2 +
src/share/classes/com/sun/media/sound/SoftSynthesizer.java | 34 +
src/share/classes/java/lang/ClassLoader.java | 3 +
src/share/classes/java/lang/invoke/MemberName.java | 29 +-
src/share/classes/java/lang/invoke/MethodHandleNatives.java | 2 +-
src/share/classes/java/net/SocksSocketImpl.java | 4 +-
src/share/classes/javax/swing/JComponent.java | 13 +-
src/share/classes/javax/swing/JDialog.java | 3 +-
src/share/classes/javax/swing/JEditorPane.java | 11 +-
src/share/classes/javax/swing/JFrame.java | 3 +-
src/share/classes/javax/swing/JInternalFrame.java | 3 +-
src/share/classes/javax/swing/JPopupMenu.java | 8 +-
src/share/classes/javax/swing/MenuSelectionManager.java | 3 +-
src/share/classes/javax/swing/PopupFactory.java | 12 +-
src/share/classes/javax/swing/SwingUtilities.java | 3 +-
src/share/classes/javax/swing/SwingWorker.java | 2 +-
src/share/classes/javax/swing/UIManager.java | 5 +-
src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java | 6 +-
src/share/classes/javax/swing/plaf/basic/BasicListUI.java | 3 +-
src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java | 14 +-
src/share/classes/javax/swing/plaf/basic/BasicTableUI.java | 8 +-
src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java | 3 +-
src/share/classes/javax/swing/plaf/synth/ImagePainter.java | 5 +-
src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java | 3 +-
src/share/classes/javax/swing/text/JTextComponent.java | 6 +-
src/share/classes/sun/applet/AppletPanel.java | 10 +-
src/share/classes/sun/applet/AppletViewerPanel.java | 18 +-
src/share/classes/sun/awt/image/JPEGImageDecoder.java | 2 +-
src/share/classes/sun/invoke/util/VerifyAccess.java | 68 +-
src/share/classes/sun/java2d/cmm/lcms/LCMS.java | 2 +-
src/share/classes/sun/misc/Version.java.template | 54 +-
src/share/classes/sun/security/ec/SunEC.java | 19 +
src/share/classes/sun/security/pkcs11/Config.java | 3 +
src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java | 4 +-
src/share/classes/sun/security/pkcs11/SunPKCS11.java | 23 +-
src/share/classes/sun/swing/DefaultLookup.java | 3 +-
src/share/classes/sun/swing/SwingUtilities2.java | 14 +-
src/share/demo/jvmti/hprof/hprof_init.c | 2 +-
src/share/native/com/sun/java/util/jar/pack/bytes.h | 2 +-
src/share/native/com/sun/java/util/jar/pack/jni.cpp | 5 +-
src/share/native/com/sun/java/util/jar/pack/main.cpp | 65 +-
src/share/native/com/sun/java/util/jar/pack/unpack.cpp | 51 +-
src/share/native/com/sun/java/util/jar/pack/unpack.h | 3 +-
src/share/native/com/sun/java/util/jar/pack/utils.cpp | 2 +-
src/share/native/com/sun/java/util/jar/pack/zip.cpp | 8 +-
src/share/native/com/sun/java/util/jar/pack/zip.h | 4 +-
src/share/native/com/sun/media/sound/SoundDefs.h | 10 +
src/share/native/sun/awt/image/awt_ImageRep.c | 2 +-
src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 2 +-
src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c | 5 +-
src/share/native/sun/awt/splashscreen/splashscreen_png.c | 2 +-
src/share/native/sun/font/layout/LayoutEngine.cpp | 8 +
src/share/native/sun/java2d/cmm/lcms/LCMS.c | 2 +-
src/share/native/sun/security/ec/ECC_JNI.cpp | 58 +-
src/share/native/sun/security/ec/ecc_impl.h | 298 +
src/share/native/sun/security/ec/impl/ecc_impl.h | 271 -
src/solaris/bin/aarch64/jvm.cfg | 35 +
src/solaris/bin/ppc64le/jvm.cfg | 33 +
src/solaris/classes/sun/awt/X11/XWM.java | 2 +-
src/solaris/javavm/export/jni_md.h | 5 +
test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java | 16 +-
test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so | Bin
test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-amd64/libLauncher.so | Bin
test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so | Bin
test/java/util/Locale/data/deflocale.sol10 | 1725 ----------
test/javax/print/PrintSEUmlauts/PrintSEUmlauts.java | 2 +-
test/sun/management/jmxremote/bootstrap/linux-amd64/launcher | Bin
test/sun/management/jmxremote/bootstrap/linux-i586/launcher | Bin
test/sun/management/jmxremote/bootstrap/solaris-amd64/launcher | Bin
test/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher | Bin
test/sun/management/windows/revokeall.exe | Bin
test/sun/net/InetAddress/nameservice/dns/cname.sh | 2 +-
test/sun/net/idn/nfscis.spp | Bin
test/sun/net/idn/nfscsi.spp | Bin
test/sun/net/idn/nfscss.spp | Bin
test/sun/net/idn/nfsmxp.spp | Bin
test/sun/net/idn/nfsmxs.spp | Bin
test/tools/pack200/PackChecksum.java | 107 +
98 files changed, 1224 insertions(+), 2350 deletions(-)
diffs (truncated from 5256 to 500 lines):
diff -r f3e86cc60726 -r e917bc6b356b .hgtags
--- a/.hgtags Tue Dec 22 11:18:12 2015 -0800
+++ b/.hgtags Tue Mar 29 04:19:56 2016 +0100
@@ -50,6 +50,7 @@
f708138c9aca4b389872838fe6773872fce3609e jdk7-b73
eacb36e30327e7ae33baa068e82ddccbd91eaae2 jdk7-b74
8885b22565077236a927e824ef450742e434a230 jdk7-b75
+fb2ee5e96b171ae9db67274d87ffaba941e8bfa6 icedtea7-1.12
8fb602395be0f7d5af4e7e93b7df2d960faf9d17 jdk7-b76
e6a5d095c356a547cf5b3c8885885aca5e91e09b jdk7-b77
1143e498f813b8223b5e3a696d79da7ff7c25354 jdk7-b78
@@ -63,6 +64,7 @@
eae6e9ab26064d9ba0e7665dd646a1fd2506fcc1 jdk7-b86
2cafbbe9825e911a6ca6c17d9a18eb1f0bf0873c jdk7-b87
b3c69282f6d3c90ec21056cd1ab70dc0c895b069 jdk7-b88
+2017795af50aebc00f500e58f708980b49bc7cd1 icedtea7-1.13
4a6abb7e224cc8d9a583c23c5782e4668739a119 jdk7-b89
7f90d0b9dbb7ab4c60d0b0233e4e77fb4fac597c jdk7-b90
08a31cab971fcad4695e913d0f3be7bde3a90747 jdk7-b91
@@ -111,6 +113,7 @@
554adcfb615e63e62af530b1c10fcf7813a75b26 jdk7-b134
d8ced728159fbb2caa8b6adb477fd8efdbbdf179 jdk7-b135
aa13e7702cd9d8aca9aa38f1227f966990866944 jdk7-b136
+1571aa7abe47a54510c62a5b59a8c343cdaf67cb icedtea-1.14
29296ea6529a418037ccce95903249665ef31c11 jdk7-b137
60d3d55dcc9c31a30ced9caa6ef5c0dcd7db031d jdk7-b138
d80954a89b49fda47c0c5cace65a17f5a758b8bd jdk7-b139
@@ -193,6 +196,7 @@
a8012d8d7e9c5035de0bdd4887dc9f7c54008f21 jdk8-b69
a996b57e554198f4592a5f3c30f2f9f4075e545d jdk8-b70
2a5af0f766d0acd68a81fb08fe11fd66795f86af jdk8-b71
+bf581aa741664ba4a97df803ced8a58ceff3a94e initial_upload
32a57e645e012a1f0665c075969ca598e0dbb948 jdk8-b72
733885f57e14cc27f5a5ff0dffe641d2fa3c704a jdk8-b73
57d5d954462831ac353a1f40d3bb05ddb4620952 jdk8-b74
@@ -206,6 +210,7 @@
624bcb4800065c6656171948e31ebb2925f25c7a jdk8-b82
ac519af51769e92c51b597a730974e8607357709 jdk8-b83
7b4721e4edb4e1c65e9c839a70d7cc67f81c7632 jdk8-b84
+29e9f26732a282c010414adaa2a5a341462f4f6c aarch64-20130813
296676d534c52888c36e305a2bf7f345c4ca70f8 jdk8-b85
7989cd0cc3a9149864589438ee2c949015d8aa9a jdk8-b86
d5228e624826a10ccc5b05f30ad8d839b58fe48d jdk8-b87
@@ -231,6 +236,8 @@
eea685b9ccaa1980e0a7e07d6a3a84bcc7e9ab82 jdk8-b107
006aaa5f069e7dd98fccdc696866c9f8582c087c jdk8-b108
946f3fd5f8bf0ccd180c258d25e5837fa1bf004c jdk8-b109
+48a5df5ce99cecb91f2e8dc3e4a5748f09c963c1 preview_rc1
+e14d4b60b2c1b45d446ab94dfa4707b13f91fb7d preview_rc2
54e099776f08430d3a7f4feabd9f2ba886b55320 jdk8-b110
719befd87c7b96ae103c05730ca555227bfc0116 jdk8-b111
f002f5f3a16cca62e139cb8eed05ffaeb373587d jdk8-b112
@@ -251,11 +258,16 @@
ae303640bc1cca06f1c6ac887e6b523ceeb425a6 jdk8-b125
a9088d517f2fa9919886d3d95023c518b59172b8 jdk8-b126
fbf251b8ef8a4a2aa1fd58efc8d0d5c8e2fd582b jdk8-b127
+597eaf9ec7946aa344477b8a5375f129a8fbbf56 jdk8_b128_aarch64_rc1
+cd23c29828584ec3c39c974579079ab97d65874e jdk8_b128_aarch64_rc3
+ba03ec7a0b930582517592cf66abba734ec59891 jdk8_b128_aarch64_rc4
+5de3e4944a8f100652483cb915959edcb8a2d71d jdk8_b128_aarch64_992
f644211c59fd7c1d0c81239c55b31e1d377d7650 jdk8-b128
80568a19aab7300bc92baf2dc225be929f5b03ed jdk8-b129
43386cc9a017a9f9e704760050086bb18b778ae0 jdk8-b130
e291ac47c9a90366c3c0787a6f7ce547a2bda308 jdk8-b131
43cb25339b5500871f41388a5197f1b01c4b57b8 jdk8-b132
+246d1b83d7116cb3f87cd491c937ec95337555d9 jdk8_final
fa2d5a06308f3f36fb09662fa58070a02352f023 jdk8u5-b01
343f4f8ba0982b3516e33c859b01634d919243c4 jdk8u5-b02
c35571198602a5856280d5c7c10bda4e7b769104 jdk8u5-b03
@@ -295,6 +307,7 @@
db30cb9eb18dacea39c35daf15a3ee5fea41fd86 jdk8u20-b07
0e717bd55bc9e3f3fa3432e545944d81ed887ab0 jdk8u20-b08
bfcdcc29c8823595a5d70b5b633bedcd5ee3ba8e jdk8u20-b09
+dc14d13daa5e7ed42b4c3eb5363cc128bec577ca icedtea-3.0.0pre01
3dd165facde7ffa240d77b33ff88b2d938fff017 jdk8u20-b10
37392f2f5d598bdecb8a12c4ea129a70a0ff8bf9 jdk8u20-b11
e323c74edabd29378819150ec000c6a0a99266ed jdk8u20-b12
@@ -308,6 +321,7 @@
5c0406ee9e820140b5322db006baed199c165b4f jdk8u20-b20
693025bbc45d683676fa78bb76201b665e0d8f2d jdk8u20-b21
0c2393744b29175de5204140d4dfbf12ca3d364f jdk8u20-b22
+03f9102db2c03caefd22a85ae71f30e592d7de9a icedtea-3.0.0pre02
be30cb2a3088f2b7b334b499f7eddbd5312312a7 jdk8u20-b23
dfb9f24d56b51e5a2ca26e77fc69a2464d51a4d3 jdk8u20-b24
dfb9f24d56b51e5a2ca26e77fc69a2464d51a4d3 jdk8u20-b25
@@ -361,7 +375,7 @@
35dfb86684554685d6efd2fc7fd5eb9b7d4545c5 jdk8u31-b34
e6ed015afbbf3459ba3297e270b4f3170e989c80 jdk8u40-b00
6e223d48080ef40f4ec11ecbcd19b4a20813b9eb jdk8u40-b01
-4797cd0713b44b009525f1276d571ade7e24f3f5 jdk8u40-b02
+d19e04dfb95b8085c17e142df42477cccad1c8d1 jdk8u40-b02
c67acfb24eed87629887128df51007218ddf1f60 jdk8u40-b03
dde62d949f7847469b2ede2ca4190c95066adc91 jdk8u40-b04
d587834579dadd18cb8b096e61d92e2dbccc2782 jdk8u40-b05
@@ -371,15 +385,18 @@
064adeb65ce82f9ff3cc7898e59d19eb64743c63 jdk8u40-b09
c3a4729c70fa29d79ad77e0643ad7715ebbc96b5 jdk8u40-b10
693da296b395139f2fe6d7131eb0b0d85f6015f6 jdk8u40-b11
-fb8db13639204e37388904bb6e57778c5d762631 jdk8u40-b12
-ba80109a9b3eb92b56012c9ec3aafd9aee2efa69 jdk8u40-b13
-ffc348308de2e872f5d510d440604c3726a67a18 jdk8u40-b14
+74fd977a8b57f6e5b06ce47f254b6ca9cd0d48cd jdk8u40-b12-aarch64
+709f573168709ea03ca7a59e3edbc5029daa9b9c jdk8u40-b12-aarch64-1262
+6be04852760c2619fe4c38a11012739349bb3654 jdk8u40-b12-aarch64-1263
31dac938108da722c56a0526fba7f6ae84773056 jdk8u40-b15
9dc67d03e6e540f646f27092ed23e94e95fa789e jdk8u40-b16
fc4f5546417071c70cffd89ca83302309f6f7da9 jdk8u40-b17
20a3e2135e0867e55af72f0c66a3de558bc613e2 jdk8u40-b18
5c31204d19e5976f025026db3d5c17331e8c44db jdk8u40-b19
7784dab075ed82be2275f4694164bbb9cc1cde3f jdk8u40-b20
+a5c3d964307795edcc68fdb669bc22285a388c0c icedtea-3.0.0pre03
+8450ad6fa3f568af420e51040c898ac3cd1489ce icedtea-3.0.0pre04
+d64c0a9b8b5a43c1b7ba88a871f001fc6b44a3d4 icedtea-3.0.0pre05
564bca490631e4ed4f7993e6633ed9ee62067624 jdk8u40-b21
d168113f9841a77b3cee3a6a45fcd85b7351ac90 jdk8u40-b22
41fe61722ce96b75dd3a1ba5072473122e21e5a0 jdk8u40-b23
@@ -457,6 +474,11 @@
e9f82302d5fdef8a0976640e09363895e9dcde3c jdk8u60-b22
c4b37246b92736adf5f40c785aabb67a7d227245 jdk8u60-b23
d433f5fd8910bee1f2c295b65cf03977034fe0ea jdk8u60-b24
+e1182f36c0fde8e507f2977a6fe1b0d06495411b arch64-jdk8u60-b24
+0b8920048898b50eca657d53d91468b41cc3269b aarch64-jdk8u60-b24.2
+fb2a70b389fef390376e585f11fbf7571ef44489 icedtea-3.0.0pre06
+c4b25140f059fc7115c4b19385b66f98d9b14da2 icedtea-3.0.0pre07
+809d98eeda495566d255eb01353e5251be7a8067 icedtea-3.0.0pre08
c8cfbe57bcd5042d2fef42dcef14d73dd4bdc416 jdk8u60-b25
0d6a8a9b26a37678b420ff540b5a622c3f4fd44c jdk8u60-b26
afbc08ea922bf6e5e14d2eea24a2f94f37627ea7 jdk8u60-b27
@@ -527,3 +549,14 @@
8afb58c7312b45fe5237afb0292176b734934f60 jdk8u72-b12
d841d3fdae44f120883dab0a3a809a054cd0274b jdk8u72-b13
f6d24d424cd2af4d2612f7737d3d9a25f58b882d jdk8u72-b14
+dfad9b612327322033896d9bdfab58ae12ccac62 icedtea-3.0.0pre09
+f3e86cc607260bae368b52d88d7bc8883ee767e3 jdk8u72-b15
+892eb9ab179650b89b7bab6bc42f079391c98624 jdk8u73-b00
+9b77d3ca0d66a117c3cc0e0a74b8059545b22f0e jdk8u73-b01
+2ab13901d6f14bab0dcf4823d5e378a421fba7e2 jdk8u73-b02
+9a843dc6f959f62c61014a3a71ec9aa329f1daf1 jdk8u74-b00
+e829ab80dfd828803aa8837411900faeaa1254a5 jdk8u74-b01
+32c49f4a16599e376e4e46bb33c7bcc486e52ff3 jdk8u74-b02
+02e1209648050922a5a9f2789d9d359795f6f834 jdk8u77-b00
+f08584a0fde9344b0aa4766984266ca68b9a5018 jdk8u77-b01
+1a3e81c05703bb36def80a57681e1692c866f621 jdk8u77-b02
diff -r f3e86cc60726 -r e917bc6b356b .jcheck/conf
--- a/.jcheck/conf Tue Dec 22 11:18:12 2015 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk8
-bugids=dup
diff -r f3e86cc60726 -r e917bc6b356b make/CompileDemos.gmk
--- a/make/CompileDemos.gmk Tue Dec 22 11:18:12 2015 -0800
+++ b/make/CompileDemos.gmk Tue Mar 29 04:19:56 2016 +0100
@@ -229,7 +229,7 @@
BUILD_DEMO_JVMTI_$1_LANG := $4
endif
ifeq (C++, $4)
- $1_EXTRA_CXX := $(LDFLAGS_CXX_JDK) $(LIBCXX)
+ $1_EXTRA_CXX := $$(LDFLAGS_CXX_JDK) $(LIBCXX)
endif
$1_CXXFLAGS := $(CXXFLAGS_JDKLIB) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 \
@@ -251,8 +251,8 @@
LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
OPTIMIZATION := LOW, \
CXXFLAGS := $$($1_CXXFLAGS), \
- LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
- LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
+ LDFLAGS := $(filter-out -incremental:no -opt:ref, $$(LDFLAGS_JDKLIB)), \
+ LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN), \
LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
LDFLAGS_SUFFIX_posix := $5, \
LDFLAGS_SUFFIX_windows := $6, \
diff -r f3e86cc60726 -r e917bc6b356b make/CompileLaunchers.gmk
--- a/make/CompileLaunchers.gmk Tue Dec 22 11:18:12 2015 -0800
+++ b/make/CompileLaunchers.gmk Tue Mar 29 04:19:56 2016 +0100
@@ -427,7 +427,7 @@
# binary (at least on linux) which causes the size to differ between old and new build.
ifeq ($(USE_EXTERNAL_LIBZ), true)
UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB
- UNPACKEXE_ZIPOBJS := -lz
+ UNPACKEXE_LIBS := -lz
else
UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \
@@ -490,7 +490,7 @@
$(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_linux := -lc, \
LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
- LDFLAGS_SUFFIX := $(LIBCXX), \
+ LDFLAGS_SUFFIX := $(UNPACKEXE_LIBS) $(LIBCXX), \
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
PROGRAM := unpack200, \
diff -r f3e86cc60726 -r e917bc6b356b make/CompileNativeLibraries.gmk
--- a/make/CompileNativeLibraries.gmk Tue Dec 22 11:18:12 2015 -0800
+++ b/make/CompileNativeLibraries.gmk Tue Mar 29 04:19:56 2016 +0100
@@ -41,9 +41,15 @@
# Build tools
include Tools.gmk
+# Handle warnings appropriately
+WARNING_CFLAGS = -Wno-unused-parameter
+ifeq ($(USE_CLANG), true)
+ WARNING_CFLAGS += -Qunused-arguments
+endif
+
# Include the javah generated headers.
-CFLAGS_JDKLIB += -I$(JDK_OUTPUTDIR)/gensrc_headers
-CXXFLAGS_JDKLIB += -I$(JDK_OUTPUTDIR)/gensrc_headers
+CFLAGS_JDKLIB += -I$(JDK_OUTPUTDIR)/gensrc_headers $(WARNING_CFLAGS)
+CXXFLAGS_JDKLIB += -I$(JDK_OUTPUTDIR)/gensrc_headers $(WARNING_CFLAGS)
# Put the libraries here. Different locations for different target apis.
ifeq ($(OPENJDK_TARGET_OS_API), posix)
diff -r f3e86cc60726 -r e917bc6b356b make/CreateJars.gmk
--- a/make/CreateJars.gmk Tue Dec 22 11:18:12 2015 -0800
+++ b/make/CreateJars.gmk Tue Mar 29 04:19:56 2016 +0100
@@ -579,40 +579,53 @@
##########################################################################################
-SRC_ZIP_INCLUDES = \
- com/sun/corba \
- com/sun/image/codec/jpeg \
- com/sun/imageio \
- com/sun/java_cup \
- com/sun/javadoc \
- com/sun/java/swing \
- com/sun/jmx \
- com/sun/naming \
- com/sun/org/apache \
- com/sun/security/auth \
- com/sun/security/jgss \
- com/sun/source \
- java \
- javax/accessibility \
- javax/annotation \
- javax/imageio \
- javax/lang \
- javax/management \
- javax/naming \
- javax/print \
- javax/rmi \
- javax/script \
- javax/security \
- javax/sound \
- javax/sql \
- javax/swing \
- javax/tools \
- javax/xml \
- org/ietf \
- org/omg \
- org/w3c/dom \
- org/xml/sax \
- #
+ifdef OPENJDK
+ SRC_ZIP_INCLUDES = \
+ com \
+ java \
+ javax \
+ jdk \
+ org \
+ sun \
+ #
+ SRC_ZIP_EXCLUDES =
+else
+ SRC_ZIP_INCLUDES = \
+ com/sun/corba \
+ com/sun/image/codec/jpeg \
+ com/sun/imageio \
+ com/sun/java_cup \
+ com/sun/javadoc \
+ com/sun/java/swing \
+ com/sun/jmx \
+ com/sun/naming \
+ com/sun/org/apache \
+ com/sun/security/auth \
+ com/sun/security/jgss \
+ com/sun/source \
+ java \
+ javax/accessibility \
+ javax/annotation \
+ javax/imageio \
+ javax/lang \
+ javax/management \
+ javax/naming \
+ javax/print \
+ javax/rmi \
+ javax/script \
+ javax/security \
+ javax/sound \
+ javax/sql \
+ javax/swing \
+ javax/tools \
+ javax/xml \
+ org/ietf \
+ org/omg \
+ org/w3c/dom \
+ org/xml/sax \
+ #
+ SRC_ZIP_EXCLUDES = javax/swing/beaninfo
+endif
SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
@@ -643,7 +656,7 @@
$(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
- EXCLUDES := javax/swing/beaninfo, \
+ EXCLUDES := $(SRC_ZIP_EXCLUDES), \
SUFFIXES := .java .c .h, \
ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
diff -r f3e86cc60726 -r e917bc6b356b make/CreateSecurityJars.gmk
--- a/make/CreateSecurityJars.gmk Tue Dec 22 11:18:12 2015 -0800
+++ b/make/CreateSecurityJars.gmk Tue Mar 29 04:19:56 2016 +0100
@@ -1,5 +1,6 @@
#
# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 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
@@ -178,6 +179,8 @@
##########################################################################################
+POLICY_CREATION_DATE := 200712010000
+
US_EXPORT_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/US_export_policy.jar
ifneq ($(BUILD_CRYPTO), no)
@@ -198,22 +201,33 @@
US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/data/cryptopolicy/unlimited
US_EXPORT_POLICY_JAR_TMP := \
$(JDK_OUTPUTDIR)/jce/unsigned/policy/unlimited/US_export_policy_jar.tmp
+ US_EXPORT_POLICY_JAR_MANIFEST_FILE := \
+ $(US_EXPORT_POLICY_JAR_TMP)/META-INF/MANIFEST.MF
$(US_EXPORT_POLICY_JAR_TMP)/%: $(US_EXPORT_POLICY_JAR_SRC_DIR)/%
$(install-file)
+ $(TOUCH) -t $(POLICY_CREATION_DATE) $@
- US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy
+ US_EXPORT_POLICY_JAR_POLICIES := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy
+
+ $(US_EXPORT_POLICY_JAR_MANIFEST_FILE): $(US_EXPORT_POLICY_JAR_POLICIES)
+ $(MKDIR) -p $(US_EXPORT_POLICY_JAR_TMP)/META-INF
+ $(ECHO) "Manifest-Version: 1.0" > $@
+ $(ECHO) "Crypto-Strength: unlimited" >> $@
+ $(TOUCH) -r $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy \
+ $(US_EXPORT_POLICY_JAR_TMP)/META-INF
+ $(TOUCH) -r $(US_EXPORT_POLICY_JAR_TMP)/META-INF $@
+
+ US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_POLICIES) $(US_EXPORT_POLICY_JAR_MANIFEST_FILE)
- $(eval $(call SetupArchive,BUILD_US_EXPORT_POLICY_JAR, $(US_EXPORT_POLICY_JAR_DEPS), \
- SRCS := $(US_EXPORT_POLICY_JAR_TMP), \
- SUFFIXES := .policy, \
- JAR := $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED), \
- EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \
- SKIP_METAINF := true))
+ $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED): $(US_EXPORT_POLICY_JAR_DEPS)
+ ( $(CD) $(US_EXPORT_POLICY_JAR_TMP) && $(ZIP) -Xr $@ META-INF *.policy )
+ $(TOUCH) -r $(US_EXPORT_POLICY_JAR_MANIFEST_FILE) $@
$(US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED): $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED)
$(ECHO) $(LOG_INFO) Copying unlimited $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(install-file)
+ $(TOUCH) -r $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED) $@
TARGETS += $(US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED) \
$(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED)
@@ -255,31 +269,55 @@
#
LOCAL_POLICY_JAR_LIMITED_TMP := \
$(JDK_OUTPUTDIR)/jce/unsigned/policy/limited/local_policy_jar.tmp
+ LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE := \
+ $(LOCAL_POLICY_JAR_LIMITED_TMP)/META-INF/MANIFEST.MF
LOCAL_POLICY_JAR_UNLIMITED_TMP := \
$(JDK_OUTPUTDIR)/jce/unsigned/policy/unlimited/local_policy_jar.tmp
+ LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE := \
+ $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/META-INF/MANIFEST.MF
$(LOCAL_POLICY_JAR_LIMITED_TMP)/%: $(JDK_TOPDIR)/make/data/cryptopolicy/limited/%
$(install-file)
+ $(TOUCH) -t $(POLICY_CREATION_DATE) $@
+
+ LOCAL_POLICY_JAR_LIMITED_POLICIES := $(LOCAL_POLICY_JAR_LIMITED_TMP)/exempt_local.policy \
+ $(LOCAL_POLICY_JAR_LIMITED_TMP)/default_local.policy
+
+ $(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE): $(LOCAL_POLICY_JAR_LIMITED_POLICIES)
+ $(MKDIR) -p $(LOCAL_POLICY_JAR_LIMITED_TMP)/META-INF
+ $(ECHO) "Manifest-Version: 1.0" > $@
+ $(ECHO) "Crypto-Strength: limited" >> $@
+ $(TOUCH) -r $(LOCAL_POLICY_JAR_LIMITED_TMP)/exempt_local.policy \
+ $(LOCAL_POLICY_JAR_LIMITED_TMP)/META-INF
+ $(TOUCH) -r $(LOCAL_POLICY_JAR_LIMITED_TMP)/META-INF $@
+
+ LOCAL_POLICY_JAR_LIMITED_DEPS := $(LOCAL_POLICY_JAR_LIMITED_POLICIES) \
+ $(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE)
+
+ $(LOCAL_POLICY_JAR_LIMITED_UNSIGNED): $(LOCAL_POLICY_JAR_LIMITED_DEPS)
+ ( $(CD) $(LOCAL_POLICY_JAR_LIMITED_TMP) && $(ZIP) -Xr $@ META-INF *.policy )
+ $(TOUCH) -r $(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE) $@
$(LOCAL_POLICY_JAR_UNLIMITED_TMP)/%: $(JDK_TOPDIR)/make/data/cryptopolicy/unlimited/%
$(install-file)
+ $(TOUCH) -t $(POLICY_CREATION_DATE) $@
- $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR_LIMITED, \
- $(LOCAL_POLICY_JAR_LIMITED_TMP)/exempt_local.policy \
- $(LOCAL_POLICY_JAR_LIMITED_TMP)/default_local.policy, \
- SRCS := $(LOCAL_POLICY_JAR_LIMITED_TMP), \
- SUFFIXES := .policy, \
- JAR := $(LOCAL_POLICY_JAR_LIMITED_UNSIGNED), \
- EXTRA_MANIFEST_ATTR := Crypto-Strength: limited, \
- SKIP_METAINF := true))
+ LOCAL_POLICY_JAR_UNLIMITED_POLICIES := $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/default_local.policy
+
+ $(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE): $(LOCAL_POLICY_JAR_UNLIMITED_POLICIES)
+ $(MKDIR) -p $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/META-INF
+ $(ECHO) "Manifest-Version: 1.0" > $@
+ $(ECHO) "Crypto-Strength: unlimited" >> $@
+ $(TOUCH) -r $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/default_local.policy \
+ $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/META-INF
+ $(TOUCH) -r $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/META-INF $@
- $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR_UNLIMITED, \
- $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/default_local.policy, \
- SRCS := $(LOCAL_POLICY_JAR_UNLIMITED_TMP), \
- SUFFIXES := .policy, \
- JAR := $(LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED), \
- EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \
- SKIP_METAINF := true))
+ LOCAL_POLICY_JAR_UNLIMITED_DEPS := $(LOCAL_POLICY_JAR_UNLIMITED_POLICIES) \
+ $(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE)
+
+ $(LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED): $(LOCAL_POLICY_JAR_UNLIMITED_DEPS)
+ ( $(CD) $(LOCAL_POLICY_JAR_UNLIMITED_TMP) && $(ZIP) -Xr $@ META-INF *.policy )
+ $(TOUCH) -r $(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE) $@
TARGETS += $(LOCAL_POLICY_JAR_LIMITED_UNSIGNED) $(LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED)
diff -r f3e86cc60726 -r e917bc6b356b make/Images.gmk
--- a/make/Images.gmk Tue Dec 22 11:18:12 2015 -0800
+++ b/make/Images.gmk Tue Mar 29 04:19:56 2016 +0100
@@ -673,7 +673,7 @@
################################################################################
# Post processing (strip etc)
-ifneq ($(POST_STRIP_CMD), )
+ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(OPENJDK_TARGET_OS), windows)
EXEC_LIST_BIN := $(filter-out %$(notdir $(MSVCR_DLL)), $(filter %.exe %.dll, $(ALL_BIN_LIST)))
else
diff -r f3e86cc60726 -r e917bc6b356b make/Setup.gmk
--- a/make/Setup.gmk Tue Dec 22 11:18:12 2015 -0800
+++ b/make/Setup.gmk Tue Mar 29 04:19:56 2016 +0100
@@ -27,7 +27,7 @@
# To build with all warnings enabled, do the following:
# make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000"
-JAVAC_WARNINGS := -Xlint:-unchecked,-deprecation,-overrides,auxiliaryclass,classfile,dep-ann,divzero,empty,try,varargs -Werror
+JAVAC_WARNINGS := -Xlint:-unchecked,-deprecation,-overrides,auxiliaryclass,classfile,dep-ann,divzero,empty,try,varargs $(JAVAC_WERROR)
# Any java code executed during a JDK build to build other parts of the JDK must be
# executed by the bootstrap JDK (probably with -Xbootclasspath/p: ) and for this
diff -r f3e86cc60726 -r e917bc6b356b make/gensrc/GensrcMisc.gmk
--- a/make/gensrc/GensrcMisc.gmk Tue Dec 22 11:18:12 2015 -0800
+++ b/make/gensrc/GensrcMisc.gmk Tue Mar 29 04:19:56 2016 +0100
@@ -39,7 +39,11 @@
$(SED) -e 's/@@launcher_name@@/$(LAUNCHER_NAME)/g' \
-e 's/@@java_version@@/$(RELEASE)/g' \
-e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \
+ -e 's/@@jdk_derivative_name@@/$(JDK_DERIVATIVE_NAME)/g' \
+ -e 's/@@distro_name@@/$(DISTRO_NAME)/g' \
+ -e 's/@@distro_package_version@@/$(DISTRO_PACKAGE_VERSION)/g' \
-e 's/@@java_runtime_name@@/$(RUNTIME_NAME)/g' \
+ -e 's/@@jdk_revid@@/$(JDK_REVID)/g' \
-e 's/@@java_profile_name@@/$(call profile_version_name, $@)/g' \
$< > $@.tmp
$(MV) $@.tmp $@
@@ -76,7 +80,7 @@
INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \
LANG := C, \
CC := $(BUILD_CC), \
- LDEXE := $(BUILD_LD), \
+ LDEXE := $(BUILD_CC), \
OBJECT_DIR := $(GENSRC_SOR_BIN), \
OUTPUT_DIR := $(GENSRC_SOR_BIN), \
PROGRAM := genSocketOptionRegistry))
diff -r f3e86cc60726 -r e917bc6b356b make/lib/Awt2dLibraries.gmk
--- a/make/lib/Awt2dLibraries.gmk Tue Dec 22 11:18:12 2015 -0800
+++ b/make/lib/Awt2dLibraries.gmk Tue Mar 29 04:19:56 2016 +0100
@@ -666,18 +666,35 @@
##########################################################################################
More information about the distro-pkg-dev
mailing list