From nobody Thu May 19 14:32:52 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 1CE281AED7C5 for ; Thu, 19 May 2022 14:33:02 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 4L3slc71j8z4Zcl for ; Thu, 19 May 2022 14:33:00 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wr1-f53.google.com with SMTP id s28so7325402wrb.7 for ; Thu, 19 May 2022 07:33:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=67rRrzjr19mshGMJ1Qvl5czp+iDS6gaVTMm962GJDS0=; b=uMoruxirkq/XO5OWwzlZ98a3Cjx+DtorOWQgk/ZHl9/5hgB4PNbtXDKqPYI4bsSbjw tKEgN35P/S4EiHvsKeB06ZAotXa/FYlw4ep+bYAUOWgJVALhoD5lyVXMoqOdo51AHYfe offrKyNRY9gj2JZWNarwxMjYlhWhH9pMxAd5ZtYaBr/HGzZvejihUAROI34syj+xlVXe qX8oxaEDVjEn1ukKwu/gRqJFXwKCIKIeqP/nL/6F6Q2NtSA2BoyNQ9ytDHjyAqQtbDfT R1G51mlF9H9Kibpaf0QEJZXWzhMlAT0H4RmTsPaFCC+I7Kml/HnfBFpq0611MxkYgR4x E3Cg== X-Gm-Message-State: AOAM531ZGMAOiqJ+ROB6HGldbs7Um10WaFxCyBT6WC2Et/pXuc4apxf+ lTtfR9ZEasKxqRVB3EAybW6kAIR+kFYbpQ== X-Google-Smtp-Source: ABdhPJzmomDaPnm49qCcFSXHuBIWnaS4ARfobHR5F7WHYbswdXz/3u783JoA1kSivMDUGNkcAlf3Kg== X-Received: by 2002:a5d:47c8:0:b0:20c:630f:7df5 with SMTP id o8-20020a5d47c8000000b0020c630f7df5mr4221243wrc.689.1652970774110; Thu, 19 May 2022 07:32:54 -0700 (PDT) Received: from smtpclient.apple (global-5-141.nat-2.net.cam.ac.uk. [131.111.5.141]) by smtp.gmail.com with ESMTPSA id y4-20020a056000168400b0020e63ab5d78sm4180021wrd.26.2022.05.19.07.32.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2022 07:32:53 -0700 (PDT) Content-Type: text/plain; charset=us-ascii 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 (Mac OS X Mail 16.0 \(3696.80.82.1.1\)) Subject: Re: git: 190abf86bb45 - main - Fix the name of Makefile.aarch64 From: Jessica Clarke In-Reply-To: <202205191031.24JAVO2A038485@gitrepo.freebsd.org> Date: Thu, 19 May 2022 15:32:52 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <5F6BE164-2127-4DDC-94BE-2E0044BD93B7@freebsd.org> References: <202205191031.24JAVO2A038485@gitrepo.freebsd.org> To: Andrew Turner X-Mailer: Apple Mail (2.3696.80.82.1.1) X-Rspamd-Queue-Id: 4L3slc71j8z4Zcl X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com X-Spamd-Result: default: False [-0.58 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MV_CASE(0.50)[]; RCVD_COUNT_THREE(0.00)[3]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MID_RHS_MATCH_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEFALL_USER(0.00)[jrtc27]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_SPAM_SHORT(0.92)[0.920]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.53:from]; MLMMJ_DEST(0.00)[dev-commits-src-all]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.53:from]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N On 19 May 2022, at 11:31, Andrew Turner 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 > AuthorDate: 2022-05-12 12:50:59 +0000 > Commit: Andrew Turner > 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. 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? Jess > Sponsored by: Innovate UK > --- > usr.sbin/{Makefile.arm64 =3D> Makefile.aarch64} | 0 > 1 file changed, 0 insertions(+), 0 deletions(-) >=20 > diff --git a/usr.sbin/Makefile.arm64 b/usr.sbin/Makefile.aarch64 > similarity index 100% > rename from usr.sbin/Makefile.arm64 > rename to usr.sbin/Makefile.aarch64