From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from vmicros1.altlinux.org (vmicros1.altlinux.org [194.107.17.57]) by sourceware.org (Postfix) with ESMTP id EBF1E3857003 for ; Wed, 9 Dec 2020 00:13:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org EBF1E3857003 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=ldv@altlinux.org Received: from mua.local.altlinux.org (mua.local.altlinux.org [192.168.1.14]) by vmicros1.altlinux.org (Postfix) with ESMTP id 6B44972C8B5; Wed, 9 Dec 2020 03:13:27 +0300 (MSK) Received: by mua.local.altlinux.org (Postfix, from userid 508) id 565987CC8A3; Wed, 9 Dec 2020 03:13:27 +0300 (MSK) Date: Wed, 9 Dec 2020 03:13:27 +0300 From: "Dmitry V. Levin" To: Mark Wielaard Cc: elfutils-devel@sourceware.org Subject: [PATCH v3 3/3] libdwfl: switch to DEBUGINFOD_SONAME, remove libdebuginfod.so fallback Message-ID: <20201209001327.GC3294@altlinux.org> References: <20201130090000.GA30063@altlinux.org> <20201206122813.GA27041@altlinux.org> <70c7aa3cc1fdda6b6c886d714178654dfd0757d0.camel@klomp.org> <20201208151540.GD28403@altlinux.org> <20201208230704.GD3189@wildebeest.org> <20201208232030.GA3078@altlinux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201208232030.GA3078@altlinux.org> X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Dec 2020 00:13:29 -0000 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 --- libdwfl/ChangeLog | 6 ++++++ libdwfl/debuginfod-client.c | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index 344db7c1..d0edc1a1 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-09-18 Mark Wielaard * zstd.c: New file. diff --git a/libdwfl/debuginfod-client.c b/libdwfl/debuginfod-client.c index 6fd83900..61d52db2 100644 --- a/libdwfl/debuginfod-client.c +++ b/libdwfl/debuginfod-client.c @@ -109,10 +109,7 @@ __libdwfl_debuginfod_init (void) if (urls_envvar == NULL || urls_envvar[0] == '\0') return; - 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) { -- ldv