Date: Fri, 27 May 2022 18:53:27 +0100 From: Andrew Turner <andrew@FreeBSD.org> To: Jessica Clarke <jrtc27@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: <9F9F0889-EDE0-4D21-9372-4944DBEF630F@FreeBSD.org> In-Reply-To: <80EAD5AD-BD7E-4B67-B2ED-49FF228982E0@freebsd.org> References: <202205191031.24JAVO2A038485@gitrepo.freebsd.org> <5F6BE164-2127-4DDC-94BE-2E0044BD93B7@freebsd.org> <80EAD5AD-BD7E-4B67-B2ED-49FF228982E0@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] > 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 <mailto: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 In userspace we’ve preferred aarch64, e.g. lib/libc/aarch64, libexec/rtld-elf/aarch64. This helps keeping this file consistent with that convention. Andrew [-- Attachment #2 --] <html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><br class=""><div><blockquote type="cite" class=""><div class="">On 25 May 2022, at 13:20, Jessica Clarke <<a href="mailto:jrtc27@freebsd.org" class="">jrtc27@freebsd.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">On 19 May 2022, at 15:32, Jessica Clarke <</span><a href="mailto:jrtc27@FreeBSD.org" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;" class="">jrtc27@FreeBSD.org</a><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">> wrote:</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br class="">On 19 May 2022, at 11:31, Andrew Turner <<a href="mailto:andrew@FreeBSD.org" class="">andrew@FreeBSD.org</a>> wrote:<br class=""><blockquote type="cite" class=""><br class="">The branch main has been updated by andrew:<br class=""><br class="">URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=190abf86bb455a5b423ca46d309c4492a2d41a94" class="">https://cgit.FreeBSD.org/src/commit/?id=190abf86bb455a5b423ca46d309c4492a2d41a94</a><br class=""><br class="">commit 190abf86bb455a5b423ca46d309c4492a2d41a94<br class="">Author: Andrew Turner <<a href="mailto:andrew@FreeBSD.org" class="">andrew@FreeBSD.org</a>><br class="">AuthorDate: 2022-05-12 12:50:59 +0000<br class="">Commit: Andrew Turner <<a href="mailto:andrew@FreeBSD.org" class="">andrew@FreeBSD.org</a>><br class="">CommitDate: 2022-05-19 10:30:21 +0000<br class=""><br class="">Fix the name of Makefile.aarch64<br class=""><br class="">Makefile.arm64 relies on being included via Makefile.${MACHINE}. This<br class="">only works when arm64 is the only aarch64 architecture. Switch to<br class="">Makefile.aarch64 so downstream CheriBSD can use the file when building<br class="">for Morello which uses a differen ${MACHINE} value.<br class=""></blockquote><br class="">CheriBSD still has MACHINE=arm64 for Morello... so this should work<br class="">just fine with the MACHINE case in bsd.arch.inc.mk, whereas now you hit<br class="">the MACHINE_ARCH case for plain aarch64 and the MACHINE_CPUARCH case<br class="">for Morello. This seems worse to me?<br class=""></blockquote><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Ping</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Jess</span></div></blockquote></div><br class=""><div class="">In userspace we’ve preferred aarch64, e.g. lib/libc/aarch64, libexec/rtld-elf/aarch64. This helps keeping this file consistent with that convention.</div><div class=""><br class=""></div><div class="">Andrew</div></body></html>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?9F9F0889-EDE0-4D21-9372-4944DBEF630F>