From nobody Wed May 25 12:20:10 2022 X-Original-To: dev-commits-src-main@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 39E151B5E6A0 for ; Wed, 25 May 2022 12:20:20 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 4L7VWl1csnz3F8t for ; Wed, 25 May 2022 12:20:19 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wm1-f42.google.com with SMTP id m32-20020a05600c3b2000b0039756bb41f2so3237070wms.3 for ; Wed, 25 May 2022 05:20:19 -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=djx+o3f72aXNunK5qdduWzOM0MzbRpDLT3pff2PHvKE=; b=tWm1CLcs2rBhsalz4mqRJmsA9F8bAOGLcynCaYBJxhO6L/cKW/HLAnIlbJDxZy5Ipn cAm5N4Ct+u7HE+7UKhdm7XxuCmvzia/OOmnx4mN16maCyr+kxXkwUKKHKkAAAaHF0XQR gTM4JaY66IP3IQrIIyzIV9sYPhgAUWKHBNT8lNfQ4QPGhq70ukU4p0IvVLyBNvlXjwZX 8E8XvCMuZBZxjNzwRfMxyucdKXMNmRlVw5R3JNj/xNQQpQRA1sfRhfHIJHgx2JLcWrj0 PuSr469Phy/ksuCGZNn5or3XWQTC/Ej6ndNGjXPHhLPnR938Ilu+ETHdIxfaMy+3Wgxp /gHw== X-Gm-Message-State: AOAM532tBcYVixUEntgquGwYz7agNTLpZpJan4srN8C9cnFD9qW9y2jN qEV4UHmp4lfd+EpzlPgkcR5kjGb0qxYN1Q== X-Google-Smtp-Source: ABdhPJxQmrFKSTmMvtX9Z6/BLkLxavGOsUWql6NgrzrY+QTiNQ3EYeD/xbw1DGwdHIvePNEGZJFuzg== X-Received: by 2002:a7b:c1d3:0:b0:397:6a60:7c21 with SMTP id a19-20020a7bc1d3000000b003976a607c21mr3147428wmj.53.1653481212108; Wed, 25 May 2022 05:20:12 -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 y14-20020a1c4b0e000000b00397122e63b6sm1962379wma.29.2022.05.25.05.20.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 May 2022 05:20:11 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: <5F6BE164-2127-4DDC-94BE-2E0044BD93B7@freebsd.org> Date: Wed, 25 May 2022 13:20:10 +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: <80EAD5AD-BD7E-4B67-B2ED-49FF228982E0@freebsd.org> References: <202205191031.24JAVO2A038485@gitrepo.freebsd.org> <5F6BE164-2127-4DDC-94BE-2E0044BD93B7@freebsd.org> To: Andrew Turner X-Mailer: Apple Mail (2.3696.80.82.1.1) X-Rspamd-Queue-Id: 4L7VWl1csnz3F8t 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.128.42 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com X-Spamd-Result: default: False [-2.50 / 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]; NEURAL_HAM_SHORT(-1.00)[-1.000]; 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_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.42:from]; MLMMJ_DEST(0.00)[dev-commits-src-main]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.42:from]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N On 19 May 2022, at 15:32, Jessica Clarke wrote: >=20 > 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. >=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? Ping Jess