From nobody Mon Dec 12 11:48:47 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 4NW0Jp42Jwz4kDbV for ; Mon, 12 Dec 2022 11:48:58 +0000 (UTC) (envelope-from bT.grati5zc30=h44cqi9i26y0=y4qtlav4zp@em790814.fubar.geek.nz) Received: from e2i580.smtp2go.com (e2i580.smtp2go.com [103.2.142.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4NW0Jp3Twnz444h for ; Mon, 12 Dec 2022 11:48:58 +0000 (UTC) (envelope-from bT.grati5zc30=h44cqi9i26y0=y4qtlav4zp@em790814.fubar.geek.nz) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=mgy720.a1-4.dyn; x=1670846638; h=Feedback-ID: X-Smtpcorp-Track:To:Message-Id:Date:From:Subject:Reply-To:Sender: List-Unsubscribe; bh=x+z4itXmpaGuPIOIp8i07Na2sDHVJfph0Is27HAysCk=; b=K1L4rdKW jYS0kmfB9FSBZPYd9U/Fwy0+KDNAdRC6BIKOO8NrXKAB11QApv+JfTsfdAAyhxU52HpRT/sb/60QL yE5HgaEg6mZtexxt6rqMDoCSV4o6KrJatSdKtJZA0laqFfue/ktCd05s5tnd5GrLeP7BoitPaUMk2 Guje4rNLWjlcUUFvHM/gqxXs1t7cP9hdjolw4VO+Taf4p5Lg3+Fwf5fq1uJgK6Py4/qqUoHnh+Vzh 4qKwLtaPijsxVKwQzbw+sFAPWJNa0JD3gq3esQ9Dne5PALRFtSxUf6K+FxGra/90DDuQgFrOtKmZc 3vQA4oHZUAkqYqQeuEE4JT5mBg==; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fubar.geek.nz; i=@fubar.geek.nz; q=dns/txt; s=s790814; t=1670845738; h=from : subject : to : message-id : date; bh=x+z4itXmpaGuPIOIp8i07Na2sDHVJfph0Is27HAysCk=; b=k3qW92JgF+uwy23yrdtO0vDhETvyhJnT0RVnhwRuOipIDQIkd0OvSIUdl5nGqxCfpfCc9 5W6as8L94uVLvSiBuHaJz3cFes9Jt392I/KwG+HEmTsC80ssvAP/VWbhM0a4/Qx8FaBGu3x XE8CDajha/uXRnmfY0bFI4BdLTB6G+bD7Qqne10t5l6oBibtXfBgTcNmDKknXY43ok0Xq2A 9HAKZBkyYnce6Wh7RyzwsX21STSi1Y0JuiTTocsVuNYsmwroVNvUMC5wD8zp3bq9pdbqU0s HVRn9GYT6QVuW+0zsoU2Rn+uZ04I3u5aOlipp7Zw1SkzmY0VSGvoL+DEE6+A== Received: from [10.139.162.187] (helo=SmtpCorp) by smtpcorp.com with esmtpsa (TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2-S2G) (envelope-from ) id 1p4hIi-qt4Dlj-O2; Mon, 12 Dec 2022 11:48:52 +0000 Received: from [10.162.55.164] (helo=morbo.fubar.geek.nz) by smtpcorp.com with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.96-S2G) (envelope-from ) id 1p4hIi-4Xekig-1k; Mon, 12 Dec 2022 11:48:52 +0000 Received: from smtpclient.apple (cpc91214-cmbg18-2-0-cust234.5-4.cable.virginm.net [81.102.75.235]) by morbo.fubar.geek.nz (Postfix) with ESMTPSA id 4725E1F41C; Mon, 12 Dec 2022 11:48:48 +0000 (UTC) Content-Type: text/plain; charset=utf-8 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.120.41.1.1\)) Subject: Re: git: 83bf6ab56829 - main - uname: switch machine to HW_MACHINE_ARCH From: Andrew Turner In-Reply-To: <202212111208.2BBC835O095410@gitrepo.freebsd.org> Date: Mon, 12 Dec 2022 11:48:47 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202212111208.2BBC835O095410@gitrepo.freebsd.org> To: Piotr Kubaj X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Smtpcorp-Track: 1p4hmi4b-kig1k._8lXXwQ68Pu4Y Feedback-ID: 790814m:790814amQcrys:790814s0NvJ1i4uT X-Report-Abuse: Please forward a copy of this message, including all headers, to X-Rspamd-Queue-Id: 4NW0Jp3Twnz444h X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:23352, ipnet:103.2.140.0/22, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N > On 11 Dec 2022, at 12:08, Piotr Kubaj wrote: >=20 > The branch main has been updated by pkubaj (ports committer): >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D83bf6ab568293e325f437342cdb87a62= 6353e27c >=20 > commit 83bf6ab568293e325f437342cdb87a626353e27c > Author: Piotr Kubaj > AuthorDate: 2022-12-11 03:01:44 +0000 > Commit: Piotr Kubaj > CommitDate: 2022-12-11 12:05:39 +0000 >=20 > uname: switch machine to HW_MACHINE_ARCH >=20 > On powerpc64, powerpc64le and riscv64 some software wrongly assumes = that > it runs on powerpc or riscv (32-bit). >=20 > Differential revision: https://reviews.freebsd.org/D35962 > Approved by: alfredo, imp > --- > lib/libc/gen/__xuname.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/lib/libc/gen/__xuname.c b/lib/libc/gen/__xuname.c > index fba5eaeebc88..bd328d4f880f 100644 > --- a/lib/libc/gen/__xuname.c > +++ b/lib/libc/gen/__xuname.c > @@ -127,11 +127,11 @@ __xuname(int namesize, void *namebuf) > } > q +=3D namesize; >=20 > - if ((p =3D getenv("UNAME_m"))) > + if ((p =3D getenv("UNAME_p"))) > strlcpy(q, p, namesize); > else { > mib[0] =3D CTL_HW; > - mib[1] =3D HW_MACHINE; > + mib[1] =3D HW_MACHINE_ARCH; > len =3D namesize; > oerrno =3D errno; > if (sysctl(mib, 2, q, &len, NULL, 0) =3D=3D -1) { >=20 This breaks the native arm64 build as make sets MACHINE based on this = value. It is changed from arm64 to aarch64 which is incorrect so I get = issues like the following: make[1]: =E2=80=9C.../freebsd/Makefile.inc1" line 163: Unknown target = aarch64:aarch64. I expect it also breaks the powerpc and riscv native builds for the same = reason. Can you please revert until this can be fixed. Andrew=