diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/autoconf/boot-jdk.m4 | 12 | ||||
| -rw-r--r-- | common/autoconf/generated-configure.sh | 23 | ||||
| -rw-r--r-- | common/autoconf/hotspot-spec.gmk.in | 6 | ||||
| -rw-r--r-- | common/autoconf/platform.m4 | 4 |
4 files changed, 34 insertions, 11 deletions
diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4 index fa2dfc9..ace6f7d 100644 --- a/common/autoconf/boot-jdk.m4 +++ b/common/autoconf/boot-jdk.m4 @@ -289,6 +289,16 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK], 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 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS], # 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 diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 317f353..d3d0ccde4 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -792,6 +792,7 @@ LANGTOOLS_TOPDIR JAVA_FLAGS_SMALL JAVA_FLAGS_BIG JAVA_FLAGS +BOOT_JDK_BITS JAVAC_FLAGS BOOT_JDK_SOURCETARGET BOOT_JDK @@ -3879,7 +3880,7 @@ fi #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1433258489 +DATE_WHEN_GENERATED=1449096260 ############################################################################### # @@ -6871,7 +6872,7 @@ test -n "$target_alias" && VAR_CPU_BITS=32 VAR_CPU_ENDIAN=big ;; - sparcv9) + sparcv9|sparc64) VAR_CPU=sparcv9 VAR_CPU_ARCH=sparc VAR_CPU_BITS=64 @@ -7008,7 +7009,7 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&6; } VAR_CPU_BITS=32 VAR_CPU_ENDIAN=big ;; - sparcv9) + sparcv9|sparc64) VAR_CPU=sparcv9 VAR_CPU_ARCH=sparc VAR_CPU_BITS=64 @@ -11295,7 +11296,7 @@ fi fi -# The cooked update version used to encode trailing letters in the update + # The cooked update version used to encode trailing letters in the update # version into a trailing number. That is no longer needed, but need to # keep the format in 8u for compatibility. COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0" @@ -16071,6 +16072,18 @@ $as_echo "ok" >&6; } + # 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 @@ $as_echo_n "checking flags for boot jdk java command for big workloads... " >&6; # 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 diff --git a/common/autoconf/hotspot-spec.gmk.in b/common/autoconf/hotspot-spec.gmk.in index cd8d61f..65d14dc 100644 --- a/common/autoconf/hotspot-spec.gmk.in +++ b/common/autoconf/hotspot-spec.gmk.in @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -69,8 +69,8 @@ ISA_DIR=$(OPENJDK_TARGET_CPU_ISADIR) # Yet another name for arch used for an extra subdir below the jvm lib. # Uses i386 and amd64, instead of x86 and x86_64. LIBARCH=$(OPENJDK_TARGET_CPU_LEGACY_LIB) -# Old name for OPENJDK_TARGET_CPU, uses i586 and amd64, instead of x86 and x86_64. -ARCH=$(OPENJDK_TARGET_CPU_LEGACY) +# Set the cpu architecture +ARCH=$(OPENJDK_TARGET_CPU_ARCH) # Legacy setting for building for a 64 bit machine. # If yes then this expands to _LP64:=1 @LP64@ diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4 index f1b02f4..344dbfb 100644 --- a/common/autoconf/platform.m4 +++ b/common/autoconf/platform.m4 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -90,7 +90,7 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU], VAR_CPU_BITS=32 VAR_CPU_ENDIAN=big ;; - sparcv9) + sparcv9|sparc64) VAR_CPU=sparcv9 VAR_CPU_ARCH=sparc VAR_CPU_BITS=64 |