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
--Apple-Mail=_5ECC9676-93F8-470C-858D-DFE7161EF7BB Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On 25 May 2022, at 13:20, Jessica Clarke <jrtc27@freebsd.org> wrote: >=20 > On 19 May 2022, at 15:32, Jessica Clarke <jrtc27@FreeBSD.org = <mailto:jrtc27@FreeBSD.org>> wrote: >>=20 >> On 19 May 2022, at 11:31, Andrew Turner <andrew@FreeBSD.org> wrote: >>>=20 >>> The branch main has been updated by andrew: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D190abf86bb455a5b423ca46d309c4492= a2d41a94 >>>=20 >>> 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 >>>=20 >>> Fix the name of Makefile.aarch64 >>>=20 >>> 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. >>=20 >> 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? >=20 > Ping >=20 > 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. Andrew= --Apple-Mail=_5ECC9676-93F8-470C-858D-DFE7161EF7BB Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8 <html><head><meta http-equiv=3D"Content-Type" content=3D"text/html; = charset=3Dutf-8"></head><body style=3D"word-wrap: break-word; = -webkit-nbsp-mode: space; line-break: after-white-space;" class=3D""><br = class=3D""><div><blockquote type=3D"cite" class=3D""><div class=3D"">On = 25 May 2022, at 13:20, Jessica Clarke <<a = href=3D"mailto:jrtc27@freebsd.org" class=3D"">jrtc27@freebsd.org</a>> = wrote:</div><br class=3D"Apple-interchange-newline"><div class=3D""><span = style=3D"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=3D"">On 19 May 2022, at 15:32, = Jessica 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; = 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=3D"">jrtc27@FreeBSD.org</a><span style=3D"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=3D"">> wrote:</span><br style=3D"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=3D""><blockquote type=3D"cite" = style=3D"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=3D""><br class=3D"">On 19 May 2022, at = 11:31, Andrew Turner <<a href=3D"mailto:andrew@FreeBSD.org" = class=3D"">andrew@FreeBSD.org</a>> wrote:<br class=3D""><blockquote = type=3D"cite" class=3D""><br class=3D"">The branch main has been updated = by andrew:<br class=3D""><br class=3D"">URL: <a = href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D190abf86bb455a5b423ca46d= 309c4492a2d41a94" = class=3D"">https://cgit.FreeBSD.org/src/commit/?id=3D190abf86bb455a5b423ca= 46d309c4492a2d41a94</a><br class=3D""><br class=3D"">commit = 190abf86bb455a5b423ca46d309c4492a2d41a94<br class=3D"">Author: Andrew = Turner <<a href=3D"mailto:andrew@FreeBSD.org" = class=3D"">andrew@FreeBSD.org</a>><br class=3D"">AuthorDate: = 2022-05-12 12:50:59 +0000<br class=3D"">Commit: Andrew Turner <<a = href=3D"mailto:andrew@FreeBSD.org" = class=3D"">andrew@FreeBSD.org</a>><br class=3D"">CommitDate: = 2022-05-19 10:30:21 +0000<br class=3D""><br class=3D"">Fix the name of = Makefile.aarch64<br class=3D""><br class=3D"">Makefile.arm64 relies on = being included via Makefile.${MACHINE}. This<br class=3D"">only works = when arm64 is the only aarch64 architecture. Switch to<br = class=3D"">Makefile.aarch64 so downstream CheriBSD can use the file when = building<br class=3D"">for Morello which uses a differen ${MACHINE} = value.<br class=3D""></blockquote><br class=3D"">CheriBSD still has = MACHINE=3Darm64 for Morello... so this should work<br class=3D"">just = fine with the MACHINE case in bsd.arch.inc.mk, whereas now you hit<br = class=3D"">the MACHINE_ARCH case for plain aarch64 and the = MACHINE_CPUARCH case<br class=3D"">for Morello. This seems worse to = me?<br class=3D""></blockquote><br style=3D"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=3D""><span style=3D"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=3D"">Ping</span><br style=3D"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=3D""><br style=3D"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=3D""><span style=3D"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=3D"">Jess</span></div></blockquote></div><br class=3D""><div = class=3D"">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.</div><div class=3D""><br = class=3D""></div><div class=3D"">Andrew</div></body></html>= --Apple-Mail=_5ECC9676-93F8-470C-858D-DFE7161EF7BB--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?9F9F0889-EDE0-4D21-9372-4944DBEF630F>