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 64D47386F022 for ; Sun, 6 Dec 2020 13:54:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 64D47386F022 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 D6E9D72C8B5; Sun, 6 Dec 2020 16:54:21 +0300 (MSK) Received: by mua.local.altlinux.org (Postfix, from userid 508) id CBAF17CC8A1; Sun, 6 Dec 2020 16:54:21 +0300 (MSK) Date: Sun, 6 Dec 2020 16:54:21 +0300 From: "Dmitry V. Levin" To: elfutils-devel@sourceware.org Cc: Mark Wielaard , "Frank Ch. Eigler" Subject: [PATCH v2 3/3] libdwfl: do not fall back to dlopen of libdebuginfod.so Message-ID: <20201206135421.GC27807@altlinux.org> References: <20201130090000.GA30063@altlinux.org> <20201206122813.GA27041@altlinux.org> <20201206133243.GA30511@redhat.com> <20201206133423.GE27041@altlinux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201206133423.GE27041@altlinux.org> X-Spam-Status: No, score=-12.5 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: Sun, 06 Dec 2020 13:54:23 -0000 The fully versioned libdebuginfod file name should always be available. Signed-off-by: Dmitry V. Levin --- libdwfl/ChangeLog | 5 +++++ libdwfl/debuginfod-client.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index 67a4d743..2f815b54 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,8 @@ +2020-12-06 Dmitry V. Levin + + * debuginfod-client.c (__libdwfl_debuginfod_init): Do not fall back + to dlopen of "libdebuginfod.so". + 2020-11-28 Mark Wielaard * dwfl_segment_report_module.c (dwfl_segment_report_module): diff --git a/libdwfl/debuginfod-client.c b/libdwfl/debuginfod-client.c index ee604ad9..2c4e1a16 100644 --- a/libdwfl/debuginfod-client.c +++ b/libdwfl/debuginfod-client.c @@ -103,9 +103,6 @@ __libdwfl_debuginfod_init (void) { void *debuginfod_so = dlopen("libdebuginfod-" VERSION ".so", RTLD_LAZY); - if (debuginfod_so == NULL) - debuginfod_so = dlopen("libdebuginfod.so", RTLD_LAZY); - if (debuginfod_so != NULL) { fp_debuginfod_begin = dlsym (debuginfod_so, "debuginfod_begin"); -- ldv