From nobody Thu Jun 22 21:11:00 2023 X-Original-To: dev-commits-src-all@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 4QnChj2c0Dz4gfP3; Thu, 22 Jun 2023 21:11:01 +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 4QnChh5LRfz48mJ; Thu, 22 Jun 2023 21:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468260; 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=Sb5jxQ26Kiy/iBVyb8eD5kTqlj1zCzbr8htWciC9WHg=; b=j68XqvH613AH8DMXW5jFfUXEzb1e61RhRyUUfpozOZq4BJRE8AHy4234VHqBE7NeiM53BM tA69adZbYHMcCTnS0MS8F4rK40ur7KSvrRvUDXWgs46uUHyEqEqROuXX9gZUljeHpNJ0Zh 1i/cui3/KWcZNRnpi8RWYqP6DGTUGiOk6gBsCLFx3u4IPNEtko+LWsP1n59o9bQ1GcLDGa M/yEgwXkq/w3opy0CEitNDI5IPbXGyWq1R0628QlTuK2w4BwmSSimL4ZtvZQGqIfpo/Lj0 g3xGpoNhX1/zinN30s7cqTeRueWHgs5oac6htEqANgMuZkRse889DcE7jIf25Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468260; 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=Sb5jxQ26Kiy/iBVyb8eD5kTqlj1zCzbr8htWciC9WHg=; b=nQk0QhkJbuUMEqL7kPxT/kB6rEO3JTxTcsUgstelqoh59j6RSwO0WEwMEpPPVmHpvtw7Sg OOg1gdAyrNU6on/7ZiR8ksbLbW6dsWj5KM1fGEqZDrlK/08aTK4ByvomgL7HIVEt8Ay3/m +WX6pgl6g/hNf752h0BJCLAvQgGqks3LvC9vSpInj4INjs5SPmJkk6lukqJ6xQLaXCnXpg ei1iv9LZHTW24MvOtCDL7EThkHnqMk3fN+eTYY/MTLDeI2yozGK+lq/pdkCOo1kr9kgJKi DSvpam00MggpPtVsiqo9082yjexEZWjIRU9qc3p0VvrusLnT8ioXaGGr+pasMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687468260; a=rsa-sha256; cv=none; b=g67i22n7G6VOMFeNaiLuLDVrHDr/bIwWe3QXF8UPmDAy3bWk+uWzRLdZ46oyW7JkP5ul/I 6Z8YrtDqpWFQxKt7YzbKugTpERstrT2OJByycpqZxEkK8SUZzzesSqnMOEFeJYYC9t1k3/ SLAFZlvgmEzkiC/YFaTSo4o+a5AKiZP5Zp4aa2Xy65pmuvR+ny0yUnwvSEc53r8wYaUplJ BURohnz7WfbGxK6ysFAjVyMt23bGSUNLMh/hNNpw8lrz5CHdKgDq6LOV2P83M9Vv28hJI3 LUDzT8NqnapuUKkJk90gk7U50OsljlYgngE/MFX7+GkAMgTQ0xSgRfR/sDHEoQ== 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 4QnChh3861zdrH; Thu, 22 Jun 2023 21:11:00 +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 35MLB0JN066140; Thu, 22 Jun 2023 21:11:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MLB0Iv066139; Thu, 22 Jun 2023 21:11:00 GMT (envelope-from git) Date: Thu, 22 Jun 2023 21:11:00 GMT Message-Id: <202306222111.35MLB0Iv066139@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: 482e0fcdf745 - main - Merge commit 16949c5c48ab from llvm-project (by Dimitry Andric): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 482e0fcdf745981f2c2b12311405fe93563cefc4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=482e0fcdf745981f2c2b12311405fe93563cefc4 commit 482e0fcdf745981f2c2b12311405fe93563cefc4 Author: Dimitry Andric AuthorDate: 2023-04-20 19:21:37 +0000 Commit: Dimitry Andric CommitDate: 2023-06-22 18:22:25 +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 --- .../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]; \