From nobody Sun Jul 23 11:02:11 2023 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 4R80jv605Zz4pVxL; Sun, 23 Jul 2023 11:02:11 +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 4R80jv3y60z3vMX; Sun, 23 Jul 2023 11:02:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690110131; 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=JLvo243gvtsjHFroos/atzCoklg7W/xAKRkzpCp7Q2M=; b=WKq0J900SEqYCLofhtrZKMhsRj/UePWLsfbM2QqycvnICpujQ70SPBGL6fu65tHFvUmWeS D4RQim7DUlwlzXe5R+09LCTFvOw9e11GpXhL3tdTay9+fUDpLZjEDdNe6/GTyN+0xnvUl6 yGwkVURqmMULY3J62yFEHvy5opZXVGqtTzrk18reI0U+VdXkuXGnxBjTH/tYhWPurbuc6e +qrajhcWnvcPQp6fsLY8BUpiAIKlUnE6EqNoW4xKqEWA5WvjBMMw+PvYaK0O6pfzR2dtbs WDPR7BCGTstPaxPS0acueWb+gUHviuqEdFpel5zfaH4YAc+u6b9zZhT2T6mOrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690110131; 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=JLvo243gvtsjHFroos/atzCoklg7W/xAKRkzpCp7Q2M=; b=Eccn6fMNEWjo+n28Vily16OJtx+0ddE2Icy4vaEfE8IIX9NFEW7A+sxBh7UkVY4OhZ33MQ KMT6+1EbWa1Oe5dNphIpUDWakcf0VdiB15eB0lWTJLSLJAocFPKDKBJXbZPHAzRyGlaJA5 NRGJspgeuL58rhligXKl6enmnkZezZHM4qa0zuIH7vJ/TXdwC7eWz56QDR8d3EVtYpjRdl rO0Q/aKgCxg4aeGa0DLc8KQTzQJxaeEabB3jPqnMrE+5UjBsg12wabDl/1oOVrZAMBKqFq N8so55IOqp+6PpzPPmrVNnejwzbJlW5WBE2M3iMXt/HAgX2ULk/Eh5YbC9EHRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690110131; a=rsa-sha256; cv=none; b=p7Tqdx0USj7utX3Pm/62hRgu8sOy9Pxs27SbcIzha8+20gLIkGoFQFqJ/f/tBKPgToF1x3 lMj4kI+e5port6vK0QWiAJxzkuJHlvmGK40KW84afnQjbhgbS/Mlhw2kxGImkN5sEr/r3F w5vB3QymbTnM4HoUwyj5WxdYQhQpL4mG3HC+5c7Al3exossLCBGhzyfM9c8kXlPKUojXjt R+GoZuxRnz+ymhevM4L4Z/gFjDaGLkjKmQbI5Bjd7+UDYM7uXkj5sgPZBAMTr/O9qzcqPf 54vrXyo5a2OIsDG+seTm6jZEl578T1IDw/tRR/a2vJTsftnnMrMXDv7pgpHU5g== 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 4R80jv0mBZzYV2; Sun, 23 Jul 2023 11:02:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36NB2Blr026631; Sun, 23 Jul 2023 11:02:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NB2B8C026630; Sun, 23 Jul 2023 11:02:11 GMT (envelope-from git) Date: Sun, 23 Jul 2023 11:02:11 GMT Message-Id: <202307231102.36NB2B8C026630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: b8f1c9dd9b3d - main - Merge commit 2b0f5df7b4e0 from llvm-project (by Jessica Clarke): 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8f1c9dd9b3dd9b91e6999b28ab941a2af142702 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b8f1c9dd9b3dd9b91e6999b28ab941a2af142702 commit b8f1c9dd9b3dd9b91e6999b28ab941a2af142702 Author: Dimitry Andric AuthorDate: 2023-07-23 11:01:42 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 11:01:42 +0000 Merge commit 2b0f5df7b4e0 from llvm-project (by Jessica Clarke): [builtins][Mips] Un-break FreeBSD build of __clear_cache Commit 674a17e9bbe8 ("MIPS/compiler_rt: use synci to flush icache on r6") completely removed the OS-specific guards under the guise of "For pre-r6, we can use cacheflush libc function, which is same on Linux and FreeBSD." However, the code in question had guards for Linux and OpenBSD, not Linux and FreeBSD, and FreeBSD does not have a cacheflush libc function as claimed, so this was neither the statement they intended to make nor was it sufficient justification for making the code completely unconditional. Whilst the upcoming FreeBSD 14 release has dropped support for MIPS, FreeBSD 13 has support for it. Fix this by only calling cacheflush on the OSes where it was previously called, and not on other OSes where it either definitely isn't available (FreeBSD) or is unknown (any other OS than the three mentioned in this commit). This is only needed for MFC'ing, as mips has been removed from 14-CURRENT. PR: 271047 MFC after: immediately --- contrib/llvm-project/compiler-rt/lib/builtins/clear_cache.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/clear_cache.c b/contrib/llvm-project/compiler-rt/lib/builtins/clear_cache.c index 8993761eb3d4..54cbda059315 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/clear_cache.c +++ b/contrib/llvm-project/compiler-rt/lib/builtins/clear_cache.c @@ -110,10 +110,14 @@ void __clear_cache(void *start, void *end) { "jr.hb $at\n" "move $at, $0\n" ".set at"); -#else +#elif defined(__linux__) || defined(__OpenBSD__) // Pre-R6 may not be globalized. And some implementations may give strange // synci_step. So, let's use libc call for it. cacheflush(start, end_int - start_int, BCACHE); +#else + (void)start_int; + (void)end_int; + compilerrt_abort(); #endif } #elif defined(__aarch64__) && !defined(__APPLE__)