Mercurial > hg > release > icedtea8-forest-3.0

changeset 1709:a358b13af298 icedtea-3.0.0pre09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk8u72-b15
author andrew
date Fri, 05 Feb 2016 17:41:16 +0000
parents a494d0f86bd2 (current diff) fff0c11d2811 (diff)
children fcb11901d889
files .hgtags common/autoconf/boot-jdk.m4 common/autoconf/generated-configure.sh
diffstat 5 files changed, 112 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Feb 05 03:38:15 2016 +0000
+++ b/.hgtags	Fri Feb 05 17:41:16 2016 +0000
@@ -360,6 +360,7 @@
 a198f93b1e0be5edce7a351b1399cb5c4e64c8f4 jdk8u31-b31
 99c79d83152585991682bd86e21fdcfe6f6ab9b2 jdk8u31-b32
 cf4ebf47413902376f66d2cddaf0282d49699ba7 jdk8u31-b33
+685af74060e723783f83c84040c04902674e2e1f jdk8u31-b34
 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00
 f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01
 b6a148730f2b14193c308bc9c866c36ee6c08ed3 jdk8u40-b02
@@ -411,6 +412,11 @@
 438cc91b51330a61a790f0a0ac64816b565d25f0 jdk8u45-b15
 5a4ccc33ab26b635f91ddd424742b0009a37bcc0 jdk8u45-b31
 4597cb5171773416c4b2e1843db8592a69ff7a99 jdk8u45-b32
+5d158dedeb68fdcb58f3c66ff61d64d5d1ea47c3 jdk8u45-b33
+ebebf3d201322c5ac421a4b97ce14293c3963c2a jdk8u45-b34
+8f4dba55bb2a4a767067a89523346b54f0be9e19 jdk8u45-b35
+f85b9174094cfa8f250b115e591601602f142f76 jdk8u45-b36
+ac6b7b573c39e6a9b95c599c2ddecf1858e3fe88 jdk8u45-b37
 a1682688c9aec33c172146ce4be8d3969e7d76bb jdk8u51-b00
 e04f2ee2d03d9927d2012286a9bcbf511eb887ae jdk8u51-b01
 4dee64570ad013eb5e1cb16304f9eff558c1c5e9 jdk8u51-b02
@@ -428,6 +434,9 @@
 5a2078b398485d21fa6577cf9481aa488d2e28d0 jdk8u51-b14
 54b6481aa9e2f39699a96a4572b825b6d81f434f jdk8u51-b15
 3ee37a71b2ab50e1e47febab6b69771b6846ba6b jdk8u51-b16
+58f6ddf5d59fffc52d190d82890ba25698fb80e3 jdk8u51-b31
+3dcabe6d7fdd37e73ebdd82d414c4939a50b58b7 jdk8u51-b32
+586cfdfb13dd3f3b787d4fc1de7a03abd3a2457d jdk8u51-b33
 ae4980d195b64eec58884b233d7efd312205bac8 jdk8u60-b00
 acf81f6fb265c1564b16fd8202a324a9022e204b jdk8u60-b01
 2ca2e2430370d441cbe7999b76b57cadf0060327 jdk8u60-b02
@@ -455,3 +464,76 @@
 ff58c7164b8dfd7f66104ddedb36fd017982fe06 icedtea-3.0.0pre06
 4b05cb9c5a4c517e0dabe38b7a7e1c080785feff icedtea-3.0.0pre07
 f0635543beb309c4da1bb88c906a76ee4b75e16d icedtea-3.0.0pre08
+280834e00e6267fae1ae2a86a8bd7d1fdd160cba jdk8u60-b24
+be2ddf520d263ea27a075f895d93adada6702027 jdk8u60-b25
+d3bdbc19827e1a97e046b65e39cb9c7255d4603b jdk8u60-b26
+d50c3672fd185a4ca074c43d261edfcb1df7bc54 jdk8u60-b27
+cdc5223800ccf9607e19740d41429dacca03c623 jdk8u60-b31
+d7f8f147ff1d78987a4d963b2eda1477804cccec jdk8u60-b32
+45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u52-b06
+2b07cd3f89aab19a2f7f119f3d885b776342efcc jdk8u52-b07
+45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u65-b00
+566b0467f9b3dc7053e3a998b1ddec2243ee09d9 jdk8u65-b01
+760c71b8c3f4e5d2c1b52bd165149621d4ac8b98 jdk8u65-b02
+159ed2ae97c93d024bc0212595a09e8cc9b08958 jdk8u65-b03
+62625c423592073a935388bf46a78a3747c6fbe3 jdk8u65-b04
+5476dd40852d9d38afa4850edb78a951e91c14dd jdk8u65-b05
+350f9114b53d85ece93ca95d6a277d0b1503f3f1 jdk8u65-b06
+2b2d10e6b9bf2702b934140fb8ff2e1509b20daf jdk8u65-b07
+9878eea65684af2d5d3454c0e16e8f0f8852708e jdk8u65-b08
+2a9aa9c38c69fcacc9bc90a109964988ab77e108 jdk8u65-b09
+c357526ce049e246f096e4cf0395635fd90d9f5f jdk8u65-b10
+7ed61fe56605812844c02bf8921cc256e0d62eb8 jdk8u65-b11
+371fb189b6948aff2641574f4e82bda2eeaf2cc8 jdk8u65-b12
+0e84a03d4afde812ebb908b8ee43735d9ed0c3e5 jdk8u65-b13
+0787e2c3160eeaea4183bcc9e3ffbd7adbe0d345 jdk8u65-b14
+3b1c03ea5649b2e317f327c0b4d949d49504a591 jdk8u65-b15
+170b44557b27ba97d12f45e2b94b7709a1bf8b54 jdk8u65-b16
+c684352da3e3c0df6a219796019142748d593fe5 jdk8u65-b17
+01bb22b4ebb6348efa14726ba139858d6defefcd jdk8u66-b00
+0ca005b45d10fc8b93852670136a3992038c3722 jdk8u66-b01
+dc132a110960e6b9feff81f0616f7a40a97f3f0f jdk8u66-b02
+5a6bbf54c3fedb8a9a1a1d942cf0935f2f924ef0 jdk8u66-b07
+7c16434480a17a2ac608e1b7e99f99367e361370 jdk8u66-b08
+2c1cbf1288f502baf0d9810c04db0c25849131db jdk8u66-b09
+bcf0cbfa9e3f5642ef2e88b45b8866cc689fffc2 jdk8u66-b10
+b64faa91edc386aed8d41f0131a8f9dcd8afc2e4 jdk8u66-b11
+dc7aab86502475a30bca3c96cb1b153aa31e1fff jdk8u66-b12
+62c53803e364fb3862c5529795d822b9d0410da5 jdk8u66-b13
+b5c54b2e12c3fbc54c7d7e0f22187fa601feb749 jdk8u66-b14
+d45e1dc28a6ee6fd03348ee170d9895957888124 jdk8u66-b15
+5f29f2da7993f09564f6a5cb34e2799981ea96bb jdk8u66-b16
+6eab3ce957aa560f8f9080a2c9535d1ee70fc834 jdk8u66-b17
+a482cd45f31d7bf4ffc77acace705a0b9f888489 jdk8u66-b18
+e6361dcd087eef288fdeeaa17c2dbf9aa4793d5d jdk8u66-b31
+ab2d570584a2bb01a6fedf7bd483443fdfc3d799 jdk8u71-b00
+1956eeeaed470cc9b46addabceb91c9900f2f83a jdk8u71-b01
+b9c864410397ae0e23219b8ab218c33c9859c592 jdk8u71-b02
+3ae95bcc5c89751e50c9181be12887ed6931e615 jdk8u71-b03
+1c87b989c16309652cec988e645dc7f277cfb56d jdk8u71-b04
+c70fdd779a6775bc5f90d60ff1feca2c90e3c2b7 jdk8u71-b05
+2c05fc89cda0befb802e838b442fc27d5b83980b jdk8u71-b06
+9b1bb13cc10cae3379849f341ccd0f21600de863 jdk8u71-b07
+0ed543b92df44dfcfbfd074b9d6461a50e5f198f jdk8u71-b08
+4231747bc5013bbead0cefa37ae4d2a390f2d446 jdk8u71-b09
+5b9d5e755832e86824826fda37c8e6ee4ed064f5 jdk8u71-b10
+4ad71baca90cbe089c121457a80f6693aa80b4e6 jdk8u71-b11
+4d09473111deb8fd6323df6f9e9536084cae2844 jdk8u71-b12
+4f9e7b1a4e04f2ae44c1f6501e4444b82c45afff jdk8u71-b13
+1397b1bae600666de90459de7fba3576bb99eeb8 jdk8u71-b14
+2e46e952ddd80370beee2f4f1b77efd0283d4049 jdk8u71-b15
+31a6e29ec33a9a3c6ac13ce66d3b96196700841c jdk8u72-b00
+d0afaafe3790d446d24ca35ddf61380457362b39 jdk8u72-b01
+2ffdd22b85317d3ba5ab28e34bcd288a5f18d998 jdk8u72-b02
+4270b7d818b26a67f9704b1575208876ab07f45d jdk8u72-b03
+19bf2975a37001daa2d45c171f65ae4e12d639df jdk8u72-b04
+674a69ec28a9e62b1adc90b138a4957bbc82946c jdk8u72-b05
+8c0ad72a45012464c18b4a74fdd711fe82e8842d jdk8u72-b06
+98f42c9df8c121347367164776eff3ebd50cb91e jdk8u72-b07
+55c885702381d47704589a37f05c0f7045be4e36 jdk8u72-b08
+178589d241af764add3d4cbf6977945f65859c1d jdk8u72-b09
+bd25b660575f8ac3567b5ae2ac1e7f6b31df583e jdk8u72-b10
+3b454f1fb441a71836666b6727274a937249ca92 jdk8u72-b11
+e831ce671fb072501670ee593e1080659cbc9804 jdk8u72-b12
+8f5ca46a90af013525cbdf3b023727450cdb8119 jdk8u72-b13
+6cbd347daa9367b78e385f2e8eba222a30b3bea1 jdk8u72-b14
--- a/common/autoconf/boot-jdk.m4	Fri Feb 05 03:38:15 2016 +0000
+++ b/common/autoconf/boot-jdk.m4	Fri Feb 05 17:41:16 2016 +0000
@@ -309,6 +309,16 @@
   BOOT_JDK_SOURCETARGET="-source 7 -target 7"
   AC_SUBST(BOOT_JDK_SOURCETARGET)
   AC_SUBST(JAVAC_FLAGS)
+
+  # Check if the boot jdk is 32 or 64 bit
+  if "$JAVA" -d64 -version > /dev/null 2>&1; then
+    BOOT_JDK_BITS="64"
+  else
+    BOOT_JDK_BITS="32"
+  fi
+  AC_MSG_CHECKING([if Boot JDK is 32 or 64 bits])
+  AC_MSG_RESULT([$BOOT_JDK_BITS])
+  AC_SUBST(BOOT_JDK_BITS)
 ])
 
 AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
@@ -349,7 +359,7 @@
 
   # Maximum amount of heap memory.
   # Maximum stack size.
-  if test "x$OPENJDK_BUILD_CPU_BITS" = x32; then
+  if test "x$BOOT_JDK_BITS" = x32; then
     if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
       JVM_MAX_HEAP=768M
     else
--- a/common/autoconf/generated-configure.sh	Fri Feb 05 03:38:15 2016 +0000
+++ b/common/autoconf/generated-configure.sh	Fri Feb 05 17:41:16 2016 +0000
@@ -799,6 +799,7 @@
 JAVA_FLAGS_SMALL
 JAVA_FLAGS_BIG
 JAVA_FLAGS
+BOOT_JDK_BITS
 JAVAC_FLAGS
 BOOT_JDK_SOURCETARGET
 ALT_JAR_CMD
@@ -3918,7 +3919,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1454640574
+DATE_WHEN_GENERATED=1454687955
 
 ###############################################################################
 #
@@ -16151,6 +16152,18 @@
 
 
 
+  # Check if the boot jdk is 32 or 64 bit
+  if "$JAVA" -d64 -version > /dev/null 2>&1; then
+    BOOT_JDK_BITS="64"
+  else
+    BOOT_JDK_BITS="32"
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Boot JDK is 32 or 64 bits" >&5
+$as_echo_n "checking if Boot JDK is 32 or 64 bits... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_BITS" >&5
+$as_echo "$BOOT_JDK_BITS" >&6; }
+
+
 
   # Ensure OPENJDK_TARGET_CPU_ARCH has been setup
 
@@ -16250,7 +16263,7 @@
 
   # Maximum amount of heap memory.
   # Maximum stack size.
-  if test "x$OPENJDK_BUILD_CPU_BITS" = x32; then
+  if test "x$BOOT_JDK_BITS" = x32; then
     if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
       JVM_MAX_HEAP=768M
     else
--- a/make/Javadoc.gmk	Fri Feb 05 03:38:15 2016 +0000
+++ b/make/Javadoc.gmk	Fri Feb 05 17:41:16 2016 +0000
@@ -258,6 +258,8 @@
 with conceptual overviews, definitions of terms, workarounds, \
 and working code examples.<br>\
 $(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
+Use is subject to <a href="http://download.oracle.com/otndocs/jcp/java_se-8-mrel-spec/license.html">license terms</a>. \
+Also see the <a target="_blank" href="http://www.oracle.com/technetwork/java/redist-137594.html">documentation redistribution policy</a>.\
 </font>
 
 # Common javadoc options used by all
--- a/make/jprt.properties	Fri Feb 05 03:38:15 2016 +0000
+++ b/make/jprt.properties	Fri Feb 05 17:41:16 2016 +0000
@@ -29,8 +29,8 @@
 #
 
 # The current release name
-my.jdk.update.version=60
-jprt.tools.default.release=jdk8u${my.jdk.update.version}
+my.jdk.update.version=66
+jprt.tools.default.release=jdk8u60
 
 # Check if this is the equivalent of a hotspot push job
 # Interpret -testset hotspot to mean exactly that