Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/.hgtags	Fri Oct 16 12:14:21 2015 -0700
     1.2 +++ b/.hgtags	Thu Oct 29 17:02:30 2015 -0700
     1.3 @@ -498,4 +498,14 @@
     1.4  1956eeeaed470cc9b46addabceb91c9900f2f83a jdk8u71-b01
     1.5  b9c864410397ae0e23219b8ab218c33c9859c592 jdk8u71-b02
     1.6  3ae95bcc5c89751e50c9181be12887ed6931e615 jdk8u71-b03
     1.7 +1c87b989c16309652cec988e645dc7f277cfb56d jdk8u71-b04
     1.8 +c70fdd779a6775bc5f90d60ff1feca2c90e3c2b7 jdk8u71-b05
     1.9 +2c05fc89cda0befb802e838b442fc27d5b83980b jdk8u71-b06
    1.10 +31a6e29ec33a9a3c6ac13ce66d3b96196700841c jdk8u72-b00
    1.11 +d0afaafe3790d446d24ca35ddf61380457362b39 jdk8u72-b01
    1.12 +2ffdd22b85317d3ba5ab28e34bcd288a5f18d998 jdk8u72-b02
    1.13 +4270b7d818b26a67f9704b1575208876ab07f45d jdk8u72-b03
    1.14 +19bf2975a37001daa2d45c171f65ae4e12d639df jdk8u72-b04
    1.15 +674a69ec28a9e62b1adc90b138a4957bbc82946c jdk8u72-b05
    1.16 +8c0ad72a45012464c18b4a74fdd711fe82e8842d jdk8u72-b06
    1.17  ac4e9dfd23236821432786b27566fa2f800aa3d4 jdk8u75-b00

     2.1 --- a/common/autoconf/boot-jdk.m4	Fri Oct 16 12:14:21 2015 -0700
     2.2 +++ b/common/autoconf/boot-jdk.m4	Thu Oct 29 17:02:30 2015 -0700
     2.3 @@ -289,6 +289,16 @@
     2.4    BOOT_JDK_SOURCETARGET="-source 7 -target 7"
     2.5    AC_SUBST(BOOT_JDK_SOURCETARGET)
     2.6    AC_SUBST(JAVAC_FLAGS)
     2.7 +
     2.8 +  # Check if the boot jdk is 32 or 64 bit
     2.9 +  if "$JAVA" -d64 -version > /dev/null 2>&1; then
    2.10 +    BOOT_JDK_BITS="64"
    2.11 +  else
    2.12 +    BOOT_JDK_BITS="32"
    2.13 +  fi
    2.14 +  AC_MSG_CHECKING([if Boot JDK is 32 or 64 bits])
    2.15 +  AC_MSG_RESULT([$BOOT_JDK_BITS])
    2.16 +  AC_SUBST(BOOT_JDK_BITS)
    2.17  ])
    2.18  
    2.19  AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
    2.20 @@ -323,7 +333,7 @@
    2.21  
    2.22    # Maximum amount of heap memory.
    2.23    # Maximum stack size.
    2.24 -  if test "x$BUILD_NUM_BITS" = x32; then
    2.25 +  if test "x$BOOT_JDK_BITS" = x32; then
    2.26      JVM_MAX_HEAP=1100M
    2.27      STACK_SIZE=768
    2.28    else

     3.1 --- a/common/autoconf/generated-configure.sh	Fri Oct 16 12:14:21 2015 -0700
     3.2 +++ b/common/autoconf/generated-configure.sh	Thu Oct 29 17:02:30 2015 -0700
     3.3 @@ -792,6 +792,7 @@
     3.4  JAVA_FLAGS_SMALL
     3.5  JAVA_FLAGS_BIG
     3.6  JAVA_FLAGS
     3.7 +BOOT_JDK_BITS
     3.8  JAVAC_FLAGS
     3.9  BOOT_JDK_SOURCETARGET
    3.10  BOOT_JDK
    3.11 @@ -3879,7 +3880,7 @@
    3.12  #CUSTOM_AUTOCONF_INCLUDE
    3.13  
    3.14  # Do not change or remove the following line, it is needed for consistency checks:
    3.15 -DATE_WHEN_GENERATED=1444076935
    3.16 +DATE_WHEN_GENERATED=1445418840
    3.17  
    3.18  ###############################################################################
    3.19  #
    3.20 @@ -16071,6 +16072,18 @@
    3.21  
    3.22  
    3.23  
    3.24 +  # Check if the boot jdk is 32 or 64 bit
    3.25 +  if "$JAVA" -d64 -version > /dev/null 2>&1; then
    3.26 +    BOOT_JDK_BITS="64"
    3.27 +  else
    3.28 +    BOOT_JDK_BITS="32"
    3.29 +  fi
    3.30 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Boot JDK is 32 or 64 bits" >&5
    3.31 +$as_echo_n "checking if Boot JDK is 32 or 64 bits... " >&6; }
    3.32 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_BITS" >&5
    3.33 +$as_echo "$BOOT_JDK_BITS" >&6; }
    3.34 +
    3.35 +
    3.36  
    3.37    ##############################################################################
    3.38    #
    3.39 @@ -16150,7 +16163,7 @@
    3.40  
    3.41    # Maximum amount of heap memory.
    3.42    # Maximum stack size.
    3.43 -  if test "x$BUILD_NUM_BITS" = x32; then
    3.44 +  if test "x$BOOT_JDK_BITS" = x32; then
    3.45      JVM_MAX_HEAP=1100M
    3.46      STACK_SIZE=768
    3.47    else