From patchwork Sat Feb 8 16:09:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Andreas K. Huettel" X-Patchwork-Id: 106165 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3C8C3385840C for ; Sat, 8 Feb 2025 16:11:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3C8C3385840C X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 838853858D38 for ; Sat, 8 Feb 2025 16:10:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 838853858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 838853858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739031023; cv=none; b=XbgJXrC7WOXywaYQ7nG9/7w69xTv+wpMwAs5z4FQt2YbxVmis8B6H65zr75OUtrn7KxXjEmWAsfG/ohdmg6xNQCysMB6UKPtretnp73nZOQaRA1f3gfdPpuqp7O2PqnWoUtaTG8GpA5V5SzSD7+jalTkXqZl5XimsZ0gGYPTof0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739031023; c=relaxed/simple; bh=cCqKzEujmbuuozzTv5mgTPxHXdRg/lKso/wQ1KZGvAM=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=T9CWk44zb8rfu7BOxgiOuI7nMia19rmaLBNPyrK64KoGu4AmSzp/PYhthySqQdNL4MwZcnikGIbb9HV2cbZxNmtjtjWCEYjn/HyVxFn6sq6j6S6C2eGR0iIuf2D4XflMwynrnNVAhOqxtnwKclHcxENqNloz0CkHMbxtqzJsnbg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 838853858D38 Received: from noumea.fritz.box (p200300e5cf2b5600c5c897a38f8e068e.dip0.t-ipconnect.de [IPv6:2003:e5:cf2b:5600:c5c8:97a3:8f8e:68e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dilfridge@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 2AF32340C40; Sat, 08 Feb 2025 16:10:19 +0000 (UTC) From: =?utf-8?q?Andreas_K=2E_H=C3=BCttel?= To: libc-alpha@sourceware.org Cc: =?utf-8?q?Andreas_K=2E_H=C3=BCttel?= Subject: [PATCH v2 1/4] Makeconfig: Add libgcc directory to rtld-prefix search path Date: Sat, 8 Feb 2025 17:09:01 +0100 Message-ID: <20250208160937.3955501-1-dilfridge@gentoo.org> X-Mailer: git-send-email 2.45.3 MIME-Version: 1.0 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org * This needs to be done twice, for test runs with and without --enable-hardcoded-path-in-tests * Also, we need to query the used $(CC) for the library location. * The container tests run ldd and dump the list of needed libraries, then copy these into the container. * Without this patch, ldd may not find libgcc_s.so, resulting in"not found" output and no copying of the library. * With this patch, the library is picked up independent of its location (as long as the proper directory is provided) and copied into the testroot. * This does not mean yet that ld.so in the testroot actually finds it. Signed-off-by: Andreas K. Hüttel --- Makeconfig | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Makeconfig b/Makeconfig index d0108d2caa..0820f860b2 100644 --- a/Makeconfig +++ b/Makeconfig @@ -635,7 +635,7 @@ link-libc-printers-tests = $(link-libc-rpath) \ # This is how to find at build-time things that will be installed there. rpath-dirs = math elf dlfcn nss nis rt resolv mathvec support rpath-link = \ -$(common-objdir):$(subst $(empty) ,:,$(patsubst ../$(subdir),.,$(rpath-dirs:%=$(common-objpfx)%))) +$(common-objdir):$(subst $(empty) ,:,$(patsubst ../$(subdir),.,$(rpath-dirs:%=$(common-objpfx)%))):$(gnulib-extralibdir) else # build-static link-libc = $(common-objpfx)libc.a $(otherlibs) $(gnulib) $(common-objpfx)libc.a $(gnulib) link-libc-tests = $(common-objpfx)libc.a $(otherlibs) $(gnulib-tests) $(common-objpfx)libc.a $(gnulib-tests) @@ -692,6 +692,11 @@ link-libc-static-tests = -Wl,--start-group $(common-objpfx)libc.a $(static-gnuli # some cases and it is preferable to link with libgcc_eh or libgcc_s # so that the testing is as similar as possible to how programs will # be built with the installed glibc. +# This leads to moderate difficulties, also since distributions may +# install libgcc_s.so in directories only found via ld.so.conf, e.g. +# to be able to switch between gcc versions. We need to add the +# corresponding directory to the library search path to make sure +# our test programs can find it. # # Some architectures have architecture-specific systems for exception # handling that may involve undefined references to @@ -709,6 +714,7 @@ libgcc_eh := -Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed gnulib-arch = gnulib = -lgcc $(gnulib-arch) gnulib-tests := -lgcc $(libgcc_eh) +gnulib-extralibdir := $(shell dirname $$($(CC) -print-file-name=libgcc_s.so$(libgcc_s.so-version))) static-gnulib-arch = # By default, elf/static-stubs.o, instead of -lgcc_eh, is used to # statically link programs. When --disable-shared is used, we use @@ -781,10 +787,12 @@ endif # How to run a program we just linked with our library. # The program binary is assumed to be $(word 2,$^). +# We may require additional libraries from gcc (e.g. libgcc_s.so for exception +# handling), which unfortunately somewhat breaks the isolation. built-program-file = $(dir $(word 2,$^))$(notdir $(word 2,$^)) rtld-prefix = $(elf-objpfx)$(rtld-installed-name) \ --library-path \ - $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) + $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)):$(gnulib-extralibdir) ifeq (yes,$(build-shared)) comma = , sysdep-library-path = \ From patchwork Sat Feb 8 16:09:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Andreas K. Huettel" X-Patchwork-Id: 106164 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BD29B3857731 for ; Sat, 8 Feb 2025 16:11:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BD29B3857731 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id E2FE53858405 for ; Sat, 8 Feb 2025 16:10:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E2FE53858405 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E2FE53858405 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739031024; cv=none; b=C7BDrbKlI9Dr14RPWUyWcePjxgKqLPrB5ehGKQkoVh0PJUnyvGbdtKdji+vN66dEvGk2M4KcpcpmH+zXEsW65hLybSbuGBEM1MpRRzH2IzNLzeyRs5V5WvvJ1UcnXYwJRXUBTt0o3BIWLK3+FMM/Pf7nQesUFTw25+o8n9y+Als= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739031024; c=relaxed/simple; bh=g6WlEey/bF47SsLFPcUPg1N1knI7rchsknDZ1IeCArQ=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=kc8gy/itHrZScj7jUBvOwe572j6wqUklN78XXccgFq+4aT9ckGgEDGTjy1TEhNE5HBKpouy9ETCPIcBfZLhF3lgQ+40WuobkvseZ220FpmJOiFJm3yroyG0aXRe10WbQKovozXbOhZ/m4T3FMvgmQI2MguOfN1toaqsTaI1AHOw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E2FE53858405 Received: from noumea.fritz.box (p200300e5cf2b5600c5c897a38f8e068e.dip0.t-ipconnect.de [IPv6:2003:e5:cf2b:5600:c5c8:97a3:8f8e:68e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dilfridge@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 6602C340C57; Sat, 08 Feb 2025 16:10:22 +0000 (UTC) From: =?utf-8?q?Andreas_K=2E_H=C3=BCttel?= To: libc-alpha@sourceware.org Cc: =?utf-8?q?Andreas_K=2E_H=C3=BCttel?= Subject: [PATCH v2 2/4] Makefile: Add ld.so.conf with libgcc dir to testroot.pristine Date: Sat, 8 Feb 2025 17:09:02 +0100 Message-ID: <20250208160937.3955501-2-dilfridge@gentoo.org> X-Mailer: git-send-email 2.45.3 In-Reply-To: <20250208160937.3955501-1-dilfridge@gentoo.org> References: <20250208160937.3955501-1-dilfridge@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org This way, a nonstandard directory within the testroot containing libgcc_s.so can actually be picked up and used during the test runs. Also provide a subdirectory ld.so.conf.d for drop-in configuration Signed-off-by: Andreas K. Hüttel Reviewed-by: Adhemerval Zanella --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 97b4328af8..cb927fb9f9 100644 --- a/Makefile +++ b/Makefile @@ -634,6 +634,11 @@ $(objpfx)testroot.pristine/install.stamp : cp $(objpfx)support/shell-container $(objpfx)testroot.pristine/bin/sh cp $(objpfx)support/echo-container $(objpfx)testroot.pristine/bin/echo cp $(objpfx)support/true-container $(objpfx)testroot.pristine/bin/true + # We need to be able to load extra language libraries. + mkdir -p $(objpfx)testroot.pristine/etc/ld.so.conf.d + echo 'include ld.so.conf.d/*.conf' > $(objpfx)testroot.pristine/etc/ld.so.conf + echo $(gnulib-extralibdir) >> $(objpfx)testroot.pristine/etc/ld.so.conf + echo '# file without content' > $(objpfx)testroot.pristine/etc/ld.so.conf.d/999-empty.conf ifeq ($(run-built-tests),yes) # Copy these DSOs first so we can overwrite them with our own. for dso in `$(test-wrapper-env) LD_TRACE_LOADED_OBJECTS=1 \ From patchwork Sat Feb 8 16:09:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Andreas K. Huettel" X-Patchwork-Id: 106167 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 966F33857731 for ; Sat, 8 Feb 2025 16:12:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 966F33857731 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id B78F5385840C for ; Sat, 8 Feb 2025 16:10:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B78F5385840C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B78F5385840C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739031025; cv=none; b=uqE7I2nkNnDjm+RDmMEC/w5AQ3qbxqa+P58qjVMR7GHSethtmH2DoinZQJw/tMMA2sXewtGx5E5ZtbBq04rnDeQ6lGNJgdGLdzY4Szk9Lo+heAvtySqtF4W0mXNxn7s8kXhdNS8Dga1fppHiUFTuLVClgsO4jHidvIX4kob/jMs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739031025; c=relaxed/simple; bh=RhQS3dHmVs7Jv2UcRFcJEy+BWp21i9yZ8x4hxHZBJdE=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=OIFcaLDN2U74iUSkWJmS+kjvoIxRFd6LGhUd2YgXGHOzdhxcuLRF7CCva+ocJ0iLEeN/r6jZKAtOCOcE+yRIQecrR7Bp/civWAAMTEDS6rI17SS+OWOe1Vlt+8ljkg+x/GWi5ChQu62XWcTBiXwuIx7Vs192baZ7mXOKjJp4Taw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B78F5385840C Received: from noumea.fritz.box (p200300e5cf2b5600c5c897a38f8e068e.dip0.t-ipconnect.de [IPv6:2003:e5:cf2b:5600:c5c8:97a3:8f8e:68e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dilfridge@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id B7427343019; Sat, 08 Feb 2025 16:10:23 +0000 (UTC) From: =?utf-8?q?Andreas_K=2E_H=C3=BCttel?= To: libc-alpha@sourceware.org Cc: =?utf-8?q?Andreas_K=2E_H=C3=BCttel?= Subject: [PATCH v2 3/4] support: Always run ldconfig in containered tests Date: Sat, 8 Feb 2025 17:09:03 +0100 Message-ID: <20250208160937.3955501-3-dilfridge@gentoo.org> X-Mailer: git-send-email 2.45.3 In-Reply-To: <20250208160937.3955501-1-dilfridge@gentoo.org> References: <20250208160937.3955501-1-dilfridge@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org This is required so the generated ld.so.conf files take effect. Signed-off-by: Andreas K. Hüttel Reviewed-by: Adhemerval Zanella --- support/test-container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/test-container.c b/support/test-container.c index 79d3189e2f..10ff6a601b 100644 --- a/support/test-container.c +++ b/support/test-container.c @@ -740,7 +740,7 @@ main (int argc, char **argv) char *command_basename; char *so_base; int do_postclean = 0; - bool do_ldconfig = false; + bool do_ldconfig = true; char *change_cwd = NULL; int pipes[2]; From patchwork Sat Feb 8 16:09:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Andreas K. Huettel" X-Patchwork-Id: 106166 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2402D3857738 for ; Sat, 8 Feb 2025 16:12:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2402D3857738 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 159AB385841E for ; Sat, 8 Feb 2025 16:10:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 159AB385841E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 159AB385841E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739031026; cv=none; b=DWlTW6Vxpp6fetDdZg8aFbT7FuzjbsvEty3pCQwMXYnjgh+eBEdzY+xwpBVvHRbAw/6CccGsi+J+Me7h7djE6zX4Epj8eD92C1ZajDZQphCF7pgOUeR9H66go3iNnJw9/wJHDzBUe2oOxqmBrGKJ2lyEGLHn3uk0I0l31CPyKu8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739031026; c=relaxed/simple; bh=ePKY7z29uIvoPkTM0tXEIiJ8DOQi4hjLbFX4bnOvUBU=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=tNFtO/M1ugdz5z3/LZwCSsuBczKTnSTurXrnYHNMSH1el6WRrC9R4p+BvqpdD2+9w7yQOadHougO8IxU6u30e+ME4x58yKEq3/x1vqkS0YTB3zEq2XSns387e/VDGF9IoIQNCgrNGumgfc0JDYNdA5RkyeI3cel8aU93zXZl5Jg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 159AB385841E Received: from noumea.fritz.box (p200300e5cf2b5600c5c897a38f8e068e.dip0.t-ipconnect.de [IPv6:2003:e5:cf2b:5600:c5c8:97a3:8f8e:68e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dilfridge@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D621834301F; Sat, 08 Feb 2025 16:10:24 +0000 (UTC) From: =?utf-8?q?Andreas_K=2E_H=C3=BCttel?= To: libc-alpha@sourceware.org Cc: =?utf-8?q?Andreas_K=2E_H=C3=BCttel?= Subject: [PATCH v2 4/4] elf: Remove now pointless empty ld.so.conf files in single tests Date: Sat, 8 Feb 2025 17:09:04 +0100 Message-ID: <20250208160937.3955501-4-dilfridge@gentoo.org> X-Mailer: git-send-email 2.45.3 In-Reply-To: <20250208160937.3955501-1-dilfridge@gentoo.org> References: <20250208160937.3955501-1-dilfridge@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Signed-off-by: Andreas K. Hüttel Reviewed-by: Adhemerval Zanella --- elf/tst-glibc-hwcaps-2-cache.root/etc/ld.so.conf | 2 -- elf/tst-glibc-hwcaps-cache.root/etc/ld.so.conf | 2 -- elf/tst-ldconfig-bad-aux-cache.root/etc/ld.so.conf | 2 -- 3 files changed, 6 deletions(-) delete mode 100644 elf/tst-glibc-hwcaps-2-cache.root/etc/ld.so.conf delete mode 100644 elf/tst-glibc-hwcaps-cache.root/etc/ld.so.conf delete mode 100644 elf/tst-ldconfig-bad-aux-cache.root/etc/ld.so.conf diff --git a/elf/tst-glibc-hwcaps-2-cache.root/etc/ld.so.conf b/elf/tst-glibc-hwcaps-2-cache.root/etc/ld.so.conf deleted file mode 100644 index e1e74dbda2..0000000000 --- a/elf/tst-glibc-hwcaps-2-cache.root/etc/ld.so.conf +++ /dev/null @@ -1,2 +0,0 @@ -# This file was created to suppress a warning from ldconfig: -# /sbin/ldconfig: Warning: ignoring configuration file that cannot be opened: /etc/ld.so.conf: No such file or directory diff --git a/elf/tst-glibc-hwcaps-cache.root/etc/ld.so.conf b/elf/tst-glibc-hwcaps-cache.root/etc/ld.so.conf deleted file mode 100644 index e1e74dbda2..0000000000 --- a/elf/tst-glibc-hwcaps-cache.root/etc/ld.so.conf +++ /dev/null @@ -1,2 +0,0 @@ -# This file was created to suppress a warning from ldconfig: -# /sbin/ldconfig: Warning: ignoring configuration file that cannot be opened: /etc/ld.so.conf: No such file or directory diff --git a/elf/tst-ldconfig-bad-aux-cache.root/etc/ld.so.conf b/elf/tst-ldconfig-bad-aux-cache.root/etc/ld.so.conf deleted file mode 100644 index e1e74dbda2..0000000000 --- a/elf/tst-ldconfig-bad-aux-cache.root/etc/ld.so.conf +++ /dev/null @@ -1,2 +0,0 @@ -# This file was created to suppress a warning from ldconfig: -# /sbin/ldconfig: Warning: ignoring configuration file that cannot be opened: /etc/ld.so.conf: No such file or directory