diff options
| author | asaha <none@none> | 2016-01-05 08:27:18 -0800 |
|---|---|---|
| committer | asaha <none@none> | 2016-01-05 08:27:18 -0800 |
| commit | 37bf252d9bff197354e5e7b6370aced480085743 (patch) | |
| tree | 6ac9f17af5063ad41229bddcd8f91647df493aa6 | |
| parent | 7d606b4a5cf25816510d86c2665470d04a41f5b1 (diff) | |
| parent | 9091e6896247c6a3d4e2b1cf0c69023dcbdd2fad (diff) | |
| download | jdk8u-37bf252d9bff197354e5e7b6370aced480085743.tar.gz | |
Merge
| -rw-r--r-- | .hgtags | 2 | ||||
| -rw-r--r-- | common/autoconf/generated-configure.sh | 6 | ||||
| -rw-r--r-- | common/autoconf/hotspot-spec.gmk.in | 6 | ||||
| -rw-r--r-- | common/autoconf/platform.m4 | 4 |
4 files changed, 10 insertions, 8 deletions
@@ -524,3 +524,5 @@ bd25b660575f8ac3567b5ae2ac1e7f6b31df583e jdk8u72-b10 e831ce671fb072501670ee593e1080659cbc9804 jdk8u72-b12 8f5ca46a90af013525cbdf3b023727450cdb8119 jdk8u72-b13 e8bed1496ff254d91d52c8da7c6d8d361862d773 jdk8u76-b00 +832508a6165c877aa1de03ca9b6520c7bfe5a28e jdk8u76-b01 +0861105394355ad24c07cb2ff58a731ef91502a8 jdk8u76-b02 diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 3dbbbd7..d3d0ccde4 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -3880,7 +3880,7 @@ fi #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1445418840 +DATE_WHEN_GENERATED=1449096260 ############################################################################### # @@ -6872,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 @@ -7009,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 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 |