< prev index next >
src/share/vm/runtime/vm_version.cpp
Print this page
*** 1,7 ****
/*
! * Copyright (c) 1998, 2014, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
--- 1,7 ----
/*
! * Copyright (c) 1998, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*** 185,206 ****
WINDOWS_ONLY("windows") \
SOLARIS_ONLY("solaris") \
AIX_ONLY("aix") \
BSD_ONLY("bsd")
#ifdef ZERO
#define CPU ZERO_LIBARCH
#else
#define CPU IA32_ONLY("x86") \
IA64_ONLY("ia64") \
AMD64_ONLY("amd64") \
- ARM_ONLY("arm") \
- PPC32_ONLY("ppc") \
PPC64_ONLY("ppc64") \
AARCH64_ONLY("aarch64") \
SPARC_ONLY("sparc")
#endif // ZERO
const char *Abstract_VM_Version::vm_platform_string() {
return OS "-" CPU;
}
--- 185,206 ----
WINDOWS_ONLY("windows") \
SOLARIS_ONLY("solaris") \
AIX_ONLY("aix") \
BSD_ONLY("bsd")
+ #ifndef CPU
#ifdef ZERO
#define CPU ZERO_LIBARCH
#else
#define CPU IA32_ONLY("x86") \
IA64_ONLY("ia64") \
AMD64_ONLY("amd64") \
PPC64_ONLY("ppc64") \
AARCH64_ONLY("aarch64") \
SPARC_ONLY("sparc")
#endif // ZERO
+ #endif
const char *Abstract_VM_Version::vm_platform_string() {
return OS "-" CPU;
}
*** 249,264 ****
#endif
#ifndef FLOAT_ARCH
#if defined(__SOFTFP__)
#define FLOAT_ARCH_STR "-sflt"
- #elif defined(E500V2)
- #define FLOAT_ARCH_STR "-e500v2"
- #elif defined(ARM)
- #define FLOAT_ARCH_STR "-vfp"
- #elif defined(PPC32)
- #define FLOAT_ARCH_STR "-hflt"
#else
#define FLOAT_ARCH_STR ""
#endif
#else
#define FLOAT_ARCH_STR XSTR(FLOAT_ARCH)
--- 249,258 ----
< prev index next >