Mercurial > hg > truffle

comparison src/share/vm/runtime/vm_version.cpp @ 17812:a7d4d4655766

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Wed, 26 Mar 2014 18:21:05 -0700
parents e2722a66aba7
children d8041d695d19
comparison
equal deleted inserted replaced
17789:6b207d038106 17812:a7d4d4655766
175 } 175 }
176 176
177 #define OS LINUX_ONLY("linux") \ 177 #define OS LINUX_ONLY("linux") \
178 WINDOWS_ONLY("windows") \ 178 WINDOWS_ONLY("windows") \
179 SOLARIS_ONLY("solaris") \ 179 SOLARIS_ONLY("solaris") \
180 AIX_ONLY("aix") \
180 BSD_ONLY("bsd") 181 BSD_ONLY("bsd")
181 182
182 #ifdef ZERO 183 #ifdef ZERO
183 #define CPU ZERO_LIBARCH 184 #define CPU ZERO_LIBARCH
184 #else 185 #else
185 #define CPU IA32_ONLY("x86") \ 186 #define CPU IA32_ONLY("x86") \
186 IA64_ONLY("ia64") \ 187 IA64_ONLY("ia64") \
187 AMD64_ONLY("amd64") \ 188 AMD64_ONLY("amd64") \
188 ARM_ONLY("arm") \ 189 ARM_ONLY("arm") \
189 PPC_ONLY("ppc") \ 190 PPC32_ONLY("ppc") \
191 PPC64_ONLY("ppc64") \
190 SPARC_ONLY("sparc") 192 SPARC_ONLY("sparc")
191 #endif // ZERO 193 #endif // ZERO
192 194
193 const char *Abstract_VM_Version::vm_platform_string() { 195 const char *Abstract_VM_Version::vm_platform_string() {
194 return OS "-" CPU; 196 return OS "-" CPU;
236 #else 238 #else
237 #define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC) 239 #define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC)
238 #endif 240 #endif
239 #elif defined(__GNUC__) 241 #elif defined(__GNUC__)
240 #define HOTSPOT_BUILD_COMPILER "gcc " __VERSION__ 242 #define HOTSPOT_BUILD_COMPILER "gcc " __VERSION__
243 #elif defined(__IBMCPP__)
244 #define HOTSPOT_BUILD_COMPILER "xlC " XSTR(__IBMCPP__)
245
241 #else 246 #else
242 #define HOTSPOT_BUILD_COMPILER "unknown compiler" 247 #define HOTSPOT_BUILD_COMPILER "unknown compiler"
243 #endif 248 #endif
244 #endif 249 #endif
245 250
248 #define FLOAT_ARCH_STR "-sflt" 253 #define FLOAT_ARCH_STR "-sflt"
249 #elif defined(E500V2) 254 #elif defined(E500V2)
250 #define FLOAT_ARCH_STR "-e500v2" 255 #define FLOAT_ARCH_STR "-e500v2"
251 #elif defined(ARM) 256 #elif defined(ARM)
252 #define FLOAT_ARCH_STR "-vfp" 257 #define FLOAT_ARCH_STR "-vfp"
253 #elif defined(PPC) 258 #elif defined(PPC32)
254 #define FLOAT_ARCH_STR "-hflt" 259 #define FLOAT_ARCH_STR "-hflt"
255 #else 260 #else
256 #define FLOAT_ARCH_STR "" 261 #define FLOAT_ARCH_STR ""
257 #endif 262 #endif
258 #else 263 #else