From nobody Sun Jul 23 18:27:03 2023 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 4R8BbC5vfbz4p65J; Sun, 23 Jul 2023 18:27: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 4R8BbC3mNRz3RDh; Sun, 23 Jul 2023 18:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136823; 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=PXuS418JWtVCrSQqIIA5Y3zXHpweiOLfjLGeQBu/svM=; b=Vee4h86kELURqEq3IVdchrId9+6jucdIPxrp9DlI6317LfnQZfaLyPduVpFSIUXzo4KQNn AJr/rj/DfFqJ0I2Rr6mqjOonp+GjI3xSOxfCNG5gjRc8eDRxGKJRtzuCGYFWq2nf+KGg/D 2MK5USsCr2t1d4YbIZOllKn7DrLDC0Y5MQ2S5yDKQyzCraF9DHOC/tt7Li1ZeddHpUUbRa hLaPdOsfVp7Ob8iBSggxobo6bJplAIhtbIO1YMTf28gSE+he+5Irh+Jdylfb2jVG8J/Uwa XN4dHw8I2JxTODIZeIz9OkY8YqclqEZpddH3Etb+wISOpG/7zAv9NgVGfrMh9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136823; 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=PXuS418JWtVCrSQqIIA5Y3zXHpweiOLfjLGeQBu/svM=; b=ADr3/tTZRwe0k6TM/HXG+NNXlGiExuy6njQ6SWvtFrBSEQZ+8GBKx1dXIEnhB5hXtWSoSD YOn08M+uOMd4k6gwZOJJFJeIxbHnfOCOFToPWNT7F57V8gYCnp7kxVoqVkzYyQSI1GHUOK mal2OB9mvyZ5V8D+cxa5H+VA/uljm1v0MH8fsLpjMgrfYmcWy8dv2MiptuyTwYC7OA4QP7 B5jGJD9J/J04+dwnsipq26PbwIIzDCH2a3hi7a16ww9IAaoheW5Y8mcl4ODaq7bauCujRK YczQWR9zJgmdajWBvaM36nPUYNSM+85v8lH/M0Yi+w3MvJa7Rq+qVyJJd0w5qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136823; a=rsa-sha256; cv=none; b=h4At5AU8L+3Tj4PGF0w+Oj2iXe5XT7GSA8oseNm4o6g5+4wTxVIr79SLLVJHJo+hqXApvB ejvJQtlFAIBISj6P/h6wiwa3/AUE+0I75oWoH/e3SHVQix+FtjiNph14OdU8LbfCew9MTp TauE4YeTSzKORCbr6OotMLJkxhboicqXYP+sXHIT7Qm05AZgq71R4vBaoikxqkBI4c9JZH tfcSowNp6NnjuY+h7sKbQIDlVd8hSMw8tBMYV/nHQOMNg23a7UeaAC0LoGkmNSej+yvOTB R13Kc2dJTvUxI/sXDoOqSgLkylH5nxdzJNyHg5vuKYo//3hj2SjYgRspBlo+Tg== 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 4R8BbC2tQ2zmqm; Sun, 23 Jul 2023 18:27:03 +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 36NIR3q3058663; Sun, 23 Jul 2023 18:27:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIR3Zg058662; Sun, 23 Jul 2023 18:27:03 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:03 GMT Message-Id: <202307231827.36NIR3Zg058662@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 9f57b84aa13e - stable/13 - Merge commit 16949c5c48ab from llvm-project (by Dimitry Andric): 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9f57b84aa13e6a0c8956bdbb9d07eceec4c9bc21 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9f57b84aa13e6a0c8956bdbb9d07eceec4c9bc21 commit 9f57b84aa13e6a0c8956bdbb9d07eceec4c9bc21 Author: Dimitry Andric AuthorDate: 2023-04-20 19:21:37 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:09 +0000 Merge commit 16949c5c48ab from llvm-project (by Dimitry Andric): [compiler-rt] Include system headers before optionally defining HWCAP macros In https://reviews.llvm.org/D141285 the optional definitions of `HWCAP` macros were moved to before their usage. However, they were also moved to before the inclusion of system headers which can optionally define them. If any of those system headers then actually defined any of the `HWCAP` macros, it would result in a redefinition error. Move the system header includes to just before the optional definitions, to avoid this problem. Reviewed By: ilinpv Differential Revision: https://reviews.llvm.org/D148819 PR: 271047 MFC after: 1 month (cherry picked from commit 482e0fcdf745981f2c2b12311405fe93563cefc4) --- .../compiler-rt/lib/builtins/cpu_model.c | 38 +++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/cpu_model.c b/contrib/llvm-project/compiler-rt/lib/builtins/cpu_model.c index f5ad530c7e88..f2dcd974008c 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/cpu_model.c +++ b/contrib/llvm-project/compiler-rt/lib/builtins/cpu_model.c @@ -839,6 +839,25 @@ int CONSTRUCTOR_ATTRIBUTE __cpu_indicator_init(void) { } #elif defined(__aarch64__) +// LSE support detection for out-of-line atomics +// using HWCAP and Auxiliary vector +_Bool __aarch64_have_lse_atomics + __attribute__((visibility("hidden"), nocommon)); + +#if defined(__has_include) +#if __has_include() +#include +#if __has_include() +#include + +#if defined(__ANDROID__) +#include +#include +#elif defined(__Fuchsia__) +#include +#include +#endif + #ifndef AT_HWCAP #define AT_HWCAP 16 #endif @@ -1009,25 +1028,6 @@ int CONSTRUCTOR_ATTRIBUTE __cpu_indicator_init(void) { #define HWCAP2_SVE_EBF16 (1UL << 33) #endif -// LSE support detection for out-of-line atomics -// using HWCAP and Auxiliary vector -_Bool __aarch64_have_lse_atomics - __attribute__((visibility("hidden"), nocommon)); - -#if defined(__has_include) -#if __has_include() -#include -#if __has_include() -#include - -#if defined(__ANDROID__) -#include -#include -#elif defined(__Fuchsia__) -#include -#include -#endif - // Detect Exynos 9810 CPU #define IF_EXYNOS9810 \ char arch[PROP_VALUE_MAX]; \