src/share/vm/runtime/vm_version.cpp

changeset 7598
ddce0b7cee93
parent 6462
e2722a66aba7
child 7994
04ff2f6cd0eb
child 8662
9975dd8382d5
equal deleted inserted replaced
7597:34f0c0e9df21 7598:ddce0b7cee93
1 /* 1 /*
2 * Copyright (c) 1998, 2013, 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.
178 WINDOWS_ONLY("windows") \ 178 WINDOWS_ONLY("windows") \
179 SOLARIS_ONLY("solaris") \ 179 SOLARIS_ONLY("solaris") \
180 AIX_ONLY("aix") \ 180 AIX_ONLY("aix") \
181 BSD_ONLY("bsd") 181 BSD_ONLY("bsd")
182 182
183 #ifndef CPU
183 #ifdef ZERO 184 #ifdef ZERO
184 #define CPU ZERO_LIBARCH 185 #define CPU ZERO_LIBARCH
185 #else 186 #else
186 #define CPU IA32_ONLY("x86") \ 187 #define CPU IA32_ONLY("x86") \
187 IA64_ONLY("ia64") \ 188 IA64_ONLY("ia64") \
188 AMD64_ONLY("amd64") \ 189 AMD64_ONLY("amd64") \
189 ARM_ONLY("arm") \
190 PPC32_ONLY("ppc") \
191 PPC64_ONLY("ppc64") \ 190 PPC64_ONLY("ppc64") \
192 SPARC_ONLY("sparc") 191 SPARC_ONLY("sparc")
193 #endif // ZERO 192 #endif // ZERO
193 #endif
194 194
195 const char *Abstract_VM_Version::vm_platform_string() { 195 const char *Abstract_VM_Version::vm_platform_string() {
196 return OS "-" CPU; 196 return OS "-" CPU;
197 } 197 }
198 198
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)

mercurial