Mercurial > hg > graal-jvmci-8

comparison src/share/vm/runtime/vm_version.cpp @ 1692:d2ede61b7a12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6976186: integrate Shark HotSpot changes Summary: Shark is a JIT compiler for Zero that uses the LLVM compiler infrastructure. Reviewed-by: kvn, twisti Contributed-by: Gary Benson <gbenson@redhat.com>
author twisti
date Wed, 11 Aug 2010 05:51:21 -0700
parents 126ea7725993
children 728a287f6c20
comparison
equal deleted inserted replaced
1691:4a665be40fd3 1692:d2ede61b7a12
1 /* 1 /*
2 * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1998, 2010, 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.
93 #else // KERNEL 93 #else // KERNEL
94 #ifdef TIERED 94 #ifdef TIERED
95 #define VMTYPE "Server" 95 #define VMTYPE "Server"
96 #else // TIERED 96 #else // TIERED
97 #ifdef ZERO 97 #ifdef ZERO
98 #ifdef SHARK
99 #define VMTYPE "Shark"
100 #else // SHARK
98 #define VMTYPE "Zero" 101 #define VMTYPE "Zero"
102 #endif // SHARK
99 #else // ZERO 103 #else // ZERO
100 #define VMTYPE COMPILER1_PRESENT("Client") \ 104 #define VMTYPE COMPILER1_PRESENT("Client") \
101 COMPILER2_PRESENT("Server") 105 COMPILER2_PRESENT("Server")
102 #endif // ZERO 106 #endif // ZERO
103 #endif // TIERED 107 #endif // TIERED