Date: Wed, 25 May 2022 13:20:10 +0100 From: Jessica Clarke <jrtc27@freebsd.org> To: Andrew Turner <andrew@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: 190abf86bb45 - main - Fix the name of Makefile.aarch64 Message-ID: <80EAD5AD-BD7E-4B67-B2ED-49FF228982E0@freebsd.org> In-Reply-To: <5F6BE164-2127-4DDC-94BE-2E0044BD93B7@freebsd.org> References: <202205191031.24JAVO2A038485@gitrepo.freebsd.org> <5F6BE164-2127-4DDC-94BE-2E0044BD93B7@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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=190abf86bb455a5b423ca46d309c4492a2d41a94 >> >> 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=arm64 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?80EAD5AD-BD7E-4B67-B2ED-49FF228982E0>