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
--000000000000d01e1f05e0022f0d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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=3D190abf86bb455a5b423ca46d309c449= 2a2d41a94 > > 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. > 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 --000000000000d01e1f05e0022f0d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">= <div dir=3D"ltr" class=3D"gmail_attr">On Fri, May 27, 2022 at 12:01 PM Andr= ew Turner <<a href=3D"mailto:andrew@freebsd.org">andrew@freebsd.org</a>&= gt; wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0= px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div = style=3D"overflow-wrap: break-word;"><br><div><blockquote type=3D"cite"><di= v>On 25 May 2022, at 13:20, Jessica Clarke <<a href=3D"mailto:jrtc27@fre= ebsd.org" target=3D"_blank">jrtc27@freebsd.org</a>> wrote:</div><br><div= ><span style=3D"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;te= xt-decoration:none;float:none;display:inline">On 19 May 2022, at 15:32, Jes= sica Clarke <</span><a href=3D"mailto:jrtc27@FreeBSD.org" style=3D"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=3D"_blank">jrtc= 27@FreeBSD.org</a><span style=3D"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;wo= rd-spacing:0px;text-decoration:none;float:none;display:inline">> wrote:<= /span><br style=3D"font-family:Helvetica;font-size:12px;font-style:normal;f= ont-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:st= art;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px= ;text-decoration:none"><blockquote type=3D"cite" style=3D"font-family:Helve= tica;font-size:12px;font-style:normal;font-variant-caps:normal;font-weight:= 400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:n= one;white-space:normal;word-spacing:0px;text-decoration:none"><br>On 19 May= 2022, at 11:31, Andrew Turner <<a href=3D"mailto:andrew@FreeBSD.org" ta= rget=3D"_blank">andrew@FreeBSD.org</a>> wrote:<br><blockquote type=3D"ci= te"><br>The branch main has been updated by andrew:<br><br>URL: <a href=3D"= https://cgit.FreeBSD.org/src/commit/?id=3D190abf86bb455a5b423ca46d309c4492a= 2d41a94" target=3D"_blank">https://cgit.FreeBSD.org/src/commit/?id=3D190abf= 86bb455a5b423ca46d309c4492a2d41a94</a><br><br>commit 190abf86bb455a5b423ca4= 6d309c4492a2d41a94<br>Author: Andrew Turner <<a href=3D"mailto:andrew@Fr= eeBSD.org" target=3D"_blank">andrew@FreeBSD.org</a>><br>AuthorDate: 2022= -05-12 12:50:59 +0000<br>Commit: Andrew Turner <<a href=3D"mailto:andrew= @FreeBSD.org" target=3D"_blank">andrew@FreeBSD.org</a>><br>CommitDate: 2= 022-05-19 10:30:21 +0000<br><br>Fix the name of Makefile.aarch64<br><br>Mak= efile.arm64 relies on being included via Makefile.${MACHINE}. This<br>only = works when arm64 is the only aarch64 architecture. Switch to<br>Makefile.aa= rch64 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=3Darm64 for Morello... so this should work<br>just fine with th= e MACHINE case in <a href=3D"http://bsd.arch.inc.mk" target=3D"_blank">bsd.= arch.inc.mk</a>, whereas now you hit<br>the MACHINE_ARCH case for plain aar= ch64 and the MACHINE_CPUARCH case<br>for Morello. This seems worse to me?<b= r></blockquote><br style=3D"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-sp= acing:0px;text-decoration:none"><span style=3D"font-family:Helvetica;font-s= ize:12px;font-style:normal;font-variant-caps:normal;font-weight:400;letter-= spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-s= pace:normal;word-spacing:0px;text-decoration:none;float:none;display:inline= ">Ping</span><br style=3D"font-family:Helvetica;font-size:12px;font-style:n= ormal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-a= lign:start;text-indent:0px;text-transform:none;white-space:normal;word-spac= ing:0px;text-decoration:none"><br style=3D"font-family:Helvetica;font-size:= 12px;font-style:normal;font-variant-caps:normal;font-weight:400;letter-spac= ing:normal;text-align:start;text-indent:0px;text-transform:none;white-space= :normal;word-spacing:0px;text-decoration:none"><span style=3D"font-family:H= elvetica;font-size:12px;font-style:normal;font-variant-caps:normal;font-wei= ght:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transfo= rm:none;white-space:normal;word-spacing:0px;text-decoration:none;float:none= ;display:inline">Jess</span></div></blockquote></div><br><div>In userspace = we=E2=80=99ve preferred aarch64, e.g. lib/libc/aarch64,=C2=A0libexec/rtld-e= lf/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 m= atches</div><div>what we do elsewhere, what we've done historically and= keeps a good userland (MACHINE_ARCH) / kernel</div><div>(MACHINE) dichotom= y.</div><div><br></div><div>Warner=C2=A0</div></div></div> --000000000000d01e1f05e0022f0d--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfp=rrO5aadjnNNmyRTGG-qywhF8=zzUBJLeiB9B3rpEYw>