diff options
| author | Jonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de> | 2016-01-28 07:14:44 +0000 |
|---|---|---|
| committer | Jonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de> | 2016-01-28 07:14:44 +0000 |
| commit | bba248c36833b8a3ec8d245b14f72fa9b8a9c405 (patch) | |
| tree | 43040bbce1153296c89ab31c6595792e6c599bc1 /openmp/runtime/src | |
| parent | 37e5d79c9c920f07cff91a83c5c654803ffbd1c3 (diff) | |
| download | bcm5719-llvm-bba248c36833b8a3ec8d245b14f72fa9b8a9c405.tar.gz bcm5719-llvm-bba248c36833b8a3ec8d245b14f72fa9b8a9c405.zip | |
[OMPT] Workaround clang failing with 'declare target'
Current clang trunk reports _OPENMP to be 201307 = OpenMP 4.0. It doesn't
recognize '#pragma omp declare target' though (patch still pending) and
therefore fails compilation.
Differential Revision: http://reviews.llvm.org/D16631
llvm-svn: 259026
Diffstat (limited to 'openmp/runtime/src')
| -rw-r--r-- | openmp/runtime/src/include/30/ompt.h.var | 5 | ||||
| -rw-r--r-- | openmp/runtime/src/include/40/ompt.h.var | 5 | ||||
| -rw-r--r-- | openmp/runtime/src/include/41/ompt.h.var | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/openmp/runtime/src/include/30/ompt.h.var b/openmp/runtime/src/include/30/ompt.h.var index 83b4f1e3dfc..2a29e859c9a 100644 --- a/openmp/runtime/src/include/30/ompt.h.var +++ b/openmp/runtime/src/include/30/ompt.h.var @@ -461,14 +461,15 @@ OMPT_API_FUNCTION(int, ompt_get_callback, ( ***************************************************************************/ /* control */ -#if defined(_OPENMP) && (_OPENMP >= 201307) +// FIXME: remove workaround for clang +#if !defined(__clang__) && defined(_OPENMP) && (_OPENMP >= 201307) #pragma omp declare target #endif void ompt_control( uint64_t command, uint64_t modifier ); -#if defined(_OPENMP) && (_OPENMP >= 201307) +#if !defined(__clang__) && defined(_OPENMP) && (_OPENMP >= 201307) #pragma omp end declare target #endif diff --git a/openmp/runtime/src/include/40/ompt.h.var b/openmp/runtime/src/include/40/ompt.h.var index 3a8c30c1657..a1387fab43b 100644 --- a/openmp/runtime/src/include/40/ompt.h.var +++ b/openmp/runtime/src/include/40/ompt.h.var @@ -461,14 +461,15 @@ OMPT_API_FUNCTION(int, ompt_get_callback, ( ***************************************************************************/ /* control */ -#if defined(_OPENMP) && (_OPENMP >= 201307) +// FIXME: remove workaround for clang +#if !defined(__clang__) && defined(_OPENMP) && (_OPENMP >= 201307) #pragma omp declare target #endif void ompt_control( uint64_t command, uint64_t modifier ); -#if defined(_OPENMP) && (_OPENMP >= 201307) +#if !defined(__clang__) && defined(_OPENMP) && (_OPENMP >= 201307) #pragma omp end declare target #endif diff --git a/openmp/runtime/src/include/41/ompt.h.var b/openmp/runtime/src/include/41/ompt.h.var index 04416af48d7..da7647fc675 100644 --- a/openmp/runtime/src/include/41/ompt.h.var +++ b/openmp/runtime/src/include/41/ompt.h.var @@ -461,14 +461,15 @@ OMPT_API_FUNCTION(int, ompt_get_callback, ( ***************************************************************************/ /* control */ -#if defined(_OPENMP) && (_OPENMP >= 201307) +// FIXME: remove workaround for clang +#if !defined(__clang__) && defined(_OPENMP) && (_OPENMP >= 201307) #pragma omp declare target #endif void ompt_control( uint64_t command, uint64_t modifier ); -#if defined(_OPENMP) && (_OPENMP >= 201307) +#if !defined(__clang__) && defined(_OPENMP) && (_OPENMP >= 201307) #pragma omp end declare target #endif |
