From nobody Tue Jan 25 19:38:57 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 7F19B196B496; Tue, 25 Jan 2022 19:38:57 +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 4JjxxF36yMz4rQj; Tue, 25 Jan 2022 19:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643139537; 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=4McwoAu0tUQ+WJJDLL+qfyDxODBUeCJaqcwiuAF8+rg=; b=vDeHWEOVor3/aMD8sxZKa5RM6DmQ8M/4Jidse3veYg6uY3e2mUudYWYbIryXBxKUyvknyk Xk47ccay7iGeqPOjZ5O7hYo7+JItKylzOuyPLpe6iQivBiSNi2cnu4EDsMnmg6anDEdquJ Y5EuXH5YCIEVxKlcj296X8KYTNM/9rsDafZety2TbqjPCenGoNLOGTxjpzzY5Ma4OUcINU RGsCWzjHUdInkpTquCn+smcICK7BEteqoHOtefSypd8VyXvrI7kk4/Cth4gKwmKNJWzvkN bhBaPKplXbXY448VYA7QnwLbacnhXrBFSau1NCJlZwJVYedyiMAX9IniGi1aHw== 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 4B169790F; Tue, 25 Jan 2022 19:38:57 +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 20PJcvw7091349; Tue, 25 Jan 2022 19:38:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20PJcv2X091348; Tue, 25 Jan 2022 19:38:57 GMT (envelope-from git) Date: Tue, 25 Jan 2022 19:38:57 GMT Message-Id: <202201251938.20PJcv2X091348@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0a902e4261bb - main - Stop trimming 'hf' suffixes from 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a902e4261bb2c10a148f1dab5f3e1f4ae8741f8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643139537; 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=4McwoAu0tUQ+WJJDLL+qfyDxODBUeCJaqcwiuAF8+rg=; b=Fen17MnRpuzGmaPp5UAfTTCPGH7MRvq4nTjvbYi56jdvEdOyyL9/lTxx7S59LBl3QyG+6V ERzZBYaEOYzVcdg85ZA0n6ybA8z/lbf5Ynj90NDoUpykHYulbe8YCzrU6BHHLRmkd4vOzE rxIZKYqZxMkn73jKtL8E7U1EzldTvLt1LZY5lKnZIYB5zZWbez7QJ42MZjKunNiN1Wle/k JswsVcXtpDePPn8T4vpJCdWaxQsQhTAkqXmWAiyu3gI0pBdWfBnq01SpG5f0wJW0g5VJbI IkmA734u5U1TOQ8ebYcaGGML4wjGmjwiyimn/9pvcjNYS1Jx99pn3JC6+2tIZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643139537; a=rsa-sha256; cv=none; b=wbgOlyQxlZ/9WzgssghVnAYBHLft1zPQNrw/JhuI8gazI+kLxTNozGvq4H1pnMc9cEGpE3 5TiZni2o0sOfaEUxPES8KdJOpqtmd4ddz8utQyCz6aTyV5x04iWhQFAuH5Xa+lsS6cW4eL gFOOjffaSut7TLYJG8h1hszvDLeIGr/P4ESAGwIaAZwxzCbciu4jKfaZ4puMMhWmpzwmLQ kdSzlx1pkcX56makPjY2WKxR0/h8/lwVDnxjmESpID0CX7WDyu1geWLre7gkcpL6xVKb5G xoIdcWM6e1wd9kWPVuBLakN1P+eVPWLo+keFufizNYQexM/fUJfH0U6TgJcj3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0a902e4261bb2c10a148f1dab5f3e1f4ae8741f8 commit 0a902e4261bb2c10a148f1dab5f3e1f4ae8741f8 Author: John Baldwin AuthorDate: 2022-01-25 19:31:17 +0000 Commit: John Baldwin CommitDate: 2022-01-25 19:31:17 +0000 Stop trimming 'hf' suffixes from MACHINE_ARCH. This was only used for MIPS hard-float architectures. Reviewed by: imp Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D34018 --- Makefile.inc1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 9a9d6586ddfc..dc102d63e4ae 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -138,9 +138,9 @@ TARGET_ABI= gnueabi .endif .endif MACHINE_ABI?= unknown -MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//}-${MACHINE_ABI}-freebsd14.0 +MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/sf$//}-${MACHINE_ABI}-freebsd14.0 TARGET_ABI?= unknown -TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//}-${TARGET_ABI}-freebsd14.0 +TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/sf$//}-${TARGET_ABI}-freebsd14.0 KNOWN_ARCHES?= aarch64/arm64 \ amd64 \ armv6/arm \