From: Dmitry V. Levin Date: Wed, 9 Dec 2020 00:13:27 +0000 (+0300) Subject: libdwfl: switch to DEBUGINFOD_SONAME, remove libdebuginfod.so fallback X-Git-Tag: elfutils-0.183~65 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61748551d890981c21ee8dde4477aaf76d37a6dc;p=thirdparty%2Felfutils.git libdwfl: switch to DEBUGINFOD_SONAME, remove libdebuginfod.so fallback Since DEBUGINFOD_SONAME is as good as ("libdebuginfod-" VERSION ".so") for dlopen, switch to use the name which is a part of the API. Given that DEBUGINFOD_SONAME is always available now, remove the no longer needed fall back to dlopen of "libdebuginfod.so". Signed-off-by: Dmitry V. Levin --- diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index f11abb80b..444e093c8 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,9 @@ +2020-12-08 Dmitry V. Levin + + * debuginfod-client.c (__libdwfl_debuginfod_init): Replace + "libdebuginfod-" VERSION ".so" with DEBUGINFOD_SONAME in dlopen call. + Do not fall back to dlopen of "libdebuginfod.so". + 2020-12-01 Timm Bäder * link_map.c (dwfl_link_map_report): Removed consider_phdr function diff --git a/libdwfl/debuginfod-client.c b/libdwfl/debuginfod-client.c index ee604ad9a..99b66b6ee 100644 --- a/libdwfl/debuginfod-client.c +++ b/libdwfl/debuginfod-client.c @@ -101,10 +101,7 @@ __libdwfl_debuginfod_end (debuginfod_client *c) void __attribute__ ((constructor)) __libdwfl_debuginfod_init (void) { - void *debuginfod_so = dlopen("libdebuginfod-" VERSION ".so", RTLD_LAZY); - - if (debuginfod_so == NULL) - debuginfod_so = dlopen("libdebuginfod.so", RTLD_LAZY); + void *debuginfod_so = dlopen(DEBUGINFOD_SONAME, RTLD_LAZY); if (debuginfod_so != NULL) {