From nobody Sun Dec 11 12:08:03 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 4NVNnH5bK8z4kNw4; Sun, 11 Dec 2022 12:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NVNnH54Wsz4B3k; Sun, 11 Dec 2022 12:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670760483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SzqHP9BQ7OvzWqDgJeMHcDpynNcd6dYms3lCkNQN86Q=; b=kxocbTJjy/Ny8Cj6JtHcJPz1IKfhAYxPh5mb5bJHLe+pmF0TYTJlpKLYt001U7lA8l8pXn wv8Z/bi0TT3FxAjZXCM4ZhpnTr36MZ7MkDxMyGB7VKm7w9Thc3akhGtF1+Ub9RISeoEDe4 mO1dbNhKFoWPiBPJvpgblQ4gEcxTL2Td5KCWmGXfD2sZjfivRcRK1zwd4biSGk42t7g00K 1i4wR4/Dmx6L7HcCOUJVopWIWEs2YxORZ/EtDPnalGyFj0twxD0gprxfaKduP+xoyyZARC HpI9czqxe7qt4V5cZ9s1KSmzfJSqlT8Qk0aK6uC6qpWFBW2qK3GtV9L4rGvfVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670760483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SzqHP9BQ7OvzWqDgJeMHcDpynNcd6dYms3lCkNQN86Q=; b=YLqR4is45NCKL6lYueLBfQhyat+SagJydazIDrnan6KsBsiovckZrsNvG4wc1GQHoBPPsJ RXb6xqWYYFnwYcEZAJOjxvP5jWGQhJYZ0NssEwEVJGT8u+TCsJU7X1puxIIwsTTmjqknc8 nDnHSCXCQzwjfDRldJY8+dHZvLoBCy2zSGc+p9n6pHy7AQhxo2TJiScQ+uCw1Q1A+G1EpD LIpWTRigshQZGu//PTxmFOUHG6zNYnvjxN/nDx2UjnvARqyDGQdy/pgB3khDs2q/FuON5i wFxGHtY0SB88TZA9Au0Ldvo5iyaAZafb1ND+B5MSQDM+5DIyaGGl8/9hJR0VBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670760483; a=rsa-sha256; cv=none; b=sZfKENCyFyjhB2sk5V3k+qGVQjgcL9L75RuBV9xm8jHJh9SbhwMhTBWSoIdvAkL3+jCEju tjvgSsyNntExBgHl1rEaNdCMLzcvUxVmalLLboTV17AXKoLRGJ0BKGVdF2F38pra7oz27x MCjnEwMP+LyFpG+g8p5BOFJrupR/FBszeH78JNnweGHTT/qGcp5oGOeye0NUCyzFXXe58b 847XT9LYm3lK+r64fExH2x31bYQztu55DFQ/G771EoLrpZajCYysCWkKlhWqGdWUs/TPBR xPTYUmWuUoCL38/JFynN+P78EZgFTxR4lpqoo2W9WNYeKXr6CRSWAWcM4q4q4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NVNnH48pLztgH; Sun, 11 Dec 2022 12:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BBC83Qt095411; Sun, 11 Dec 2022 12:08:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BBC835O095410; Sun, 11 Dec 2022 12:08:03 GMT (envelope-from git) Date: Sun, 11 Dec 2022 12:08:03 GMT Message-Id: <202212111208.2BBC835O095410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: 83bf6ab56829 - main - uname: switch machine to HW_MACHINE_ARCH 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83bf6ab568293e325f437342cdb87a626353e27c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=83bf6ab568293e325f437342cdb87a626353e27c commit 83bf6ab568293e325f437342cdb87a626353e27c Author: Piotr Kubaj AuthorDate: 2022-12-11 03:01:44 +0000 Commit: Piotr Kubaj CommitDate: 2022-12-11 12:05:39 +0000 uname: switch machine to HW_MACHINE_ARCH On powerpc64, powerpc64le and riscv64 some software wrongly assumes that it runs on powerpc or riscv (32-bit). Differential revision: https://reviews.freebsd.org/D35962 Approved by: alfredo, imp --- lib/libc/gen/__xuname.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 += namesize; - if ((p = getenv("UNAME_m"))) + if ((p = getenv("UNAME_p"))) strlcpy(q, p, namesize); else { mib[0] = CTL_HW; - mib[1] = HW_MACHINE; + mib[1] = HW_MACHINE_ARCH; len = namesize; oerrno = errno; if (sysctl(mib, 2, q, &len, NULL, 0) == -1) {