Mercurial > hg > graal-compiler
changeset 2484:e9b9554f7fc3
Merge
| author | twisti |
|---|---|
| date | Thu, 14 Apr 2011 06:46:38 -0700 |
| parents | 1fcd6e9c3965 (diff) dbccacb79c63 (current diff) |
| children | 97e8046e2562 |
| files | |
| diffstat | 1 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/shark/llvmHeaders.hpp Thu Apr 14 00:02:21 2011 -0700 +++ b/src/share/vm/shark/llvmHeaders.hpp Thu Apr 14 06:46:38 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. * Copyright 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -46,7 +46,11 @@ #include <llvm/ModuleProvider.h> #endif #include <llvm/Support/IRBuilder.h> +#if SHARK_LLVM_VERSION >= 29 +#include <llvm/Support/Threading.h> +#else #include <llvm/System/Threading.h> +#endif #include <llvm/Target/TargetSelect.h> #include <llvm/Type.h> #include <llvm/ExecutionEngine/JITMemoryManager.h> @@ -55,8 +59,12 @@ #include <llvm/ExecutionEngine/JIT.h> #include <llvm/ADT/StringMap.h> #include <llvm/Support/Debug.h> +#if SHARK_LLVM_VERSION >= 29 +#include <llvm/Support/Host.h> +#else #include <llvm/System/Host.h> #endif +#endif #include <map>