The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=90d2aedbb964bb39ecc23e736dc26ff45603562f
commit 90d2aedbb964bb39ecc23e736dc26ff45603562f Author: Brooks Davis <[email protected]> AuthorDate: 2025-10-02 09:23:38 +0000 Commit: Brooks Davis <[email protected]> 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
