From nobody Mon Jun 26 02:04:49 2023 X-Original-To: dev-commits-src-main@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 4QqB4K6qZ3z4hpwp; Mon, 26 Jun 2023 02:04:49 +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 4QqB4K6KBlz3Qtr; Mon, 26 Jun 2023 02:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687745089; 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=tRcFXRmMvNUy6z7Y2VOQLvi2EDhv1h5Fr0BR7oRZOt8=; b=NP5DAbE/QxAh505rszuPlllAV+ryI+dLuLrBi8yrbSl20/uIO/CHOg1J6DXapY0q7uwKJw YtiRieHRX84R98rxLOMhqry0RafPfiF3n3pB1dbFDN4MVLKVfrrE7CAwBP0Q5Dc6M/rtp9 6fvl+RryEr0CzZUahQNJvCHytRPiWGuIJXGjYS2MuHnhLadiJDUqF62vdXXQ0Q/rWYFk3V 03AKxzZuFfVQjT905fjUaO/0+P7gcxE2luoczgxrxxW05TRjiNcWf1+6VRIG6ZstbwwMdu sByNDQcR5Sz5HM5LPgTwO8vWJ42LyAXThzCDCw1vc8Q1rJ0iXkj4Vb6SMhQ1MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687745089; 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=tRcFXRmMvNUy6z7Y2VOQLvi2EDhv1h5Fr0BR7oRZOt8=; b=bnB0FLRzgmsm08XPjxrSHMifOJkPd6upkVgmCyGY1WU2UZIeVV741AxRFxdsd2/ko28Kgb wkpI0BTJ8qsu3vb/rrXBnsZBvbeP51gOro+/e34WarFfoPSTCmNpOOadzIMzml8fxrrH6y JGNr3FmLeVTVrKbY7FpeX++IdSM05XEmT95Rfuw1EfHenOKF681CD3+STVZ6RKRJcY+pEU jI4ONW7badH0K0urT0BlSxqCsAUAq8CbPCwTUZO6+O50kPimJPQYXpSrVb3HXoi+P+Ixx9 IGNxgUJgzo1k6Q9e1dp3O7WO3g5pdGfVnzTEhCu93uuPTzWkEgDM12JVhMxuTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687745089; a=rsa-sha256; cv=none; b=QfI2oLmSugbZHjwte3/41igPDoWkJYgsGPxQMxuYnc63OtQWDtdO4CkShb4XSoNA3RjehT TQ6vcTNhdku+nz5jKCG9DmlqxtYER3qt3OaUr4NSwyBsk+xDSsC4UPD/IXWC8rJWRXhqrj DiyOhNcGlaB2NfVg95LgbfnTKeqARvcNe/Xq1lmobUcOCH6gaieO/Ljy8jjn1BkXKawHpx 4GtycDM0uHuI3HHZdNsNWNqPUTK/0vJNKmwwQhubZOVahe+OHWNzJm1NBf3WNtcukefKq7 p3cbWzcidIb0DnsIvKMG+0pY9K63H2Wj14BFc20EhjfY0Idl1E+MTpUnm1YM6Q== 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 4QqB4K5HvbzrV4; Mon, 26 Jun 2023 02:04:49 +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 35Q24nNP088360; Mon, 26 Jun 2023 02:04:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35Q24nu9088359; Mon, 26 Jun 2023 02:04:49 GMT (envelope-from git) Date: Mon, 26 Jun 2023 02:04:49 GMT Message-Id: <202306260204.35Q24nu9088359@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: b2dcde7e9e75 - main - Assemble .s to .o using cc, not as List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: b2dcde7e9e75dd35124d12e68036e56ee650d568 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b2dcde7e9e75dd35124d12e68036e56ee650d568 commit b2dcde7e9e75dd35124d12e68036e56ee650d568 Author: Ed Maste AuthorDate: 2022-07-19 19:36:09 +0000 Commit: Ed Maste CommitDate: 2023-06-26 02:03:19 +0000 Assemble .s to .o using cc, not as As of commit fd71da37d478 we no longer have an `as` in the default toolchain. Although we do not make use of this rule in the base system some ports or downstream projects might. Use `cc -x assembler` instead of as. Reviewed by: arichardson Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35859 --- share/mk/bsd.compat.mk | 1 - share/mk/bsd.lib.mk | 2 +- share/mk/bsd.suffixes.mk | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 9a59020b4df2..aabfd6a06192 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -37,7 +37,6 @@ LIB32_MACHINE= i386 LIB32_MACHINE_ARCH= i386 LIB32WMAKEENV= MACHINE_CPU="i686 mmx sse sse2" LIB32WMAKEFLAGS= \ - AS="${XAS} --32" \ LD="${XLD} -m elf_i386_fbsd" .elif ${COMPAT_ARCH} == "powerpc64" diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 9a947b85bfe2..dfaf554a3619 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -192,7 +192,7 @@ PO_FLAG=-pg ${CTFCONVERT_CMD} .s.po .s.pico .s.nossppico .s.pieo: - ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} + ${CC:N${CCACHE_BIN}} -x assembler ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .asm.po: diff --git a/share/mk/bsd.suffixes.mk b/share/mk/bsd.suffixes.mk index 5396bae05087..8337b9c94102 100644 --- a/share/mk/bsd.suffixes.mk +++ b/share/mk/bsd.suffixes.mk @@ -55,7 +55,7 @@ ${CTFCONVERT_CMD} .s.o: - ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} + ${CC:N${CCACHE_BIN}} -x assembler ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} # XXX not -j safe