Mercurial > hg > truffle

comparison src/share/vm/runtime/vm_version.cpp @ 18041:52b4284cb496

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 4ca6dc0799b6
children be896a1983c0
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
180 } 180 }
181 181
182 #define OS LINUX_ONLY("linux") \ 182 #define OS LINUX_ONLY("linux") \
183 WINDOWS_ONLY("windows") \ 183 WINDOWS_ONLY("windows") \
184 SOLARIS_ONLY("solaris") \ 184 SOLARIS_ONLY("solaris") \
185 AIX_ONLY("aix") \
185 BSD_ONLY("bsd") 186 BSD_ONLY("bsd")
186 187
187 #ifdef ZERO 188 #ifdef ZERO
188 #define CPU ZERO_LIBARCH 189 #define CPU ZERO_LIBARCH
189 #else 190 #else
190 #define CPU IA32_ONLY("x86") \ 191 #define CPU IA32_ONLY("x86") \
191 IA64_ONLY("ia64") \ 192 IA64_ONLY("ia64") \
192 AMD64_ONLY("amd64") \ 193 AMD64_ONLY("amd64") \
193 ARM_ONLY("arm") \ 194 ARM_ONLY("arm") \
194 PPC_ONLY("ppc") \ 195 PPC32_ONLY("ppc") \
196 PPC64_ONLY("ppc64") \
195 SPARC_ONLY("sparc") 197 SPARC_ONLY("sparc")
196 #endif // ZERO 198 #endif // ZERO
197 199
198 const char *Abstract_VM_Version::vm_platform_string() { 200 const char *Abstract_VM_Version::vm_platform_string() {
199 return OS "-" CPU; 201 return OS "-" CPU;
241 #else 243 #else
242 #define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC) 244 #define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC)
243 #endif 245 #endif
244 #elif defined(__GNUC__) 246 #elif defined(__GNUC__)
245 #define HOTSPOT_BUILD_COMPILER "gcc " __VERSION__ 247 #define HOTSPOT_BUILD_COMPILER "gcc " __VERSION__
248 #elif defined(__IBMCPP__)
249 #define HOTSPOT_BUILD_COMPILER "xlC " XSTR(__IBMCPP__)
250
246 #else 251 #else
247 #define HOTSPOT_BUILD_COMPILER "unknown compiler" 252 #define HOTSPOT_BUILD_COMPILER "unknown compiler"
248 #endif 253 #endif
249 #endif 254 #endif
250 255
253 #define FLOAT_ARCH_STR "-sflt" 258 #define FLOAT_ARCH_STR "-sflt"
254 #elif defined(E500V2) 259 #elif defined(E500V2)
255 #define FLOAT_ARCH_STR "-e500v2" 260 #define FLOAT_ARCH_STR "-e500v2"
256 #elif defined(ARM) 261 #elif defined(ARM)
257 #define FLOAT_ARCH_STR "-vfp" 262 #define FLOAT_ARCH_STR "-vfp"
258 #elif defined(PPC) 263 #elif defined(PPC32)
259 #define FLOAT_ARCH_STR "-hflt" 264 #define FLOAT_ARCH_STR "-hflt"
260 #else 265 #else
261 #define FLOAT_ARCH_STR "" 266 #define FLOAT_ARCH_STR ""
262 #endif 267 #endif
263 #else 268 #else