Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/vm_version.cpp @ 1692:d2ede61b7a12
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 |
line wrap: on
line diff
--- a/src/share/vm/runtime/vm_version.cpp Wed Aug 11 01:17:27 2010 -0700 +++ b/src/share/vm/runtime/vm_version.cpp Wed Aug 11 05:51:21 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, 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 @@ -95,7 +95,11 @@ #define VMTYPE "Server" #else // TIERED #ifdef ZERO +#ifdef SHARK + #define VMTYPE "Shark" +#else // SHARK #define VMTYPE "Zero" +#endif // SHARK #else // ZERO #define VMTYPE COMPILER1_PRESENT("Client") \ COMPILER2_PRESENT("Server")