From b5a84e214d49c56d13dc1fb76273f575e6752c68 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Thu, 15 Jul 2021 23:16:43 -0700 Subject: [PATCH] [debugserver] Un-conditionalize code guarded by macOS 10.10 checks We've been requiring macOS 10.11 since 2018 so there's no point in keeping code for 10.10 around. --- lldb/tools/debugserver/source/MacOSX/MachProcess.mm | 5 ----- lldb/tools/debugserver/source/RNBRemote.cpp | 3 --- 2 files changed, 8 deletions(-) diff --git a/lldb/tools/debugserver/source/MacOSX/MachProcess.mm b/lldb/tools/debugserver/source/MacOSX/MachProcess.mm index 7eab2c6..9ab33cc 100644 --- a/lldb/tools/debugserver/source/MacOSX/MachProcess.mm +++ b/lldb/tools/debugserver/source/MacOSX/MachProcess.mm @@ -2684,10 +2684,6 @@ MachProcess::GetGenealogyImageInfo(size_t idx) { bool MachProcess::GetOSVersionNumbers(uint64_t *major, uint64_t *minor, uint64_t *patch) { -#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \ - (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101000) - return false; -#else NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSOperatingSystemVersion vers = @@ -2702,7 +2698,6 @@ bool MachProcess::GetOSVersionNumbers(uint64_t *major, uint64_t *minor, [pool drain]; return true; -#endif } std::string MachProcess::GetMacCatalystVersionString() { diff --git a/lldb/tools/debugserver/source/RNBRemote.cpp b/lldb/tools/debugserver/source/RNBRemote.cpp index 7273d35..fdf97ca 100644 --- a/lldb/tools/debugserver/source/RNBRemote.cpp +++ b/lldb/tools/debugserver/source/RNBRemote.cpp @@ -149,8 +149,6 @@ uint64_t decode_uint64(const char *p, int base, char **end = nullptr, extern void ASLLogCallback(void *baton, uint32_t flags, const char *format, va_list args); -#if defined(__APPLE__) && \ - (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101000) // from System.framework/Versions/B/PrivateHeaders/sys/codesign.h extern "C" { #define CS_OPS_STATUS 0 /* return status */ @@ -165,7 +163,6 @@ typedef uint32_t csr_config_t; #define CSR_ALLOW_TASK_FOR_PID (1 << 2) int csr_check(csr_config_t mask); } -#endif RNBRemote::RNBRemote() : m_ctx(), m_comm(), m_arch(), m_continue_thread(-1), m_thread(-1), -- 2.7.4