WIP: Test sys/ucontext.h

dotnet · Nov 20, 2024 · a3e1a72 · a3e1a72
1 parent 1474fc3
commit a3e1a72
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/src/coreclr/nativeaot/CMakeLists.txt b/src/coreclr/nativeaot/CMakeLists.txt
@@ -20,7 +20,6 @@ if(CLR_CMAKE_HOST_UNIX)
   add_compile_options(-nostdlib)
 
   if(CLR_CMAKE_TARGET_APPLE)
-    add_definitions(-D_XOPEN_SOURCE)
     add_definitions(-DFEATURE_OBJCMARSHAL)
   endif(CLR_CMAKE_TARGET_APPLE)
 

diff --git a/src/coreclr/nativeaot/Runtime/unix/UnixContext.h b/src/coreclr/nativeaot/Runtime/unix/UnixContext.h
@@ -4,7 +4,7 @@
 #ifndef __UNIX_CONTEXT_H__
 #define __UNIX_CONTEXT_H__
 
-#include <ucontext.h>
+#include <sys/ucontext.h>
 
 // Convert Unix native context to PAL_LIMITED_CONTEXT
 void NativeContextToPalContext(const void* context, PAL_LIMITED_CONTEXT* palContext);

diff --git a/src/coreclr/pal/src/configure.cmake b/src/coreclr/pal/src/configure.cmake
@@ -615,7 +615,7 @@ endif()
 
 check_c_source_compiles("
 #include <libunwind.h>
-#include <ucontext.h>
+#include <sys/ucontext.h>
 int main(int argc, char **argv)
 {
         unw_context_t libUnwindContext;

diff --git a/src/coreclr/pal/src/include/pal/context.h b/src/coreclr/pal/src/include/pal/context.h
@@ -33,9 +33,7 @@ extern "C"
 /* A type to wrap the native context type, which is ucontext_t on some
  * platforms and another type elsewhere. */
 #if HAVE_UCONTEXT_T
-#if HAVE_UCONTEXT_H
-#include <ucontext.h>
-#endif // HAVE_UCONTEXT_H
+#include <sys/ucontext.h>
 
 typedef ucontext_t native_context_t;
 #else   // HAVE_UCONTEXT_T

diff --git a/src/native/external/libunwind/include/libunwind-aarch64.h b/src/native/external/libunwind/include/libunwind-aarch64.h
@@ -34,9 +34,13 @@ extern "C" {
 
 #include <inttypes.h>
 #include <stddef.h>
-#include <ucontext.h>
 #include <stdalign.h>
 #include <stdint.h>
+#ifdef __APPLE__
+#include <sys/ucontext.h>
+#else
+#include <ucontext.h>
+#endif
 
 #ifndef UNW_EMPTY_STRUCT
 #  define UNW_EMPTY_STRUCT uint8_t unused;

diff --git a/src/native/external/libunwind/include/libunwind-x86_64.h b/src/native/external/libunwind/include/libunwind-x86_64.h
@@ -35,7 +35,11 @@ extern "C" {
 #include <sys/types.h>
 #include <inttypes.h>
 #include <stdint.h>
+#ifdef __APPLE__
+#include <sys/ucontext.h>
+#else
 #include <ucontext.h>
+#endif
 
 #ifndef UNW_EMPTY_STRUCT
 #  define UNW_EMPTY_STRUCT uint8_t unused;