mirror of
https://forge.sourceware.org/marek/gcc.git
synced 2026-02-22 12:00:11 -05:00
libgomp HSA/GCN plugins: don't prepend the 'HSA_RUNTIME_LIB' path to 'libhsa-runtime64.so'
For unknown reasons, this had gotten added for the libgomp HSA plugin in commit
b8d89b03db (r242749) "Remove build dependence on
HSA run-time", and later propagated into the GCN plugin.
libgomp/
* plugin/plugin-gcn.c (init_environment_variables): Don't prepend
the 'HSA_RUNTIME_LIB' path to 'libhsa-runtime64.so'.
* plugin/configfrag.ac (HSA_RUNTIME_LIB): Clean up.
* config.h.in: Regenerate.
* configure: Likewise.
This commit is contained in:
@@ -130,9 +130,6 @@
|
||||
/* Define to 1 if you have the `__secure_getenv' function. */
|
||||
#undef HAVE___SECURE_GETENV
|
||||
|
||||
/* Define path to HSA runtime. */
|
||||
#undef HSA_RUNTIME_LIB
|
||||
|
||||
/* Define to 1 if GNU symbol versioning is used for libgomp. */
|
||||
#undef LIBGOMP_GNU_SYMBOL_VERSIONING
|
||||
|
||||
|
||||
10
libgomp/configure
vendored
10
libgomp/configure
vendored
@@ -15448,16 +15448,6 @@ cat >>confdefs.h <<_ACEOF
|
||||
_ACEOF
|
||||
|
||||
|
||||
if test "$HSA_RUNTIME_LIB" != ""; then
|
||||
HSA_RUNTIME_LIB="$HSA_RUNTIME_LIB/"
|
||||
fi
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HSA_RUNTIME_LIB "$HSA_RUNTIME_LIB"
|
||||
_ACEOF
|
||||
|
||||
|
||||
|
||||
# Check for functions needed.
|
||||
for ac_func in getloadavg clock_gettime strtoull
|
||||
|
||||
@@ -272,10 +272,3 @@ AC_DEFINE_UNQUOTED([PLUGIN_NVPTX_DYNAMIC], [$PLUGIN_NVPTX_DYNAMIC],
|
||||
AM_CONDITIONAL([PLUGIN_GCN], [test $PLUGIN_GCN = 1])
|
||||
AC_DEFINE_UNQUOTED([PLUGIN_GCN], [$PLUGIN_GCN],
|
||||
[Define to 1 if the GCN plugin is built, 0 if not.])
|
||||
|
||||
if test "$HSA_RUNTIME_LIB" != ""; then
|
||||
HSA_RUNTIME_LIB="$HSA_RUNTIME_LIB/"
|
||||
fi
|
||||
|
||||
AC_DEFINE_UNQUOTED([HSA_RUNTIME_LIB], ["$HSA_RUNTIME_LIB"],
|
||||
[Define path to HSA runtime.])
|
||||
|
||||
@@ -1072,7 +1072,7 @@ init_environment_variables (void)
|
||||
|
||||
hsa_runtime_lib = secure_getenv ("HSA_RUNTIME_LIB");
|
||||
if (hsa_runtime_lib == NULL)
|
||||
hsa_runtime_lib = HSA_RUNTIME_LIB "libhsa-runtime64.so.1";
|
||||
hsa_runtime_lib = "libhsa-runtime64.so.1";
|
||||
|
||||
support_cpu_devices = secure_getenv ("GCN_SUPPORT_CPU_DEVICES");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user