OpenJDK / jdk / jdk
changeset 56261:dc792fa77da0
8230877: Rename THREAD_LOCAL_DECL to THREAD_LOCAL
Reviewed-by: kbarrett, dholmes
| author | pliden |
|---|---|
| date | Fri, 13 Sep 2019 08:40:09 +0200 |
| parents | 70aebd567a5c |
| children | 9b4717ca9bd1 |
| files | src/hotspot/share/runtime/thread.cpp src/hotspot/share/runtime/thread.hpp src/hotspot/share/utilities/globalDefinitions_gcc.hpp src/hotspot/share/utilities/globalDefinitions_solstudio.hpp src/hotspot/share/utilities/globalDefinitions_visCPP.hpp src/hotspot/share/utilities/globalDefinitions_xlc.hpp |
| diffstat | 6 files changed, 5 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/runtime/thread.cpp Fri Sep 13 08:40:09 2019 +0200 +++ b/src/hotspot/share/runtime/thread.cpp Fri Sep 13 08:40:09 2019 +0200 @@ -166,7 +166,7 @@ #ifndef USE_LIBRARY_BASED_TLS_ONLY // Current thread is maintained as a thread-local variable -THREAD_LOCAL_DECL Thread* Thread::_thr_current = NULL; +THREAD_LOCAL Thread* Thread::_thr_current = NULL; #endif // ======= Thread ========
--- a/src/hotspot/share/runtime/thread.hpp Fri Sep 13 08:40:09 2019 +0200 +++ b/src/hotspot/share/runtime/thread.hpp Fri Sep 13 08:40:09 2019 +0200 @@ -142,7 +142,7 @@ #ifndef USE_LIBRARY_BASED_TLS_ONLY // Current thread is maintained as a thread-local variable - static THREAD_LOCAL_DECL Thread* _thr_current; + static THREAD_LOCAL Thread* _thr_current; #endif // Thread local data area available to the GC. The internal
--- a/src/hotspot/share/utilities/globalDefinitions_gcc.hpp Fri Sep 13 08:40:09 2019 +0200 +++ b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp Fri Sep 13 08:40:09 2019 +0200 @@ -254,9 +254,7 @@ #define JLONG_FORMAT_W(width) "%" #width "ld" #endif // _LP64 && __APPLE__ -#ifndef USE_LIBRARY_BASED_TLS_ONLY -#define THREAD_LOCAL_DECL __thread -#endif +#define THREAD_LOCAL __thread // Inlining support #define NOINLINE __attribute__ ((noinline))
--- a/src/hotspot/share/utilities/globalDefinitions_solstudio.hpp Fri Sep 13 08:40:09 2019 +0200 +++ b/src/hotspot/share/utilities/globalDefinitions_solstudio.hpp Fri Sep 13 08:40:09 2019 +0200 @@ -245,9 +245,7 @@ #define offset_of(klass,field) offsetof(klass,field) -#ifndef USE_LIBRARY_BASED_TLS_ONLY -#define THREAD_LOCAL_DECL __thread -#endif +#define THREAD_LOCAL __thread // Inlining support #define NOINLINE
--- a/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp Fri Sep 13 08:40:09 2019 +0200 +++ b/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp Fri Sep 13 08:40:09 2019 +0200 @@ -153,9 +153,7 @@ #define offset_of(klass,field) offsetof(klass,field) -#ifndef USE_LIBRARY_BASED_TLS_ONLY -#define THREAD_LOCAL_DECL __declspec( thread ) -#endif +#define THREAD_LOCAL __declspec(thread) // Inlining support // MSVC has '__declspec(noinline)' but according to the official documentation
--- a/src/hotspot/share/utilities/globalDefinitions_xlc.hpp Fri Sep 13 08:40:09 2019 +0200 +++ b/src/hotspot/share/utilities/globalDefinitions_xlc.hpp Fri Sep 13 08:40:09 2019 +0200 @@ -130,10 +130,6 @@ // AIX 5.3 has buggy __thread support. (see JDK-8176442). #define USE_LIBRARY_BASED_TLS_ONLY 1 -#ifndef USE_LIBRARY_BASED_TLS_ONLY -#define THREAD_LOCAL_DECL __thread -#endif - // Inlining support // // Be aware that for function/method declarations, xlC only supports the following