diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2023-06-30 11:17:56 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2023-07-04 00:05:53 +0100 |
| commit | 8bef8e713fd5f17c5dee45d9bb7ffca3cf3c0f9d (patch) | |
| tree | 085295a32b0f13e2360073b997fe54018d9d6fc4 | |
| parent | 33245d6b87a284495304c9952813b6b83d5df99f (diff) | |
| download | gcc-8bef8e713fd5f17c5dee45d9bb7ffca3cf3c0f9d.zip gcc-8bef8e713fd5f17c5dee45d9bb7ffca3cf3c0f9d.tar.gz gcc-8bef8e713fd5f17c5dee45d9bb7ffca3cf3c0f9d.tar.bz2 | |
libstdc++: Enable OpenMP 5.0 pragmas in PSTL headers
This reapplies r10-1314-g32bab8b6ad0a90 which was lost in the recent
PSTL rebase from upstream.
* include/pstl/pstl_config.h (_PSTL_PRAGMA_SIMD_SCAN,
_PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN, _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN):
Define to OpenMP 5.0 pragmas even for GCC 10.0+.
(_PSTL_UDS_PRESENT): Define to 1 for GCC 10.0+.
| -rw-r--r-- | libstdc++-v3/include/pstl/pstl_config.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libstdc++-v3/include/pstl/pstl_config.h b/libstdc++-v3/include/pstl/pstl_config.h index 74d2139..ccb9dd3 100644 --- a/libstdc++-v3/include/pstl/pstl_config.h +++ b/libstdc++-v3/include/pstl/pstl_config.h @@ -82,7 +82,8 @@ # define _PSTL_PRAGMA_FORCEINLINE #endif -#if defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1900 +#if (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1900) || \ + (!defined(__INTEL_COMPILER) && _PSTL_GCC_VERSION >= 100000) # define _PSTL_PRAGMA_SIMD_SCAN(PRM) _PSTL_PRAGMA(omp simd reduction(inscan, PRM)) # define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM) _PSTL_PRAGMA(omp scan inclusive(PRM)) # define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM) _PSTL_PRAGMA(omp scan exclusive(PRM)) @@ -126,7 +127,8 @@ # define _PSTL_UDR_PRESENT #endif -#if defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1900 && __INTEL_COMPILER_BUILD_DATE >= 20180626 +#if (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1900 && __INTEL_COMPILER_BUILD_DATE >= 20180626) || \ + (!defined(__INTEL_COMPILER) && _PSTL_GCC_VERSION >= 100000) # define _PSTL_UDS_PRESENT #endif |