Merge pull request #77188 from al45tair/eng/PR-137551812-ios-fix

jckarter · web-flow · commit 4a12979584ca · 2024-10-23T08:09:00.000-10:00
[Backtracing] Fix iOS build.
diff --git a/stdlib/public/runtime/Backtrace.cpp b/stdlib/public/runtime/Backtrace.cpp
@@ -260,7 +260,7 @@ const char *presetToString(Preset preset) {
 bool isPrivileged() {
   return getauxval(AT_SECURE);
 }
-#elif defined(__APPLE__)
+#elif defined(TARGET_OS_OSX) || defined(TARGET_OS_MACCATALYST)
 bool isPrivileged() {
   if (issetugid())
     return true;
@@ -277,7 +277,7 @@ bool isPrivileged() {
 
   return !(flags & CS_GET_TASK_ALLOW);
 }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
 bool isPrivileged() {
   return issetugid();
 }

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ const char *presetToString(Preset preset) {`
`260`	`260`	`bool isPrivileged() {`
`261`	`261`	`return getauxval(AT_SECURE);`
`262`	`262`	`}`
`263`		`-#elif defined(__APPLE__)`
	`263`	`+#elif defined(TARGET_OS_OSX) \|\| defined(TARGET_OS_MACCATALYST)`
`264`	`264`	`bool isPrivileged() {`
`265`	`265`	`if (issetugid())`
`266`	`266`	`return true;`
`@@ -277,7 +277,7 @@ bool isPrivileged() {`
`277`	`277`
`278`	`278`	`return !(flags & CS_GET_TASK_ALLOW);`
`279`	`279`	`}`
`280`		`-#elif defined(__FreeBSD__) \|\| defined(__OpenBSD__)`
	`280`	`+#elif defined(__APPLE__) \|\| defined(__FreeBSD__) \|\| defined(__OpenBSD__)`
`281`	`281`	`bool isPrivileged() {`
`282`	`282`	`return issetugid();`
`283`	`283`	`}`