From patchwork Fri Mar 21 18:42:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 108887 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 C80AD3858D37 for ; Fri, 21 Mar 2025 18:43:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C80AD3858D37 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=bq4sQaJo X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id 7792E3858D20 for ; Fri, 21 Mar 2025 18:42:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7792E3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7792E3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742582541; cv=none; b=SonzYEiXFUjyslkM4zvyoThRAJv7OKnrRQNxzvkn6CHKQ9mdpxfJqjDwzTGSEUoVyIMehJkmhfct07KrWdAhVKsmIrlb/TCPnA2RCqdPwgy8B4f8oDzBENP/o6A6Ij0gQ6UL1j8kkiWKD6+e3KjSOVVnx1bJdn/2VcqOfjHoFKk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742582541; c=relaxed/simple; bh=GqFbnvAE6AZtKnkdw07AY2IexAimrm42FHFexfSsHmw=; h=DKIM-Signature:From:To:Subject:Message-ID:Date:MIME-Version; b=uEvGIUxS1njhx2wXZmapNKNisFTROnMjwBeyzwMbxMOF3LjqMuIwFG9xVN7NxO5Bz8BCcSQDeI/PLgCwJYYIsqDrByV8j0qRMGQdi40RQtM8oaCTGW+rExm0z/34SlEg/NpY2v1lRDrUX6iGDKAfZko6PtqV94N8nErx/BEUUkI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7792E3858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742582537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=LBcEFyHJyUjj+qvrpYrfK+gJkyqqgo9ej/XjQJ2BKVM=; b=bq4sQaJoa/ductA4+Qv5zmiQ5mWtOSMXnqAIlpyFVt0yToUvXHajhxNMaJHsSgwRiJSvAO n6bYDEcsnKNa+QlSE+/pZSrUz6wEzrZY8QnUh3585HF6C6Z8t7g+n9vqw52f1f+DxKNqkJ rhp5Z60Zf7zSX1tDfSXxfV6whmmARWE= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-235-QJ2T-sizPI-F9ZRTXfhazw-1; Fri, 21 Mar 2025 14:42:15 -0400 X-MC-Unique: QJ2T-sizPI-F9ZRTXfhazw-1 X-Mimecast-MFC-AGG-ID: QJ2T-sizPI-F9ZRTXfhazw_1742582535 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 074081933B40 for ; Fri, 21 Mar 2025 18:42:15 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.28]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 40FC3180174E for ; Fri, 21 Mar 2025 18:42:13 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 1/2] Makeconfig: Support $(+nolink-deps) in link flags Message-ID: X-From-Line: bf5b13398cff74a13f141e88a6ca188d07a4ea8e Mon Sep 17 00:00:00 2001 Date: Fri, 21 Mar 2025 19:42:10 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: iBGQvlap4qav3WktgnocmMHs-MNLuzqBFmdEJ0DOUT8_1742582535 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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 allows adding dependencies to rules, but not linking against them. This is more or less a reimplementation of .EXTRA_PREREQS feature from GNU make 4.3. Reviewed-by: Adhemerval Zanella --- Makeconfig | 12 ++++++++---- Makerules | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) base-commit: 3e2be87832781a29ed67f38f87c1ce3dd4c1b866 diff --git a/Makeconfig b/Makeconfig index aa547a443f..3628db6eba 100644 --- a/Makeconfig +++ b/Makeconfig @@ -442,7 +442,8 @@ ifndef +link-pie $(filter-out $(addprefix $(csu-objpfx),start.o \ S$(start-installed-name))\ $(+preinit) $(link-extra-libs) \ - $(common-objpfx)libc% $(+postinit),$^) \ + $(common-objpfx)libc% $(+postinit) \ + $(+nolink-deps),$^) \ $(link-extra-libs) +link-pie-after-libc = $(+postctorS) $(+postinit) define +link-pie @@ -473,7 +474,8 @@ ifndef +link-static $(filter-out $(addprefix $(csu-objpfx),start.o \ $(start-installed-name))\ $(+preinit) $(link-extra-libs-static) \ - $(common-objpfx)libc% $(+postinit),$^) \ + $(common-objpfx)libc% $(+postinit) \ + $(+nolink-deps), $^) \ $(link-extra-libs-static) +link-static-after-libc = $(+postctorT) $(+postinit) define +link-static @@ -509,7 +511,8 @@ else # not build-pie-default $(filter-out $(addprefix $(csu-objpfx),start.o \ $(start-installed-name))\ $(+preinit) $(link-extra-libs) \ - $(common-objpfx)libc% $(+postinit),$^) \ + $(common-objpfx)libc% $(+postinit) \ + $(+nolink-deps),$^) \ $(link-extra-libs) +link-after-libc = $(+postctor) $(+postinit) define +link @@ -549,7 +552,8 @@ endif # +link $(filter-out $(addprefix $(csu-objpfx),start.o \ $(start-name-2.0))\ $(+preinit) $(link-extra-libs) \ - $(common-objpfx)libc% $(+postinit),$^) \ + $(common-objpfx)libc% $(+postinit) \ + $(+nolink-deps),$^) \ $(link-extra-libs) +link-after-libc = $(+postctor) $(+postinit) define +link-2.0-tests diff --git a/Makerules b/Makerules index ada616891e..9dc60cc3ce 100644 --- a/Makerules +++ b/Makerules @@ -587,7 +587,7 @@ endef build-module-helper-objlist = \ $(patsubst %_pic.a,$(whole-archive) %_pic.a $(no-whole-archive),\ $(filter-out %.lds $(map-file) $(+preinit) $(+postinit) \ - $(elf-objpfx)sofini.os \ + $(elf-objpfx)sofini.os $(+nolink-deps) \ $(link-libc-deps),$^)) build-module-objlist = $(build-module-helper-objlist) $(LDLIBS-$(@F:%.so=%).so) From patchwork Fri Mar 21 18:42:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 108888 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 9F9EC3857C78 for ; Fri, 21 Mar 2025 18:44:05 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id 3EF343858D35 for ; Fri, 21 Mar 2025 18:43:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3EF343858D35 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3EF343858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742582600; cv=none; b=XfA0KoPsinx6ngjPGtro/mklwB8btX2nUtyAUmLPV8Si+TNGmfOsMwYgBu3PSoBdRvTmcfoSGBLjf3cVE/Vep+uM3ipTidbbK9KZUB5T/StQXqgKdk+v/1CUhYTtSf9oquJ9BnmKzbpA8n/oaRqXRDG0DodogAlpi8k4ueg2BXs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742582600; c=relaxed/simple; bh=6P63xvz4nvZUZ9faljp9tcDL8YVe0TFZTnYQPHv69uk=; h=DKIM-Signature:From:To:Subject:Message-ID:Date:MIME-Version; b=dwIFjQCwFPp/KR2T6qSc6xtVAxQXQnu72zoO+Srd/B34hKV/SrvIK/9hTH7rM7QElLaO6djhHDkS1ByjzaLpwKRu8vCbyS7+dgtAeAt4rNKV7JnMJ4oAYo+/ruQHdUjFoLwFnfHHuk0CdUeuNpcM4IXcogKI/2rvSwn1GApeigs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742582557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=F1RAA/MaLHXjJb9CplEH0MVxgghFUruXJxa6qXn1jd0=; b=X2u84QljNKgxT7DGhwZsX/E0YQwyxmdwtJLuy7bUd/b3iLZvh3jGYZvmueZFWqkSi0RiVq clBHVvb3buONHmvf2wMRJ2A6+ViSLXn/aY/r0lA/G8XaGiERVugii6m7CT79kbzBZylEyS qgl6cYlNa9dken9EMipKNuHMoINQcgA= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-395-kK955oR2NnKsQE4D2-HYjQ-1; Fri, 21 Mar 2025 14:42:30 -0400 X-MC-Unique: kK955oR2NnKsQE4D2-HYjQ-1 X-Mimecast-MFC-AGG-ID: kK955oR2NnKsQE4D2-HYjQ_1742582549 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 737C91801A00 for ; Fri, 21 Mar 2025 18:42:29 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.28]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B1271195609D for ; Fri, 21 Mar 2025 18:42:28 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 2/2] elf: Use +nolink-deps to add make-only dependency for tst-origin In-Reply-To: Message-ID: <7c0171d88e47c4b5940c7f9b0a8a51d4384e2ed9.1742582497.git.fweimer@redhat.com> References: X-From-Line: 7c0171d88e47c4b5940c7f9b0a8a51d4384e2ed9 Mon Sep 17 00:00:00 2001 Date: Fri, 21 Mar 2025 19:42:25 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: XM5nF8PA3-x2C0XQeAUtze0LSAvcHU3plsr5knimFF0_1742582549 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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 The tst-origin test must link against liborigin-mod.so. Correct build order depends on a makefile rule dependency on $(objpfx)liborigin-mod.so. Use +nolink-deps to remvoe this dependency from the linker command line. Reviewed-by: Adhemerval Zanella --- elf/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/elf/Makefile b/elf/Makefile index 3d60000ec9..d13a46a92b 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -3451,8 +3451,11 @@ $(objpfx)tst-dlopen-constructor-null-mod2.so: \ CFLAGS-tst-origin.c += $(no-stack-protector) CFLAGS-liborigin-mod.c += $(no-stack-protector) +# Link tst-origin with liborigin-mod.so, but without a full path. LDFLAGS-tst-origin += -Wl,-rpath,\$$ORIGIN -L$(subst :, -L,$(rpath-link)) -lorigin-mod -$(objpfx)tst-origin.out: tst-origin.sh $(objpfx)liborigin-mod.so $(objpfx)tst-origin +$(objpfx)tst-origin: +nolink-deps += $(objpfx)liborigin-mod.so +$(objpfx)tst-origin: $(objpfx)liborigin-mod.so +$(objpfx)tst-origin.out: tst-origin.sh $(objpfx)tst-origin $(SHELL) \ $< \ '$(common-objpfx)' \