Date: Fri, 27 May 2022 12:07:49 -0600 From: Warner Losh <imp@bsdimp.com> To: Andrew Turner <andrew@freebsd.org> Cc: Jessica Clarke <jrtc27@freebsd.org>, "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: <CANCZdfp=rrO5aadjnNNmyRTGG-qywhF8=zzUBJLeiB9B3rpEYw@mail.gmail.com> In-Reply-To: <9F9F0889-EDE0-4D21-9372-4944DBEF630F@FreeBSD.org> References: <202205191031.24JAVO2A038485@gitrepo.freebsd.org> <5F6BE164-2127-4DDC-94BE-2E0044BD93B7@freebsd.org> <80EAD5AD-BD7E-4B67-B2ED-49FF228982E0@freebsd.org> <9F9F0889-EDE0-4D21-9372-4944DBEF630F@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Fri, May 27, 2022 at 12:01 PM Andrew Turner <andrew@freebsd.org> wrote: > > 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=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. > I think Makefile.$MACHINE was a mistake for userland anyway... I agree that your convention is better. It matches what we do elsewhere, what we've done historically and keeps a good userland (MACHINE_ARCH) / kernel (MACHINE) dichotomy. Warner [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, May 27, 2022 at 12:01 PM Andrew Turner <<a href="mailto:andrew@freebsd.org">andrew@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div style="overflow-wrap: break-word;"><br><div><blockquote type="cite"><div>On 25 May 2022, at 13:20, Jessica Clarke <<a href="mailto:jrtc27@freebsd.org" target="_blank">jrtc27@freebsd.org</a>> wrote:</div><br><div><span style="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;text-decoration:none;float:none;display:inline">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;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px" target="_blank">jrtc27@FreeBSD.org</a><span style="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;text-decoration:none;float:none;display:inline">> wrote:</span><br style="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;text-decoration:none"><blockquote type="cite" style="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;text-decoration:none"><br>On 19 May 2022, at 11:31, Andrew Turner <<a href="mailto:andrew@FreeBSD.org" target="_blank">andrew@FreeBSD.org</a>> wrote:<br><blockquote type="cite"><br>The branch main has been updated by andrew:<br><br>URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=190abf86bb455a5b423ca46d309c4492a2d41a94" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=190abf86bb455a5b423ca46d309c4492a2d41a94</a><br><br>commit 190abf86bb455a5b423ca46d309c4492a2d41a94<br>Author: Andrew Turner <<a href="mailto:andrew@FreeBSD.org" target="_blank">andrew@FreeBSD.org</a>><br>AuthorDate: 2022-05-12 12:50:59 +0000<br>Commit: Andrew Turner <<a href="mailto:andrew@FreeBSD.org" target="_blank">andrew@FreeBSD.org</a>><br>CommitDate: 2022-05-19 10:30:21 +0000<br><br>Fix the name of Makefile.aarch64<br><br>Makefile.arm64 relies on being included via Makefile.${MACHINE}. This<br>only works when arm64 is the only aarch64 architecture. Switch to<br>Makefile.aarch64 so downstream CheriBSD can use the file when building<br>for Morello which uses a differen ${MACHINE} value.<br></blockquote><br>CheriBSD still has MACHINE=arm64 for Morello... so this should work<br>just fine with the MACHINE case in <a href="http://bsd.arch.inc.mk" target="_blank">bsd.arch.inc.mk</a>, whereas now you hit<br>the MACHINE_ARCH case for plain aarch64 and the MACHINE_CPUARCH case<br>for Morello. This seems worse to me?<br></blockquote><br style="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;text-decoration:none"><span style="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;text-decoration:none;float:none;display:inline">Ping</span><br style="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;text-decoration:none"><br style="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;text-decoration:none"><span style="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;text-decoration:none;float:none;display:inline">Jess</span></div></blockquote></div><br><div>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></blockquote><div><br></div><div>I think Makefile.$MACHINE was a mistake for userland anyway... I agree that your convention is better. It matches</div><div>what we do elsewhere, what we've done historically and keeps a good userland (MACHINE_ARCH) / kernel</div><div>(MACHINE) dichotomy.</div><div><br></div><div>Warner </div></div></div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfp=rrO5aadjnNNmyRTGG-qywhF8=zzUBJLeiB9B3rpEYw>