1.1 --- a/src/share/vm/runtime/threadLocalStorage.hpp Tue Nov 23 15:01:43 2010 -0500 1.2 +++ b/src/share/vm/runtime/threadLocalStorage.hpp Tue Nov 23 13:22:55 2010 -0800 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -22,6 +22,13 @@ 1.11 * 1.12 */ 1.13 1.14 +#ifndef SHARE_VM_RUNTIME_THREADLOCALSTORAGE_HPP 1.15 +#define SHARE_VM_RUNTIME_THREADLOCALSTORAGE_HPP 1.16 + 1.17 +#include "gc_implementation/shared/gcUtil.hpp" 1.18 +#include "runtime/os.hpp" 1.19 +#include "utilities/top.hpp" 1.20 + 1.21 // Interface for thread local storage 1.22 1.23 // Fast variant of ThreadLocalStorage::get_thread_slow 1.24 @@ -37,7 +44,25 @@ 1.25 static void invalidate_all() { pd_invalidate_all(); } 1.26 1.27 // Machine dependent stuff 1.28 - #include "incls/_threadLS_pd.hpp.incl" 1.29 +#ifdef TARGET_OS_ARCH_linux_x86 1.30 +# include "threadLS_linux_x86.hpp" 1.31 +#endif 1.32 +#ifdef TARGET_OS_ARCH_linux_sparc 1.33 +# include "threadLS_linux_sparc.hpp" 1.34 +#endif 1.35 +#ifdef TARGET_OS_ARCH_linux_zero 1.36 +# include "threadLS_linux_zero.hpp" 1.37 +#endif 1.38 +#ifdef TARGET_OS_ARCH_solaris_x86 1.39 +# include "threadLS_solaris_x86.hpp" 1.40 +#endif 1.41 +#ifdef TARGET_OS_ARCH_solaris_sparc 1.42 +# include "threadLS_solaris_sparc.hpp" 1.43 +#endif 1.44 +#ifdef TARGET_OS_ARCH_windows_x86 1.45 +# include "threadLS_windows_x86.hpp" 1.46 +#endif 1.47 + 1.48 1.49 public: 1.50 // Accessor 1.51 @@ -61,3 +86,5 @@ 1.52 static void pd_invalidate_all(); 1.53 1.54 }; 1.55 + 1.56 +#endif // SHARE_VM_RUNTIME_THREADLOCALSTORAGE_HPP