[Openmp-commits] [openmp] 138cc5a - Revert "[Libomptarget] Fix external visibility for internal variables"

[Joseph Huber via Openmp-commits]

Author: Joseph Huber
Date: 2022-01-18T14:44:11-05:00
New Revision: 138cc5a0010d5c70eefe9204df8d79988d7aad32

URL: https://github.com/llvm/llvm-project/commit/138cc5a0010d5c70eefe9204df8d79988d7aad32
DIFF: https://github.com/llvm/llvm-project/commit/138cc5a0010d5c70eefe9204df8d79988d7aad32.diff

LOG: Revert "[Libomptarget] Fix external visibility for internal variables"

Reverting to investigate break on AMDGPU. This reverts commit
0203ff19602d9d90e03653062dbb19cc13afa956.

Added: 
    

Modified: 
    openmp/libomptarget/DeviceRTL/include/Types.h
    openmp/libomptarget/DeviceRTL/src/Workshare.cpp

Removed: 
    


################################################################################
diff  --git a/openmp/libomptarget/DeviceRTL/include/Types.h b/openmp/libomptarget/DeviceRTL/include/Types.h
index 8d9b48a0f1352..0ff0cee66b3f3 100644
--- a/openmp/libomptarget/DeviceRTL/include/Types.h
+++ b/openmp/libomptarget/DeviceRTL/include/Types.h
@@ -193,8 +193,7 @@ enum OMPTgtExecModeFlags : int8_t {
 // TODO: clang should use address space 5 for omp_thread_mem_alloc, but right
 //       now that's not the case.
 #define THREAD_LOCAL(NAME)                                                     \
-  NAME [[clang::loader_uninitialized, clang::address_space(5),                 \
-         gnu::visibility("hidden")]]
+  NAME [[clang::loader_uninitialized, clang::address_space(5)]]
 
 // TODO: clang should use address space 4 for omp_const_mem_alloc, maybe it
 //       does?

diff  --git a/openmp/libomptarget/DeviceRTL/src/Workshare.cpp b/openmp/libomptarget/DeviceRTL/src/Workshare.cpp
index 0bdbf30c23d3b..24f3fee2aa5b4 100644
--- a/openmp/libomptarget/DeviceRTL/src/Workshare.cpp
+++ b/openmp/libomptarget/DeviceRTL/src/Workshare.cpp
@@ -46,7 +46,7 @@ struct DynamicScheduleTracker {
 #pragma omp declare target
 
 // TODO: This variable is a hack inherited from the old runtime.
-static uint64_t SHARED(Cnt);
+uint64_t SHARED(Cnt);
 
 template <typename T, typename ST> struct omptarget_nvptx_LoopSupport {
   ////////////////////////////////////////////////////////////////////////////////
@@ -443,7 +443,7 @@ template <typename T, typename ST> struct omptarget_nvptx_LoopSupport {
 
 // TODO: This is a stopgap. We probably want to expand the dispatch API to take
 //       an DST pointer which can then be allocated properly without malloc.
-static DynamicScheduleTracker *THREAD_LOCAL(ThreadDSTPtr);
+DynamicScheduleTracker *THREAD_LOCAL(ThreadDSTPtr);
 
 // Create a new DST, link the current one, and define the new as current.
 static DynamicScheduleTracker *pushDST() {