Skip to content

Commit b5a84e2

Browse files
committed
[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.
1 parent 25dade5 commit b5a84e2

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

lldb/tools/debugserver/source/MacOSX/MachProcess.mm

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2684,10 +2684,6 @@ static bool FBSAddEventDataToOptions(NSMutableDictionary *options,
26842684

26852685
bool MachProcess::GetOSVersionNumbers(uint64_t *major, uint64_t *minor,
26862686
uint64_t *patch) {
2687-
#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \
2688-
(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101000)
2689-
return false;
2690-
#else
26912687
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
26922688

26932689
NSOperatingSystemVersion vers =
@@ -2702,7 +2698,6 @@ static bool FBSAddEventDataToOptions(NSMutableDictionary *options,
27022698
[pool drain];
27032699

27042700
return true;
2705-
#endif
27062701
}
27072702

27082703
std::string MachProcess::GetMacCatalystVersionString() {

lldb/tools/debugserver/source/RNBRemote.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ uint64_t decode_uint64(const char *p, int base, char **end = nullptr,
149149
extern void ASLLogCallback(void *baton, uint32_t flags, const char *format,
150150
va_list args);
151151

152-
#if defined(__APPLE__) && \
153-
(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101000)
154152
// from System.framework/Versions/B/PrivateHeaders/sys/codesign.h
155153
extern "C" {
156154
#define CS_OPS_STATUS 0 /* return status */
@@ -165,7 +163,6 @@ typedef uint32_t csr_config_t;
165163
#define CSR_ALLOW_TASK_FOR_PID (1 << 2)
166164
int csr_check(csr_config_t mask);
167165
}
168-
#endif
169166

170167
RNBRemote::RNBRemote()
171168
: m_ctx(), m_comm(), m_arch(), m_continue_thread(-1), m_thread(-1),

0 commit comments

Comments
 (0)