From 9e38af5c5521d07a914a03175bf7b7f5d88d3c89 Mon Sep 17 00:00:00 2001 From: Alexander Monakov Date: Wed, 30 Nov 2016 21:08:30 +0300 Subject: [PATCH] libgomp: introduce LIBGOMP_OFFLOADED_ONLY macro * configure.ac [nvptx*-*-*] (libgomp_offloaded_only): Set and use it... (LIBGOMP_OFFLOADED_ONLY): ...here; new define. * configure: Regenerate. * config.h.in: Likewise. From-SVN: r243040 --- libgomp/ChangeLog | 7 +++++++ libgomp/config.h.in | 3 +++ libgomp/configure | 8 ++++++++ libgomp/configure.ac | 7 +++++++ 4 files changed, 25 insertions(+) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 636226c53df..1fafab8682f 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,10 @@ +2016-11-30 Alexander Monakov + + * configure.ac [nvptx*-*-*] (libgomp_offloaded_only): Set and use it... + (LIBGOMP_OFFLOADED_ONLY): ...here; new define. + * configure: Regenerate. + * config.h.in: Likewise. + 2016-11-30 Alexander Monakov * Makefile.in: Regenerate with automake-1.11.6. diff --git a/libgomp/config.h.in b/libgomp/config.h.in index b54dd87c2a6..583b9b48250 100644 --- a/libgomp/config.h.in +++ b/libgomp/config.h.in @@ -115,6 +115,9 @@ /* Define to 1 if GNU symbol versioning is used for libgomp. */ #undef LIBGOMP_GNU_SYMBOL_VERSIONING +/* Define to 1 if building libgomp for an accelerator-only target. */ +#undef LIBGOMP_OFFLOADED_ONLY + /* Define to 1 if libgomp should use POSIX threads. */ #undef LIBGOMP_USE_PTHREADS diff --git a/libgomp/configure b/libgomp/configure index cfce5602a9b..6355ad90ba4 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -15074,6 +15074,8 @@ case "$host" in nvptx*-*-*) # NVPTX does not support Pthreads, has its own code replacement. libgomp_use_pthreads=no + # NVPTX is an accelerator-only target + libgomp_offloaded_only=yes ;; *) # Check to see if -pthread or -lpthread is needed. Prefer the former. @@ -15125,6 +15127,12 @@ $as_echo "#define LIBGOMP_USE_PTHREADS 1" >>confdefs.h fi +if test x$libgomp_offloaded_only = xyes; then + +$as_echo "#define LIBGOMP_OFFLOADED_ONLY 1" >>confdefs.h + +fi + # Plugins for offload execution, configure.ac fragment. -*- mode: autoconf -*- # # Copyright (C) 2014-2016 Free Software Foundation, Inc. diff --git a/libgomp/configure.ac b/libgomp/configure.ac index 5f1db7e1e0e..4086d3f8263 100644 --- a/libgomp/configure.ac +++ b/libgomp/configure.ac @@ -182,6 +182,8 @@ case "$host" in nvptx*-*-*) # NVPTX does not support Pthreads, has its own code replacement. libgomp_use_pthreads=no + # NVPTX is an accelerator-only target + libgomp_offloaded_only=yes ;; *) # Check to see if -pthread or -lpthread is needed. Prefer the former. @@ -208,6 +210,11 @@ if test x$libgomp_use_pthreads != xno; then [Define to 1 if libgomp should use POSIX threads.]) fi +if test x$libgomp_offloaded_only = xyes; then + AC_DEFINE(LIBGOMP_OFFLOADED_ONLY, 1, + [Define to 1 if building libgomp for an accelerator-only target.]) +fi + m4_include([plugin/configfrag.ac]) # Check for functions needed. -- 2.30.2