From nobody Mon Dec 20 18:10:38 2021 X-Original-To: dev-commits-src-branches@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 05131190252F; Mon, 20 Dec 2021 18:10:39 +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 4JHngy38XBz4ZkC; Mon, 20 Dec 2021 18:10:38 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2C20B1ACA5; Mon, 20 Dec 2021 18:10:38 +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 1BKIAcLj074428; Mon, 20 Dec 2021 18:10:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BKIAc6a074427; Mon, 20 Dec 2021 18:10:38 GMT (envelope-from git) Date: Mon, 20 Dec 2021 18:10:38 GMT Message-Id: <202112201810.1BKIAc6a074427@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 6a203741add4 - stable/12 - riscv: fix uintfptr_t List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 6a203741add42a82f6942a6a313ddf935d95ea9f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640023838; 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=5ej9ApJaHmy8e42RtMcX6/Q+QvYvSf2ORWrPSa6E69o=; b=FDWEctbndrGUwnMentYCt/HCS7yrpt2mmNAR7vBdJbvBqVfJoYJtLA36y05du6kZRtFfBW gjenboEm2r+4ZMPI8dORg0x4c1OiCGMGDzSwstS8NA7HfDIOn5/TTUU9cZls/F6iq5wiaf lkl04dnhd+yTVnagE2ktF6laHxFQND4lP7D7dRzong/5d6OALynPQKZtA5ChfMd+NaYhXP EkhIHut8ptGVzCfR4lQ09eWfutk0BC1IbdYmg2lD9TNrWIVvcp+StiI/CkRsgr3A+U4I4+ AOoD2mIQpvneQBSRFRiX2SE/hs1qNFCKaAnehmRrR9pcE/8eINbBU3kWkIHrvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640023838; a=rsa-sha256; cv=none; b=mbSTJjx7WNGN+z0nUEi+IIHv5AaAyZIw95TvzZOxUtNivcxruLryFBl5X2O8OmKm6BbZDj WKAIE2hC841CcDyeq+qFyxr17EcjtKcHQTHiVXWJxFkap7xugSAgyKNPY8Yk53qlRuQcr0 LM+QAxbJNlRv+vR5XXtz6fhcDR6vX0+Y9R52sFMKqx0kt62GE+UYoZDDWmU9tJjV2RqC1l lf6UUM0pG4wVKHpiaOOuKluHHUf8soxL8yZ8TBL6vpkReWajXhuhxMAVXB4inpTYI/WckA 1w/Tt8TIYINfkmkys7juqZmFoCYvZ9ZyFhkp5sg40tNF1lUhB+bHfXI2hm0Jiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=6a203741add42a82f6942a6a313ddf935d95ea9f commit 6a203741add42a82f6942a6a313ddf935d95ea9f Author: Mateusz Guzik AuthorDate: 2020-08-05 22:09:40 +0000 Commit: Mateusz Guzik CommitDate: 2021-12-20 18:10:23 +0000 riscv: fix uintfptr_t Fixes compilation after r363932 (cherry picked from commit 9ce4656a1ffff4f0b874d8eb8e242378ff906643) Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/riscv/include/profile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/riscv/include/profile.h b/sys/riscv/include/profile.h index 087af0504c75..edfcbd31b73a 100644 --- a/sys/riscv/include/profile.h +++ b/sys/riscv/include/profile.h @@ -70,7 +70,7 @@ void mcount(uintfptr_t frompc, uintfptr_t selfpc); #else /* !_KERNEL */ -typedef unsigned long long uintfptr_t; +typedef __uintfptr_t uintfptr_t; #define _MCOUNT_DECL void mcount #define MCOUNT