Mercurial > hg > release > icedtea8-forest-3.0

changeset 1718:bee679b986f5 jdk8u74-b02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Fri, 29 Jan 2016 13:57:42 -0800
parents 53622639c768 (diff) ca94b5a7ded0 (current diff)
children 417ff12d11d6
files .hgtags
diffstat 3 files changed, 44 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Jan 29 13:40:52 2016 -0800
+++ b/.hgtags	Fri Jan 29 13:57:42 2016 -0800
@@ -511,6 +511,24 @@
 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
+fff0c11d2811deb70bef213d6d8478b3e3796658 jdk8u72-b15
 443abbc4e048b13e075486a86ddafca520257fdf jdk8u73-b00
 fc0ed68cbc5cbdb2efdb75f3309b5de2a64f5a57 jdk8u73-b01
 6aacbee7e4c84a30761faf58a682b07b8bdf54da jdk8u73-b02
+87614decb34cd6076f136b6d51be83f13e3e6aed jdk8u74-b00
+33b310c85259e0d7ed112ab2e01008228e263371 jdk8u74-b01
--- a/common/autoconf/boot-jdk.m4	Fri Jan 29 13:40:52 2016 -0800
+++ b/common/autoconf/boot-jdk.m4	Fri Jan 29 13:57:42 2016 -0800
@@ -289,6 +289,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],
@@ -323,7 +333,7 @@
 
   # Maximum amount of heap memory.
   # Maximum stack size.
-  if test "x$BUILD_NUM_BITS" = x32; then
+  if test "x$BOOT_JDK_BITS" = x32; then
     JVM_MAX_HEAP=1100M
     STACK_SIZE=768
   else
--- a/common/autoconf/generated-configure.sh	Fri Jan 29 13:40:52 2016 -0800
+++ b/common/autoconf/generated-configure.sh	Fri Jan 29 13:57:42 2016 -0800
@@ -792,6 +792,7 @@
 JAVA_FLAGS_SMALL
 JAVA_FLAGS_BIG
 JAVA_FLAGS
+BOOT_JDK_BITS
 JAVAC_FLAGS
 BOOT_JDK_SOURCETARGET
 BOOT_JDK
@@ -3879,7 +3880,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1444076935
+DATE_WHEN_GENERATED=1445418840
 
 ###############################################################################
 #
@@ -16071,6 +16072,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; }
+
+
 
   ##############################################################################
   #
@@ -16150,7 +16163,7 @@
 
   # Maximum amount of heap memory.
   # Maximum stack size.
-  if test "x$BUILD_NUM_BITS" = x32; then
+  if test "x$BOOT_JDK_BITS" = x32; then
     JVM_MAX_HEAP=1100M
     STACK_SIZE=768
   else