diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2016-02-02 13:48:31 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gcc.gnu.org> | 2016-02-02 13:48:31 +0100 |
| commit | 033ff3d1302e18505f9d4fea5b60bde5b85a3fe1 (patch) | |
| tree | 483c8497b17f73fbdff760e7930a19a10466166f /libgomp/configure | |
| parent | 4a88d9b77a7619c0d6ea3b8692c95a7847b61de3 (diff) | |
| download | gcc-033ff3d1302e18505f9d4fea5b60bde5b85a3fe1.zip gcc-033ff3d1302e18505f9d4fea5b60bde5b85a3fe1.tar.gz gcc-033ff3d1302e18505f9d4fea5b60bde5b85a3fe1.tar.bz2 | |
libgomp: Use HSA_RUNTIME_LIB, HSA_KMT_LIB in the testsuite
libgomp/
* plugin/configfrag.ac (HSA_KMT_LIB, HSA_KMT_LDFLAGS): New
variables.
* testsuite/libgomp-test-support.exp.in (hsa_runtime_lib)
(hsa_kmt_lib): Set variables.
* testsuite/lib/libgomp.exp (libgomp_init): Use them to amend
always_ld_library_path.
* Makefile.in: Regenerate.
* configure: Likewise.
* testsuite/Makefile.in: Likewise.
From-SVN: r233072
Diffstat (limited to 'libgomp/configure')
| -rwxr-xr-x | libgomp/configure | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libgomp/configure b/libgomp/configure index f643bf8..8d03eb6 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -637,6 +637,7 @@ PLUGIN_HSA_LIBS PLUGIN_HSA_LDFLAGS PLUGIN_HSA_CPPFLAGS PLUGIN_HSA +HSA_KMT_LIB HSA_RUNTIME_LIB HSA_RUNTIME_INCLUDE PLUGIN_NVPTX_LIBS @@ -11144,7 +11145,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11147 "configure" +#line 11148 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11250,7 +11251,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11253 "configure" +#line 11254 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15292,6 +15293,9 @@ if test "x$HSA_RUNTIME_LIB" != x; then HSA_RUNTIME_LDFLAGS=-L$HSA_RUNTIME_LIB fi +HSA_KMT_LIB= + +HSA_KMT_LDFLAGS= # Check whether --with-hsa-kmt-lib was given. if test "${with_hsa_kmt_lib+set}" = set; then : @@ -15299,8 +15303,10 @@ if test "${with_hsa_kmt_lib+set}" = set; then : fi if test "x$with_hsa_kmt_lib" != x; then - HSA_RUNTIME_LDFLAGS="$HSA_RUNTIME_LDFLAGS -L$with_hsa_kmt_lib" - HSA_RUNTIME_LIB= + HSA_KMT_LIB=$with_hsa_kmt_lib +fi +if test "x$HSA_KMT_LIB" != x; then + HSA_KMT_LDFLAGS=-L$HSA_KMT_LIB fi PLUGIN_HSA=0 @@ -15378,7 +15384,7 @@ rm -f core conftest.err conftest.$ac_objext \ tgt_name=hsa PLUGIN_HSA=$tgt PLUGIN_HSA_CPPFLAGS=$HSA_RUNTIME_CPPFLAGS - PLUGIN_HSA_LDFLAGS=$HSA_RUNTIME_LDFLAGS + PLUGIN_HSA_LDFLAGS="$HSA_RUNTIME_LDFLAGS $HSA_KMT_LDFLAGS" PLUGIN_HSA_LIBS="-lhsa-runtime64 -lhsakmt" PLUGIN_HSA_save_CPPFLAGS=$CPPFLAGS |