From 8cc2deedecb1fa0916ef93c45e136aa7d5fd12ac Mon Sep 17 00:00:00 2001
From: Sinan Kaya <sinan.kaya@microsoft.com>
Date: Sat, 16 Feb 2019 20:23:09 +0000
Subject: [PATCH] Use thread_local for thread local storage on non MSVC targets

---
 src/vm/eventpipebuffermanager.cpp | 6 +++---
 src/vm/eventpipebuffermanager.h   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/vm/eventpipebuffermanager.cpp b/src/vm/eventpipebuffermanager.cpp
index 5355260fa1ce..4194abc73c43 100644
--- a/src/vm/eventpipebuffermanager.cpp
+++ b/src/vm/eventpipebuffermanager.cpp
@@ -10,11 +10,11 @@
 
 #ifdef FEATURE_PERFTRACING
 
-#ifndef __llvm__
+#ifndef __GNUC__
 __declspec(thread) ThreadEventBufferList ThreadEventBufferList::gCurrentThreadEventBufferList;
-#else // !__llvm__
+#else // !__GNUC__
 thread_local ThreadEventBufferList ThreadEventBufferList::gCurrentThreadEventBufferList;
-#endif // !__llvm__
+#endif // !__GNUC__
 
 EventPipeBufferManager::EventPipeBufferManager()
 {
diff --git a/src/vm/eventpipebuffermanager.h b/src/vm/eventpipebuffermanager.h
index 386a54b85088..e10018fe8ee2 100644
--- a/src/vm/eventpipebuffermanager.h
+++ b/src/vm/eventpipebuffermanager.h
@@ -21,11 +21,11 @@ class EventPipeBufferList;
 // when the thread dies so we can free EventPipeBufferList in the destructor.  
 class ThreadEventBufferList
 {
-#ifndef __llvm__
+#ifndef __GNUC__
 __declspec(thread) static ThreadEventBufferList gCurrentThreadEventBufferList;
-#else // !__llvm__
+#else // !__GNUC__
 thread_local static ThreadEventBufferList gCurrentThreadEventBufferList;
-#endif // !__llvm__
+#endif // !__GNUC__
     EventPipeBufferList * m_pThreadEventBufferList = NULL;
     ~ThreadEventBufferList();