[clang] [llvm] Fixes to unblock building LLVM and Clang as Arm64EC (PR #150068)

[via cfe-commits]

github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. 
:warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff HEAD~1 HEAD --extensions cpp -- 
llvm/lib/TargetParser/Host.cpp llvm/tools/llvm-exegesis/lib/X86/Target.cpp
``````````

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/llvm/lib/TargetParser/Host.cpp b/llvm/lib/TargetParser/Host.cpp
index 6d089df03..8ce8a0e45 100644
--- a/llvm/lib/TargetParser/Host.cpp
+++ b/llvm/lib/TargetParser/Host.cpp
@@ -587,8 +587,9 @@ StringRef sys::detail::getHostCPUNameForBPF() {
 #endif
 }
 
-#if (defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) ||           
 \
-    defined(_M_X64)) && !defined(_M_ARM64EC)
+#if (defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) ||           
\
+     defined(_M_X64)) &&                                                       
\
+    !defined(_M_ARM64EC)
 
 /// getX86CpuIDAndInfo - Execute the specified cpuid and return the 4 values in
 /// the specified arguments.  If we can't run cpuid on the host, return true.
@@ -1853,8 +1854,9 @@ VendorSignatures getVendorSignature(unsigned *MaxLeaf) {
 } // namespace llvm
 #endif
 
-#if (defined(__i386__) || defined(_M_IX86) || \
-    defined(__x86_64__) || defined(_M_X64)) && !defined(_M_ARM64EC)
+#if (defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) ||           
\
+     defined(_M_X64)) &&                                                       
\
+    !defined(_M_ARM64EC)
 StringMap<bool> sys::getHostCPUFeatures() {
   unsigned EAX = 0, EBX = 0, ECX = 0, EDX = 0;
   unsigned MaxLevel;
@@ -2067,7 +2069,8 @@ StringMap<bool> sys::getHostCPUFeatures() {
 
   return Features;
 }
-#elif defined(__linux__) && (defined(__arm__) || defined(__aarch64__) || 
defined(__arm64ec__))
+#elif defined(__linux__) &&                                                    
\
+    (defined(__arm__) || defined(__aarch64__) || defined(__arm64ec__))
 StringMap<bool> sys::getHostCPUFeatures() {
   StringMap<bool> Features;
   std::unique_ptr<llvm::MemoryBuffer> P = getProcCpuinfoContent();
diff --git a/llvm/tools/llvm-exegesis/lib/X86/Target.cpp 
b/llvm/tools/llvm-exegesis/lib/X86/Target.cpp
index f6022b6bd..5dae6c0a2 100644
--- a/llvm/tools/llvm-exegesis/lib/X86/Target.cpp
+++ b/llvm/tools/llvm-exegesis/lib/X86/Target.cpp
@@ -30,7 +30,8 @@
 #include <memory>
 #include <string>
 #include <vector>
-#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) && 
!defined(_M_ARM64EC)
+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) &&              
\
+    !defined(_M_ARM64EC)
 #include <immintrin.h>
 #include <intrin.h>
 #endif
@@ -824,8 +825,9 @@ private:
       // For now, only do the check if we see an Intel machine because
       // the counter uses some intel-specific magic and it could
       // be confuse and think an AMD machine actually has LBR support.
-#if (defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) ||           
 \
-    defined(_M_X64)) && !defined(_M_ARM64EC)
+#if (defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) ||           
\
+     defined(_M_X64)) &&                                                       
\
+    !defined(_M_ARM64EC)
     using namespace sys::detail::x86;
 
     if (getVendorSignature() == VendorSignatures::GENUINE_INTEL)

``````````

</details>


https://github.com/llvm/llvm-project/pull/150068
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits