hotspot/src/share/vm/runtime/vm_version.cpp
changeset 29474 81a5c5330d08
parent 29180 50369728b00e
child 30585 12f312d694cd
equal deleted inserted replaced
29362:4188dc7f05a8 29474:81a5c5330d08
     1 /*
     1 /*
     2  * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
     2  * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
     3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4  *
     4  *
     5  * This code is free software; you can redistribute it and/or modify it
     5  * This code is free software; you can redistribute it and/or modify it
     6  * under the terms of the GNU General Public License version 2 only, as
     6  * under the terms of the GNU General Public License version 2 only, as
     7  * published by the Free Software Foundation.
     7  * published by the Free Software Foundation.
   185                  WINDOWS_ONLY("windows")         \
   185                  WINDOWS_ONLY("windows")         \
   186                  SOLARIS_ONLY("solaris")         \
   186                  SOLARIS_ONLY("solaris")         \
   187                  AIX_ONLY("aix")                 \
   187                  AIX_ONLY("aix")                 \
   188                  BSD_ONLY("bsd")
   188                  BSD_ONLY("bsd")
   189 
   189 
       
   190 #ifndef CPU
   190 #ifdef ZERO
   191 #ifdef ZERO
   191 #define CPU      ZERO_LIBARCH
   192 #define CPU      ZERO_LIBARCH
   192 #else
   193 #else
   193 #define CPU      IA32_ONLY("x86")                \
   194 #define CPU      IA32_ONLY("x86")                \
   194                  IA64_ONLY("ia64")               \
   195                  IA64_ONLY("ia64")               \
   195                  AMD64_ONLY("amd64")             \
   196                  AMD64_ONLY("amd64")             \
   196                  ARM_ONLY("arm")                 \
       
   197                  PPC32_ONLY("ppc")               \
       
   198                  PPC64_ONLY("ppc64")             \
   197                  PPC64_ONLY("ppc64")             \
   199                  AARCH64_ONLY("aarch64")         \
   198                  AARCH64_ONLY("aarch64")         \
   200                  SPARC_ONLY("sparc")
   199                  SPARC_ONLY("sparc")
   201 #endif // ZERO
   200 #endif // ZERO
       
   201 #endif
   202 
   202 
   203 const char *Abstract_VM_Version::vm_platform_string() {
   203 const char *Abstract_VM_Version::vm_platform_string() {
   204   return OS "-" CPU;
   204   return OS "-" CPU;
   205 }
   205 }
   206 
   206 
   249   #endif
   249   #endif
   250 
   250 
   251   #ifndef FLOAT_ARCH
   251   #ifndef FLOAT_ARCH
   252     #if defined(__SOFTFP__)
   252     #if defined(__SOFTFP__)
   253       #define FLOAT_ARCH_STR "-sflt"
   253       #define FLOAT_ARCH_STR "-sflt"
   254     #elif defined(E500V2)
       
   255       #define FLOAT_ARCH_STR "-e500v2"
       
   256     #elif defined(ARM)
       
   257       #define FLOAT_ARCH_STR "-vfp"
       
   258     #elif defined(PPC32)
       
   259       #define FLOAT_ARCH_STR "-hflt"
       
   260     #else
   254     #else
   261       #define FLOAT_ARCH_STR ""
   255       #define FLOAT_ARCH_STR ""
   262     #endif
   256     #endif
   263   #else
   257   #else
   264     #define FLOAT_ARCH_STR XSTR(FLOAT_ARCH)
   258     #define FLOAT_ARCH_STR XSTR(FLOAT_ARCH)