[clang] db5f100 - [HIP] Remove workaround in __clang_hip_runtime_wrapper.h

[Yaxun Liu via cfe-commits]

Author: Yaxun (Sam) Liu
Date: 2021-07-21T15:16:28-04:00
New Revision: db5f100fe4ca252d7f392659e7da5dba10331ae7

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

LOG: [HIP] Remove workaround in __clang_hip_runtime_wrapper.h

Remove the workaround for -fopenmp in __clang_hip_runtime_wrapper.h
since it causes device functions in HIP wrapper headers disabled when
compiling HIP program with -fopenmp.

Reviewed by: Aaron Enye Shi, Jon Chesterfield

Differential Revision: https://reviews.llvm.org/D106070

Added: 
    

Modified: 
    clang/lib/Headers/__clang_hip_runtime_wrapper.h

Removed: 
    


################################################################################
diff  --git a/clang/lib/Headers/__clang_hip_runtime_wrapper.h b/clang/lib/Headers/__clang_hip_runtime_wrapper.h
index 6aefbeaec566f..59d5cfef2df83 100644
--- a/clang/lib/Headers/__clang_hip_runtime_wrapper.h
+++ b/clang/lib/Headers/__clang_hip_runtime_wrapper.h
@@ -101,7 +101,6 @@ typedef __SIZE_TYPE__ size_t;
 #include <__clang_hip_libdevice_declares.h>
 #include <__clang_hip_math.h>
 
-#if !_OPENMP || __HIP_ENABLE_CUDA_WRAPPER_FOR_OPENMP__
 #if defined(__HIPCC_RTC__)
 #include <__clang_hip_cmath.h>
 #else
@@ -112,7 +111,6 @@ typedef __SIZE_TYPE__ size_t;
 #include <complex>
 #include <new>
 #endif // __HIPCC_RTC__
-#endif // !_OPENMP || __HIP_ENABLE_CUDA_WRAPPER_FOR_OPENMP__
 
 #define __CLANG_HIP_RUNTIME_WRAPPER_INCLUDED__ 1
 #if defined(__HIPCC_RTC__)