1.1 --- a/src/share/vm/shark/llvmHeaders.hpp Wed Apr 13 14:33:03 2011 -0700
1.2 +++ b/src/share/vm/shark/llvmHeaders.hpp Thu Apr 14 01:53:12 2011 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
1.7 * Copyright 2008, 2009, 2010 Red Hat, Inc.
1.8 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.9 *
1.10 @@ -46,7 +46,11 @@
1.11 #include <llvm/ModuleProvider.h>
1.12 #endif
1.13 #include <llvm/Support/IRBuilder.h>
1.14 +#if SHARK_LLVM_VERSION >= 29
1.15 +#include <llvm/Support/Threading.h>
1.16 +#else
1.17 #include <llvm/System/Threading.h>
1.18 +#endif
1.19 #include <llvm/Target/TargetSelect.h>
1.20 #include <llvm/Type.h>
1.21 #include <llvm/ExecutionEngine/JITMemoryManager.h>
1.22 @@ -55,8 +59,12 @@
1.23 #include <llvm/ExecutionEngine/JIT.h>
1.24 #include <llvm/ADT/StringMap.h>
1.25 #include <llvm/Support/Debug.h>
1.26 +#if SHARK_LLVM_VERSION >= 29
1.27 +#include <llvm/Support/Host.h>
1.28 +#else
1.29 #include <llvm/System/Host.h>
1.30 #endif
1.31 +#endif
1.32
1.33 #include <map>
1.34
