From nobody Wed Nov 02 15:37:56 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N2WHS6kkwz4gC8V; Wed, 2 Nov 2022 15:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N2WHS6779z3bXh; Wed, 2 Nov 2022 15:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667403476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dS8qn3lVrU/84VYzDP6DJ9ffd2I66Ri+7/Q/x95UGII=; b=FRvPf11D20izO4KZrrGfV032PfnJ8O/2cc7DDC01l1S1jYqSMr54r++3YvQy0OLLywmHCO C+SpYBQBPVKWW7x2aK07jFaiIwVNt2EbA1978PuRwp3BSOIcOZFJieBqEVgg63hzuzfmpc WgYQOouX7H1fbz3ogEFtWiRjzT17vTM/hH3wlUrfdODnZRHYKnmxBFK1LJ7kCspW9b/XjS JXX1MmBZ5lLtIOS93tZZ/zD2XW6+zGnaMzfKvYLTfPAd/dIHR7OL0yDxa+srgU+tE3HFb9 jPw4XeyH/++qx9QPlQfPB1cDh5zhJ7foxkU9qegbCVY8JJ+QiUyJDFrPlVJnZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N2WHS58Xgz127h; Wed, 2 Nov 2022 15:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A2FbuQm037306; Wed, 2 Nov 2022 15:37:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A2FbukO037305; Wed, 2 Nov 2022 15:37:56 GMT (envelope-from git) Date: Wed, 2 Nov 2022 15:37:56 GMT Message-Id: <202211021537.2A2FbukO037305@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 35548e48a41e - main - linux64: improve linux_support.s make rules List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35548e48a41e292f373ed5773d9fb802ec263c92 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667403476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dS8qn3lVrU/84VYzDP6DJ9ffd2I66Ri+7/Q/x95UGII=; b=SyZHxuKsy6nIdF/D6wkNfKRxTJlPPf5B1Ivbq8jfuLLzho+yLqadSv0vHXFaimq2EIyUon jAnYN7RD2YfBf9f86kKU0JxlEwBP9XL7Sd6M7W3PrVLd4xZXdpsjmIxTv5/KKIFqFFQL22 wq9Km51lLwxGRxVt1UdJ/7/AM7dSkg3m1oUlmPhD1TWLPX2SUbPbWhsaxnusbtTyMRicls /zNN1oiH3oRMDbcg+AQ9L19+bz0NFZ6MjNxq4fxcm/SW7ALr1A+832GXHofGANs0Zjy9QX 4ov+xYXfErg+usj3G8vn/u9FBqZsdCrTZb/hPU1Z7r1Y0O73H8KjJ4HrkxFuXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667403476; a=rsa-sha256; cv=none; b=PBy9Y8srZQqgNMetMjL03581KHuIqnbggjwTGMOEObCpSqAj9EOIf6V2HhcdKCFBJgSQY+ 9sLbddjWQEWvJR2KntCmdOMJDdkdPOhdRwqm26lPgzffzi0ZPBokHAgaHkFTFz/BNPeWOT Xvza7n6Ydx50MLdyAOcbTrJnop+RV7v5ojzgjj7RkXCXEe44p3HrtEvQVlRAIt07U1x7+V l6qPpMNx42pTco5lVOvfozohh1990JQ4+LfqQffL4id9usIqdVDrmXaoMvS5X00TuMn8QC y07HnzgwHSzZZMHYHYvLJUslcBPSGlTfA+Om4VgLOJGNIo2fcTGi18NAFYtAng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=35548e48a41e292f373ed5773d9fb802ec263c92 commit 35548e48a41e292f373ed5773d9fb802ec263c92 Author: Ed Maste AuthorDate: 2022-07-19 20:42:27 +0000 Commit: Ed Maste CommitDate: 2022-11-02 15:37:43 +0000 linux64: improve linux_support.s make rules Previously we relied on the .s.o rule in share/mk/bsd.suffixes.mk to tell make that linux_support.o is built from linux_support.s, even though we do not use the .s.o rule to assemble it. Reviewed by: sjg MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35864 --- sys/modules/linux/Makefile | 4 ++-- sys/modules/linux64/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index f761459d2bd9..ac5b30b19265 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -132,9 +132,9 @@ linux${SFX}_vdso.so: linux${SFX}_vdso.so.o ${STRIPBIN} -N _binary_linux${SFX}_vdso_so_o_size ${.TARGET} .if ${MACHINE_CPUARCH} == "amd64" -linux${SFX}_support.o: linux${SFX}_assym.h assym.inc +linux${SFX}_support.o: linux${SFX}_support.S linux${SFX}_assym.h assym.inc ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ - ${.IMPSRC} -o ${.TARGET} + ${.ALLSRC:M*.S:u} -o ${.TARGET} .endif linux${SFX}_genassym.o: offset.inc diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index f6f750e5216d..7d9929f7e14b 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -98,9 +98,9 @@ linux_vdso.so: linux_vdso.so.o linux_vdso.so.o ${.TARGET} ${STRIPBIN} -N _binary_linux_vdso_so_o_size ${.TARGET} -linux_support.o: assym.inc linux_assym.h +linux_support.o: linux_support.S assym.inc linux_assym.h ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ - ${.IMPSRC} -o ${.TARGET} + ${.ALLSRC:M*.S:u} -o ${.TARGET} linux_genassym.o: offset.inc ${CC} -c ${CFLAGS:N-flto:N-fno-common} -fcommon ${.IMPSRC}