From nobody Fri May 27 18:07:49 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 01EF11B3BF5E for ; Fri, 27 May 2022 18:08:01 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vk1-xa2b.google.com (mail-vk1-xa2b.google.com [IPv6:2607:f8b0:4864:20::a2b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L8t806LsMz4d5P for ; Fri, 27 May 2022 18:08:00 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vk1-xa2b.google.com with SMTP id b81so2363906vkf.1 for ; Fri, 27 May 2022 11:08:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=8TkCAplC+haxWtqwYxBHsjVligGFvrKktqgmw1EwCos=; b=3OXOfWbsiKmofhmPI5IXV0DjNvZo5LzhL4xG+x+6e/ShjcRoVGgYsgPFcdgbUkm1v1 IBjWmduBlQEYoVGWpKtPTpIMBCikI3OMOB3XNQFRgH/qBPwrk1qgzEe5ktNR84ZNrncK IedgABsUvp+AKrVIWkEbfHNdS7CJgvgDTjdcG4rX9lK9JZZ+9XsLAMnnDRg6hHQgZ0/H 3MCTxKqpQ6JGzjF1++Ql59yn4oV0HJ2RXPW5GmDmX4eENJDdYp2Jf1nHbJFemBixItvr A6WmmjTPVdcbEMt1H4aAl5TumYWS4NSKANN2oLaTl7DQ62cAeNO44g7OtOeizyJAnWkp iFMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=8TkCAplC+haxWtqwYxBHsjVligGFvrKktqgmw1EwCos=; b=JCeLqYC4GkaD/SHtvoVcJNglc4CXPlLOYpgMA2DYyPuH7T80RvQcI37ExVLVwIFOZu uNCwf4RoOpKsnteqhPn1rTevVuWF2chH/RPtJ/dcT7OiM++g/S2MESadpOET6Bh7tNou Qwp0adO5Flyw0wwt3qDT9UjO1ZYeZhuUjwNWIxi6Ht8cjRy6Be0yYl2I92CwiPmhJWtn KZggo629EHqbmn4K1wn/9WMdEQNOJ6uE8Qj6qM+aMnzapwXGjc+nfa8oZNpiI0BqEu7a EzaxFxn3Agz7EPHBbrWE3kNy4h3Xxu70q+gRdTfbQymJOJ2PodunaK0HwtodanM/3ZQI kWwQ== X-Gm-Message-State: AOAM5307oYIiJHsdNzeJk0jFslQ/we/+XHkfjCmwcfDKnRJqlLDUeCq+ IdZoraWzdzyTEvTAVgdgwoiYnAEf3dUm3TbBD20vVA== X-Google-Smtp-Source: ABdhPJzp2cpCkNvpWopXJKUbdZZTj1KkKjnyLG4888ixeUTBsnJ5fyGIWi73CAiL78uZJMX3cPo117BBxGKWmvltBe4= X-Received: by 2002:a1f:ac14:0:b0:34e:c5cc:f97f with SMTP id v20-20020a1fac14000000b0034ec5ccf97fmr17107828vke.9.1653674880271; Fri, 27 May 2022 11:08:00 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 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> In-Reply-To: <9F9F0889-EDE0-4D21-9372-4944DBEF630F@FreeBSD.org> From: Warner Losh Date: Fri, 27 May 2022 12:07:49 -0600 Message-ID: Subject: Re: git: 190abf86bb45 - main - Fix the name of Makefile.aarch64 To: Andrew Turner Cc: Jessica Clarke , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="000000000000d01e1f05e0022f0d" X-Rspamd-Queue-Id: 4L8t806LsMz4d5P X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N --000000000000d01e1f05e0022f0d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, May 27, 2022 at 12:01 PM Andrew Turner wrote: > > On 25 May 2022, at 13:20, Jessica Clarke wrote: > > On 19 May 2022, at 15:32, Jessica Clarke wrote: > > > On 19 May 2022, at 11:31, Andrew Turner wrote: > > > The branch main has been updated by andrew: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D190abf86bb455a5b423ca46d309c449= 2a2d41a94 > > commit 190abf86bb455a5b423ca46d309c4492a2d41a94 > Author: Andrew Turner > AuthorDate: 2022-05-12 12:50:59 +0000 > Commit: Andrew Turner > 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


=
On Fri, May 27, 2022 at 12:01 PM Andr= ew Turner <andrew@freebsd.org&= gt; wrote:

On 25 May 2022, at 13:20, Jessica Clarke <jrtc27@freebsd.org> wrote:

On 19 May 2022, at 15:32, Jes= sica Clarke <jrtc= 27@FreeBSD.org> wrote:<= /span>

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=3D190abf= 86bb455a5b423ca46d309c4492a2d41a94

commit 190abf86bb455a5b423ca4= 6d309c4492a2d41a94
Author: Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2022= -05-12 12:50:59 +0000
Commit: Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2= 022-05-19 10:30:21 +0000

Fix the name of Makefile.aarch64

Mak= efile.arm64 relies on being included via Makefile.${MACHINE}. This
only = works when arm64 is the only aarch64 architecture. Switch to
Makefile.aa= rch64 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 th= e MACHINE case in bsd.= arch.inc.mk, whereas now you hit
the MACHINE_ARCH case for plain aar= ch64 and the MACHINE_CPUARCH case
for Morello. This seems worse to me?


Jess

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.

I think Makefile.$MACHINE was a = mistake for userland anyway... I agree that your convention is better. It m= atches
what we do elsewhere, what we've done historically and= keeps a good userland (MACHINE_ARCH) / kernel
(MACHINE) dichotom= y.

Warner=C2=A0
--000000000000d01e1f05e0022f0d--