diff options
| author | Alexey Ushakov <alexey.ushakov@jetbrains.com> | 2016-02-15 14:09:30 +0300 |
|---|---|---|
| committer | Alexey Ushakov <alexey.ushakov@jetbrains.com> | 2016-02-15 14:09:30 +0300 |
| commit | e0fcd178a489fc8d514e953391bb9ea7226230b5 (patch) | |
| tree | 0cfb06b4d5e0477a2349fa8dbaba5468ead1a14d /common/autoconf/platform.m4 | |
| parent | a4570eec1dfdd8f9256c90409bdfab69aed0f4e7 (diff) | |
| parent | 8818da12ef2196e11be91864c46355944e34e330 (diff) | |
| download | jdk8u-e0fcd178a489fc8d514e953391bb9ea7226230b5.tar.gz | |
Merged changes from defaultjetbrains-master-mirror-osx
--HG--
branch : 8u40-verified-fixes
Diffstat (limited to 'common/autoconf/platform.m4')
| -rw-r--r-- | common/autoconf/platform.m4 | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4 index 1f06f0c..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 @@ -48,6 +48,12 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU], VAR_CPU_BITS=32 VAR_CPU_ENDIAN=little ;; + aarch64) + VAR_CPU=aarch64 + VAR_CPU_ARCH=aarch64 + VAR_CPU_BITS=64 + VAR_CPU_ENDIAN=little + ;; powerpc) VAR_CPU=ppc VAR_CPU_ARCH=ppc @@ -84,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 @@ -365,7 +371,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS], # ZERO_ARCHDEF is used to enable architecture-specific code case "${OPENJDK_TARGET_CPU}" in - ppc*) ZERO_ARCHDEF=PPC ;; + ppc) ZERO_ARCHDEF=PPC32 ;; + ppc64) ZERO_ARCHDEF=PPC64 ;; s390*) ZERO_ARCHDEF=S390 ;; sparc*) ZERO_ARCHDEF=SPARC ;; x86_64*) ZERO_ARCHDEF=AMD64 ;; |