On 19 May 2022, at 15:32, Jessica Clarke <[email protected]> wrote: > > On 19 May 2022, at 11:31, Andrew Turner <[email protected]> wrote: >> >> The branch main has been updated by andrew: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=190abf86bb455a5b423ca46d309c4492a2d41a94 >> >> commit 190abf86bb455a5b423ca46d309c4492a2d41a94 >> Author: Andrew Turner <[email protected]> >> AuthorDate: 2022-05-12 12:50:59 +0000 >> Commit: Andrew Turner <[email protected]> >> 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
