From nobody Fri May 27 17:53:27 2022 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 A731D1B3A9D4; Fri, 27 May 2022 18:01:15 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from fry.fubar.geek.nz (fry.fubar.geek.nz [139.59.165.16]) by mx1.freebsd.org (Postfix) with ESMTP id 4L8t0B6cQlz4c7G; Fri, 27 May 2022 18:01:14 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from smtpclient.apple (cpc91232-cmbg18-2-0-cust554.5-4.cable.virginm.net [82.2.126.43]) by fry.fubar.geek.nz (Postfix) with ESMTPSA id 81DD04E63E; Fri, 27 May 2022 17:53:28 +0000 (UTC) From: Andrew Turner Message-Id: <9F9F0889-EDE0-4D21-9372-4944DBEF630F@FreeBSD.org> Content-Type: multipart/alternative; boundary="Apple-Mail=_5ECC9676-93F8-470C-858D-DFE7161EF7BB" 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 (Mac OS X Mail 16.0 \(3696.80.82.1.1\)) Subject: Re: git: 190abf86bb45 - main - Fix the name of Makefile.aarch64 Date: Fri, 27 May 2022 18:53:27 +0100 In-Reply-To: <80EAD5AD-BD7E-4B67-B2ED-49FF228982E0@freebsd.org> Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" To: Jessica Clarke References: <202205191031.24JAVO2A038485@gitrepo.freebsd.org> <5F6BE164-2127-4DDC-94BE-2E0044BD93B7@freebsd.org> <80EAD5AD-BD7E-4B67-B2ED-49FF228982E0@freebsd.org> X-Mailer: Apple Mail (2.3696.80.82.1.1) X-Rspamd-Queue-Id: 4L8t0B6cQlz4c7G X-Spamd-Bar: ++ Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=softfail (mx1.freebsd.org: 139.59.165.16 is neither permitted nor denied by domain of andrew@FreeBSD.org) smtp.mailfrom=andrew@FreeBSD.org X-Spamd-Result: default: False [2.83 / 15.00]; ARC_NA(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; FREEFALL_USER(0.00)[andrew]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; GREYLIST(0.00)[pass,body]; TO_DN_SOME(0.00)[]; VIOLATED_DIRECT_SPF(3.50)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_SPAM_LONG(0.83)[0.828]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; MLMMJ_DEST(0.00)[dev-commits-src-all,dev-commits-src-main]; RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:14061, ipnet:139.59.160.0/20, country:US]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[] X-ThisMailContainsUnwantedMimeParts: N --Apple-Mail=_5ECC9676-93F8-470C-858D-DFE7161EF7BB Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On 25 May 2022, at 13:20, Jessica Clarke wrote: >=20 > On 19 May 2022, at 15:32, Jessica Clarke > wrote: >>=20 >> On 19 May 2022, at 11:31, Andrew Turner wrote: >>>=20 >>> The branch main has been updated by andrew: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D190abf86bb455a5b423ca46d309c4492= a2d41a94 >>>=20 >>> commit 190abf86bb455a5b423ca46d309c4492a2d41a94 >>> Author: Andrew Turner >>> AuthorDate: 2022-05-12 12:50:59 +0000 >>> Commit: Andrew Turner >>> CommitDate: 2022-05-19 10:30:21 +0000 >>>=20 >>> Fix the name of Makefile.aarch64 >>>=20 >>> Makefile.arm64 relies on being included via Makefile.${MACHINE}. = This >>> only works when arm64 is the only aarch64 architecture. Switch to >>> Makefile.aarch64 so downstream CheriBSD can use the file when = building >>> for Morello which uses a differen ${MACHINE} value. >>=20 >> CheriBSD still has MACHINE=3Darm64 for Morello... so this should work >> just fine with the MACHINE case in bsd.arch.inc.mk, whereas now you = hit >> the MACHINE_ARCH case for plain aarch64 and the MACHINE_CPUARCH case >> for Morello. This seems worse to me? >=20 > Ping >=20 > Jess In userspace we=E2=80=99ve preferred aarch64, e.g. lib/libc/aarch64, = libexec/rtld-elf/aarch64. This helps keeping this file consistent with = that convention. Andrew= --Apple-Mail=_5ECC9676-93F8-470C-858D-DFE7161EF7BB Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8
On = 25 May 2022, at 13:20, Jessica Clarke <jrtc27@freebsd.org> = wrote:

On 19 May 2022, at 15:32, = Jessica Clarke <jrtc27@FreeBSD.org> wrote:

On 19 May 2022, at = 11:31, Andrew Turner <andrew@FreeBSD.org> wrote:

The branch main has been updated = by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=3D190abf86bb455a5b423ca= 46d309c4492a2d41a94

commit = 190abf86bb455a5b423ca46d309c4492a2d41a94
Author: Andrew = Turner <andrew@FreeBSD.org>
AuthorDate: = 2022-05-12 12:50:59 +0000
Commit: Andrew Turner <andrew@FreeBSD.org>
CommitDate: = 2022-05-19 10:30:21 +0000

Fix the name of = Makefile.aarch64

Makefile.arm64 relies on = being included via Makefile.${MACHINE}. This
only works = when arm64 is the only aarch64 architecture. Switch to
Makefile.aarch64 so downstream CheriBSD can use the file when = building
for Morello which uses a differen ${MACHINE} = value.

CheriBSD still has = MACHINE=3Darm64 for Morello... so this should work
just = fine with the MACHINE case in bsd.arch.inc.mk, whereas now you hit
the MACHINE_ARCH case for plain aarch64 and the = MACHINE_CPUARCH case
for Morello. This seems worse to = me?

Ping

Jess

In userspace we=E2=80=99ve preferred aarch64, e.g. = lib/libc/aarch64, libexec/rtld-elf/aarch64. This helps keeping this = file consistent with that convention.

Andrew
= --Apple-Mail=_5ECC9676-93F8-470C-858D-DFE7161EF7BB--