[Lldb-commits] [lldb] [lldb][debugserver] ifdef guard around newer CPU_TYPEs (PR #195225)

[via lldb-commits]

llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-lldb

Author: Jason Molenda (jasonmolenda)

<details>
<summary>Changes</summary>

The uses of the new CPU_SUBTYPEs depends on building with a newer SDK that we don't have on Intel CI bots. Put idef guards around them, debugserver won't be
working with these CPUs either way.

---
Full diff: https://github.com/llvm/llvm-project/pull/195225.diff


1 Files Affected:

- (modified) lldb/tools/debugserver/source/DNB.cpp (+6) 


``````````diff
diff --git a/lldb/tools/debugserver/source/DNB.cpp b/lldb/tools/debugserver/source/DNB.cpp
index 91b0ea2edc5d3..4febb1797def7 100644
--- a/lldb/tools/debugserver/source/DNB.cpp
+++ b/lldb/tools/debugserver/source/DNB.cpp
@@ -1880,15 +1880,21 @@ nub_bool_t DNBSetArchitecture(const char *arch) {
     else if (strstr(arch, "arm64") == arch || strstr(arch, "aarch64") == arch)
       return DNBArchProtocol::SetArchitecture(CPU_TYPE_ARM64,
                                               CPU_SUBTYPE_ARM64_ALL);
+#if defined(CPU_SUBTYPE_ARM_V8M_MAIN)
     else if (strstr(arch, "armv8m.main") == arch)
       return DNBArchProtocol::SetArchitecture(CPU_TYPE_ARM,
                                               CPU_SUBTYPE_ARM_V8M_MAIN);
+#endif
+#if defined(CPU_SUBTYPE_ARM_V8M_BASE)
     else if (strstr(arch, "armv8m.base") == arch)
       return DNBArchProtocol::SetArchitecture(CPU_TYPE_ARM,
                                               CPU_SUBTYPE_ARM_V8M_BASE);
+#endif
+#if defined(CPU_SUBTYPE_ARM_V8_1M_MAIN)
     else if (strstr(arch, "armv8.1m.main") == arch)
       return DNBArchProtocol::SetArchitecture(CPU_TYPE_ARM,
                                               CPU_SUBTYPE_ARM_V8_1M_MAIN);
+#endif
     else if (strstr(arch, "armv8") == arch)
       return DNBArchProtocol::SetArchitecture(CPU_TYPE_ARM64,
                                               CPU_SUBTYPE_ARM64_V8);

``````````

</details>


https://github.com/llvm/llvm-project/pull/195225