diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2020-06-25 11:59:42 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2021-03-25 14:11:50 +0100 |
| commit | 7c1e856bedb4ae190c420ec2d2ca5e08730cf21d (patch) | |
| tree | fecde9cf9b90ac745fdc61b18ff72fdab8bb1a71 | |
| parent | 068d02e896d3df17b59b013a82ca0bf9faf058f3 (diff) | |
| download | gcc-7c1e856bedb4ae190c420ec2d2ca5e08730cf21d.zip gcc-7c1e856bedb4ae190c420ec2d2ca5e08730cf21d.tar.gz gcc-7c1e856bedb4ae190c420ec2d2ca5e08730cf21d.tar.bz2 | |
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
b8d89b03db5f212919e4571671ebb4f5f8b1e19d (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.
| -rw-r--r-- | libgomp/config.h.in | 3 | ||||
| -rwxr-xr-x | libgomp/configure | 10 | ||||
| -rw-r--r-- | libgomp/plugin/configfrag.ac | 7 | ||||
| -rw-r--r-- | libgomp/plugin/plugin-gcn.c | 2 |
4 files changed, 1 insertions, 21 deletions
diff --git a/libgomp/config.h.in b/libgomp/config.h.in index 390e548..03123dc 100644 --- a/libgomp/config.h.in +++ b/libgomp/config.h.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 diff --git a/libgomp/configure b/libgomp/configure index 22123f9..1917d7e 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -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 diff --git a/libgomp/plugin/configfrag.ac b/libgomp/plugin/configfrag.ac index 1ab1777..f447def 100644 --- a/libgomp/plugin/configfrag.ac +++ b/libgomp/plugin/configfrag.ac @@ -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.]) diff --git a/libgomp/plugin/plugin-gcn.c b/libgomp/plugin/plugin-gcn.c index 8e6af69..8aab708 100644 --- a/libgomp/plugin/plugin-gcn.c +++ b/libgomp/plugin/plugin-gcn.c @@ -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"); |