summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2015-05-28 01:47:22 +0000
committerChandler Carruth <chandlerc@gmail.com>2015-05-28 01:47:22 +0000
commitba80ee730758edc4f8bb221956d93e1b913de8a7 (patch)
tree3f6e3780fcbd7e4ca786340a27f417ba6c9861cc
parent2c46a37b03c865aa7a21118efb0b2e6f2d771eaf (diff)
[omp] Add a configuration variable for the default OpenMP runtime.
This will be used in my next commit to Clang. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238388 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--autoconf/configure.ac7
-rwxr-xr-xconfigure16
-rw-r--r--include/llvm/Config/config.h.in3
3 files changed, 26 insertions, 0 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 586f3f26cb3..5ca40ec373b 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -1337,6 +1337,13 @@ AC_ARG_WITH(default-sysroot,
AC_DEFINE_UNQUOTED(DEFAULT_SYSROOT,"$withval",
[Default <path> to all compiler invocations for --sysroot=<path>.])
+AC_ARG_WITH(clang-default-openmp-runtime,
+ AS_HELP_STRING([--with-clang-default-openmp-runtime],
+ [The default OpenMP runtime for Clang.]),,
+ withval="")
+AC_DEFINE_UNQUOTED(CLANG_DEFAULT_OPENMP_RUNTIME,"$withval",
+ [Default OpenMP runtime used by -fopenmp.])
+
dnl Allow linking of LLVM with GPLv3 binutils code.
AC_ARG_WITH(binutils-include,
AS_HELP_STRING([--with-binutils-include],
diff --git a/configure b/configure
index 37f3d7d95ae..b3ccccbb881 100755
--- a/configure
+++ b/configure
@@ -1495,6 +1495,8 @@ Optional Packages:
search for headers
--with-gcc-toolchain Directory where gcc is installed.
--with-default-sysroot Add --sysroot=<path> to all compiler invocations.
+ --with-clang-default-openmp-runtime
+ The default OpenMP runtime for Clang.
--with-binutils-include Specify path to binutils/include/ containing
plugin-api.h file for gold plugin.
--with-bug-report-url Specify the URL where bug reports should be
@@ -5948,6 +5950,20 @@ _ACEOF
+# Check whether --with-clang-default-openmp-runtime was given.
+if test "${with_clang_default_openmp_runtime+set}" = set; then
+ withval=$with_clang_default_openmp_runtime;
+else
+ withval=""
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define CLANG_DEFAULT_OPENMP_RUNTIME "$withval"
+_ACEOF
+
+
+
# Check whether --with-binutils-include was given.
if test "${with_binutils_include+set}" = set; then
withval=$with_binutils_include;
diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in
index 67d7c8485a4..211e1d0fad0 100644
--- a/include/llvm/Config/config.h.in
+++ b/include/llvm/Config/config.h.in
@@ -6,6 +6,9 @@
/* Bug report URL. */
#undef BUG_REPORT_URL
+/* Default OpenMP runtime used by -fopenmp. */
+#undef CLANG_DEFAULT_OPENMP_RUNTIME
+
/* Define if we have libxml2 */
#undef CLANG_HAVE_LIBXML