From 1eff4872d2e57c481f7218d25eecbfba647504e1 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 10 Jun 2022 21:19:51 +0200 Subject: [PATCH] openmp: Call dlopen with "libmemkind.so.0" rather than "libmemkind.so" On Thu, Jun 09, 2022 at 12:11:28PM +0200, Thomas Schwinge wrote: > > This patch adds support for dlopening libmemkind.so > > Instead of 'dlopen'ing literally 'libmemkind.so': > ..., shouldn't this instead 'dlopen' 'libmemkind.so.0'? At least for > Debian/Ubuntu, the latter ('libmemkind.so.0') is shipped in the "library" > package: I agree and I've actually noticed it too right before committing, but I thought I'll investigate and tweak incrementally because "libmemkind.so" is what I've actually tested (it is what llvm libomp uses). Here is the now tested incremental fix. 2022-06-10 Jakub Jelinek * allocator.c (gomp_init_memkind): Call dlopen with "libmemkind.so.0" rather than "libmemkind.so". --- libgomp/allocator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgomp/allocator.c b/libgomp/allocator.c index c96d37891a4..b04820b8cf9 100644 --- a/libgomp/allocator.c +++ b/libgomp/allocator.c @@ -99,7 +99,7 @@ static pthread_once_t memkind_data_once = PTHREAD_ONCE_INIT; static void gomp_init_memkind (void) { - void *handle = dlopen ("libmemkind.so", RTLD_LAZY); + void *handle = dlopen ("libmemkind.so.0", RTLD_LAZY); struct gomp_memkind_data *data; int i; static const char *kinds[] = {