summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Hahnfeld <hahnjo@hahnjo.de>2019-07-16 17:16:43 +0000
committerJonas Hahnfeld <hahnjo@hahnjo.de>2019-07-16 17:16:43 +0000
commit1ff553578551766801cbd25dd2c659dc8594b96b (patch)
treeeb7a55e9bf898d15ed07cbf67debe00d20c22a15
parent97b4d7a8e14f37319676f750fa57d68eb09c0e16 (diff)
downloadbcm5719-llvm-1ff553578551766801cbd25dd2c659dc8594b96b.tar.gz
bcm5719-llvm-1ff553578551766801cbd25dd2c659dc8594b96b.zip
[OpenMP] Move header inclusion out of 'extern "C"'
This leads to problems when compiling C++ code with libc++ for Nvidia GPUs because Clang now uses wrappers for math functions that might include C++ templates not allowed in 'extern "C"'. Differentiel Revision: https://reviews.llvm.org/D64625 llvm-svn: 366229
-rw-r--r--openmp/runtime/src/include/omp.h.var5
1 files changed, 3 insertions, 2 deletions
diff --git a/openmp/runtime/src/include/omp.h.var b/openmp/runtime/src/include/omp.h.var
index 54ba1f545b4..2246e7012be 100644
--- a/openmp/runtime/src/include/omp.h.var
+++ b/openmp/runtime/src/include/omp.h.var
@@ -15,6 +15,9 @@
#ifndef __OMP_H
# define __OMP_H
+# include <stdlib.h>
+# include <stdint.h>
+
# define KMP_VERSION_MAJOR @LIBOMP_VERSION_MAJOR@
# define KMP_VERSION_MINOR @LIBOMP_VERSION_MINOR@
# define KMP_VERSION_BUILD @LIBOMP_VERSION_BUILD@
@@ -134,8 +137,6 @@
extern int __KAI_KMPC_CONVENTION omp_get_team_num (void);
extern int __KAI_KMPC_CONVENTION omp_get_cancellation (void);
-# include <stdlib.h>
-# include <stdint.h>
/* OpenMP 4.5 */
extern int __KAI_KMPC_CONVENTION omp_get_initial_device (void);
extern void* __KAI_KMPC_CONVENTION omp_target_alloc(size_t, int);
OpenPOWER on IntegriCloud