From nobody Thu Oct 2 09:29:06 2025 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 4ccmhL4gK9z69Rn4; Thu, 02 Oct 2025 09:29:06 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ccmhL3wSQz3Rx6; Thu, 02 Oct 2025 09:29:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759397346; 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=c8F+LESusQyusPJz50xrOEQvrWtV8Jtav9cN1fzsLag=; b=c7Yj5mSZ8CSCce2PiPR8YFCQOjySwu+CxhHtgFck3xfG/xqGpOyUG5f2VFJSc3H5iDGg3A d8gOuAjU8b7PZNLI4m8EDkA+virg4C+JoD/EboYFVScQY/HOf6YlJVGWQYw/Yc2/NZZSc5 g2sXCm6xEhlbvPRH2AaKvPoGSphrIQG7AjaxV6/1JLyeAgCam4+xI9iYKiOFJBBMOMThnk 4UlDKVASm3SoF//XLncmerhnUwM0rwN2j+K82mb+axvjxQ76knhY4fPySbArySulF2xxMk tVi3XDfdpl7rL5VewHE4A53fc7+bBN2aEv/SaX1WxQuCRx3s7ljmdST70ih/VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759397346; 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=c8F+LESusQyusPJz50xrOEQvrWtV8Jtav9cN1fzsLag=; b=mrGjGcQIILov+6Wk6FtVYyoa5C8QnKmPGluXc3jnXw0jOw2rMvUWnT4lf/kba+TT5B7IB+ 7064hvTorvH3aXbSSRDGWo3innAyrDmiWxUgUPmllXDv71vP/VmCTqq2y2F50QCYZlJ1ZO INQKFWabvoCaKsYEPniuLHXoVpJThYVXEncZi07NVHe3PMgJts4ha1ZE+XvZ2oUDV1wA5k Gsa5xIPqAi/h9xzhav9s1qZN9sKiJFO1pQcjp/i+nz47vHxC8qDAgE74R6Wacay+Y1D4Vo DYPXgQZFAaAXp4WCxBQwnVQiMpFh18BrATUIpYCWEZphMoOGjmBzrCkvIlfxsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759397346; a=rsa-sha256; cv=none; b=DL7OBhQirSHbp+KVSeMMbz+1wzyzzhnAU/T5aoTdfWcYwLkKUwqpYUMiRM7+52ZubvvWLt q2QMfmMQXKqBED6egddV7ZjpyxutcK5LHoPjJ9LGoH/7RnFYCJ1owb3aZ1ii1UlvOm5GOe 9iRMhffUjUwshfET0SGC5r+OX5KCUMbYmSaZLyqKe8FyM+zG6KsG/poLUiLORWwU7RR1Uq pMMKpz5IoYKlamWWh0XOKi/BlgqB/Jsfi7LTZlb9oTHkmcbW8a2AZ7F69wKwddkAyjlZpl VUDIGOpCuZqyK9iLoTPuBx75SSBoJGO/DZS6FoUJWCIxxjJF94bG5jNOHMuzSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ccmhL3K6zz12Nq; Thu, 02 Oct 2025 09:29:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5929T6CG051117; Thu, 2 Oct 2025 09:29:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5929T6Dw051115; Thu, 2 Oct 2025 09:29:06 GMT (envelope-from git) Date: Thu, 2 Oct 2025 09:29:06 GMT Message-Id: <202510020929.5929T6Dw051115@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 90d2aedbb964 - main - bsd.cpu.mk: Fix whitespace appending to MACHINE_ABI 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90d2aedbb964bb39ecc23e736dc26ff45603562f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=90d2aedbb964bb39ecc23e736dc26ff45603562f commit 90d2aedbb964bb39ecc23e736dc26ff45603562f Author: Brooks Davis AuthorDate: 2025-10-02 09:23:38 +0000 Commit: Brooks Davis CommitDate: 2025-10-02 09:28:35 +0000 bsd.cpu.mk: Fix whitespace appending to MACHINE_ABI No functional change. Effort: CHERI upstreaming Reviewed by: imp Fixes: 426fc376afaf ("bsd.cpu.mk: Introduce MACHINE_ABI") Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D52833 --- share/mk/bsd.cpu.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 1225d690e908..d11b8994dcd7 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -396,19 +396,19 @@ MACHINE_ABI+= hard-float # (which uses arm64/arm). .if ${MACHINE_ARCH:M*64*} || \ (defined(BOOTSTRAPPING) && ${.MAKE.OS} == "Darwin" && ${MACHINE} == "arm64") -MACHINE_ABI+= long64 +MACHINE_ABI+= long64 .else -MACHINE_ABI+= long32 +MACHINE_ABI+= long32 .endif .if ${MACHINE_ABI:Mlong64} -MACHINE_ABI+= ptr64 +MACHINE_ABI+= ptr64 .else -MACHINE_ABI+= ptr32 +MACHINE_ABI+= ptr32 .endif .if ${MACHINE_ARCH} == "i386" -MACHINE_ABI+= time32 +MACHINE_ABI+= time32 .else -MACHINE_ABI+= time64 +MACHINE_ABI+= time64 .endif .if ${MACHINE_ARCH:Mpowerpc*} && !${MACHINE_ARCH:M*le} MACHINE_ABI+= big-endian