From patchwork Tue Mar 7 10:29:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Arsen_Arsenovi=C4=87?= X-Patchwork-Id: 66072 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 70C0C385AC29 for ; Tue, 7 Mar 2023 10:45:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 70C0C385AC29 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678185933; bh=T7TAq8J56J+unwoJTVIvugdEv9AbGr3NgFrz3UsOy5c=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=BTp/V12UvN7biIDgnfPaCDZF9BqwoGwPmJeobbMw+XZSgEav/OAOGMiF8B0ug6cZI fgI+29gbrqH3syFBR3eOwHyJtXFFRpoCHMgOrDVIAGKMO399IZlt5Muw35fOZEbVVn jIYqrqrfRjQMuwI8jdV10GxJnBkA7zjIiOqY7pEI= 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 AD6F03858D39 for ; Tue, 7 Mar 2023 10:45:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AD6F03858D39 To: libc-alpha@sourceware.org Cc: fweimer@redhat.com, arsen@gentoo.org, carlos@redhat.com, toolchain@gentoo.org Subject: [PATCH v3 1/2] elf,nptl: Add -z lazy to some more tests Date: Tue, 7 Mar 2023 11:29:34 +0100 Message-Id: <20230307102935.2882450-1-arsen@gentoo.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-9.5 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Arsen_Arsenovi=C4=87_via_Libc-alpha?= From: =?utf-8?q?Arsen_Arsenovi=C4=87?= Reply-To: =?utf-8?q?Arsen_Arsenovi=C4=87?= Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Some toolchains, such as that used on Gentoo Hardened, set -z now out of the box. This trips up a couple of tests. Signed-off-by: (to mark this as a contribution under DCO)? I had the --- Hi, This is re-roll of the following patch series: https://inbox.sourceware.org/libc-alpha/20230307003222.2810662-1-arsen@aarsen.me/ https://inbox.sourceware.org/libc-alpha/20230302112519.914641-1-arsen@gentoo.org/ Changes from v2: - Split off the +$(objpfx)resolvfail.out: $(objpfx)testobj1.so change into its own commit. Changes from v1: - Dropped -z norelro. This turned out to be unnecessary after Adhemervals removal of --with-default-link and linker script machinery: https://patchwork.sourceware.org/project/glibc/list/?series=17843 See: https://inbox.sourceware.org/libc-alpha/86fsakz5mr.fsf@gentoo.org for an explanation of what caused the need for norelro. That fix was misguided, due to a previous error on my part, too. I applied this patch on top of that patchset and it would appear to resolve all related failures. The above is not applied to Git yet, but should be before this patch is. elf/Makefile | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) elf/Makefile | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/elf/Makefile b/elf/Makefile index dcdfd0af87..b9c77604b5 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1176,6 +1176,11 @@ postclean-generated += $(objpfx)/dso-sort-tests-2.generated-makefile \ ifeq (yes,$(have-tunables)) $(eval $(call include_dsosort_tests,dso-sort-tests-1.def)) $(eval $(call include_dsosort_tests,dso-sort-tests-2.def)) + +# BZ15311 is intentionally underlinked. +LDFLAGS-tst-bz15311-b.so += -Wl,-z,lazy +LDFLAGS-tst-bz15311-c.so += -Wl,-z,lazy +LDFLAGS-tst-bz15311-d.so += -Wl,-z,lazy endif check-abi: $(objpfx)check-abi-ld.out \ @@ -1498,6 +1503,20 @@ LDFLAGS-tst-initorderb2.so = -Wl,--no-as-needed LDFLAGS-tst-tlsmod5.so = -nostdlib -Wl,--no-as-needed LDFLAGS-tst-tlsmod6.so = -nostdlib -Wl,--no-as-needed +# The following tests are underlinked, and rely on late loading. On toolchains +# that set -z now by default, this leads to failures to load or fix up the +# executables being tested. +LDFLAGS-circlemod2.so = -Wl,-z,lazy +LDFLAGS-tst-tls20mod-bad.so = -Wl,-z,lazy +LDFLAGS-reldep6mod1.so += -Wl,-z,lazy +LDFLAGS-constload2.so = -Wl,-z,lazy +LDFLAGS-constload3.so = -Wl,-z,lazy +LDFLAGS-dblloadmod3.so = -Wl,-z,lazy +LDFLAGS-ifuncmod6.so = -Wl,-z,lazy +LDFLAGS-ltglobmod2.so = -Wl,-z,lazy +LDFLAGS-testobj1.so = -Wl,-z,lazy +LDFLAGS-testobj6.so = -Wl,-z,lazy + testobj1.so-no-z-defs = yes testobj3.so-no-z-defs = yes testobj4.so-no-z-defs = yes From patchwork Tue Mar 7 10:29:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Arsen_Arsenovi=C4=87?= X-Patchwork-Id: 66073 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 D069F38515FF for ; Tue, 7 Mar 2023 10:45:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D069F38515FF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678185935; bh=BawDXfzJ0ixbVRpzN2kPflIJ3ESlqlWv7E00ZI4urcY=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=UL1Go6dvxKOxEPaJlXMSxDc1YsPFdS3mJHMKtnUxxxEwlwqGFExMow//hoJ4oteKQ Qdbx0dDHnw+ujXGsdIKEa63V8gczzA9LXYYMEa55j35PzwXQCbnWqe6KnzOlJB1umX m4xTXNVe07mhYQ8u0tQQoyKBF9NIa5fI6zEW2o9I= 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 E51C738582A3 for ; Tue, 7 Mar 2023 10:45:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E51C738582A3 To: libc-alpha@sourceware.org Cc: fweimer@redhat.com, arsen@gentoo.org, carlos@redhat.com, toolchain@gentoo.org Subject: [PATCH v3 2/2] elf: Add missing dependency between resolvfail and testobj1.so Date: Tue, 7 Mar 2023 11:29:35 +0100 Message-Id: <20230307102935.2882450-2-arsen@gentoo.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307102935.2882450-1-arsen@gentoo.org> References: <20230307102935.2882450-1-arsen@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-9.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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Arsen_Arsenovi=C4=87_via_Libc-alpha?= From: =?utf-8?q?Arsen_Arsenovi=C4=87?= Reply-To: =?utf-8?q?Arsen_Arsenovi=C4=87?= Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" It was possible to run this test individually and have it fail because it can't find testobj1.so. This patch adds that dependency, to prevent such issues. --- elf/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/elf/Makefile b/elf/Makefile index b9c77604b5..a32618a01f 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1615,6 +1615,7 @@ $(objpfx)multiload.out: $(objpfx)testobj1.so LDFLAGS-origtest = -rdynamic $(objpfx)origtest.out: $(objpfx)testobj1.so +$(objpfx)resolvfail.out: $(objpfx)testobj1.so ifeq ($(have-thread-library),yes) $(objpfx)resolvfail: $(shared-thread-library) endif