From 59f14ac45408d557bd6b423e7a9c175adc85e125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Mon, 17 Oct 2022 14:47:34 +0200
Subject: [PATCH] NativeAOT: remove some headers that are not needed (#77042)

* NativeAOT: remove some headers that are not needed

* Remove HAVE_UCONTEXT_T too
---
 .../nativeaot/Runtime/unix/PalRedhawkUnix.cpp | 20 -------------------
 .../nativeaot/Runtime/unix/config.h.in        |  4 ----
 .../nativeaot/Runtime/unix/configure.cmake    |  5 -----
 3 files changed, 29 deletions(-)

diff --git a/src/coreclr/nativeaot/Runtime/unix/PalRedhawkUnix.cpp b/src/coreclr/nativeaot/Runtime/unix/PalRedhawkUnix.cpp
index ce7cf86ee7f..83c11750927 100644
--- a/src/coreclr/nativeaot/Runtime/unix/PalRedhawkUnix.cpp
+++ b/src/coreclr/nativeaot/Runtime/unix/PalRedhawkUnix.cpp
@@ -48,26 +48,6 @@
 #include <lwp.h>
 #endif
 
-#if HAVE_SYS_VMPARAM_H
-#include <sys/vmparam.h>
-#endif  // HAVE_SYS_VMPARAM_H
-
-#if HAVE_MACH_VM_TYPES_H
-#include <mach/vm_types.h>
-#endif // HAVE_MACH_VM_TYPES_H
-
-#if HAVE_MACH_VM_PARAM_H
-#include <mach/vm_param.h>
-#endif  // HAVE_MACH_VM_PARAM_H
-
-#ifdef __APPLE__
-#include <mach/vm_statistics.h>
-#include <mach/mach_types.h>
-#include <mach/mach_init.h>
-#include <mach/mach_host.h>
-#include <mach/mach_port.h>
-#endif // __APPLE__
-
 #if HAVE_CLOCK_GETTIME_NSEC_NP
 #include <time.h>
 #endif
diff --git a/src/coreclr/nativeaot/Runtime/unix/config.h.in b/src/coreclr/nativeaot/Runtime/unix/config.h.in
index 5ae3735d9bd..702922c34ea 100644
--- a/src/coreclr/nativeaot/Runtime/unix/config.h.in
+++ b/src/coreclr/nativeaot/Runtime/unix/config.h.in
@@ -1,9 +1,6 @@
 #ifndef _PAL_CONFIG_H_INCLUDED
 #define _PAL_CONFIG_H_INCLUDED 1
 
-#cmakedefine01 HAVE_SYS_VMPARAM_H
-#cmakedefine01 HAVE_MACH_VM_TYPES_H
-#cmakedefine01 HAVE_MACH_VM_PARAM_H
 #cmakedefine01 HAVE_AUXV_HWCAP_H
 
 #cmakedefine01 HAVE_PTHREAD_ATTR_GET_NP
@@ -18,7 +15,6 @@
 #cmakedefine01 HAVE___GREGSET_T
 
 #cmakedefine01 HAVE_SIGINFO_T
-#cmakedefine01 HAVE_UCONTEXT_T
 
 #cmakedefine01 HAVE_LWP_SELF
 #cmakedefine01 HAVE_SCHED_GETCPU
diff --git a/src/coreclr/nativeaot/Runtime/unix/configure.cmake b/src/coreclr/nativeaot/Runtime/unix/configure.cmake
index d93449c7940..952fb384acd 100644
--- a/src/coreclr/nativeaot/Runtime/unix/configure.cmake
+++ b/src/coreclr/nativeaot/Runtime/unix/configure.cmake
@@ -15,9 +15,6 @@ endif()
 
 list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_FILE_OFFSET_BITS=64)
 
-check_include_files(sys/vmparam.h HAVE_SYS_VMPARAM_H)
-check_include_files(mach/vm_types.h HAVE_MACH_VM_TYPES_H)
-check_include_files(mach/vm_param.h HAVE_MACH_VM_PARAM_H)
 check_include_files("sys/auxv.h;asm/hwcap.h" HAVE_AUXV_HWCAP_H)
 
 check_library_exists(pthread pthread_create "" HAVE_LIBPTHREAD)
@@ -44,8 +41,6 @@ set(CMAKE_EXTRA_INCLUDE_FILES)
 set(CMAKE_EXTRA_INCLUDE_FILES signal.h)
 check_type_size(siginfo_t SIGINFO_T)
 set(CMAKE_EXTRA_INCLUDE_FILES)
-set(CMAKE_EXTRA_INCLUDE_FILES ucontext.h)
-check_type_size(ucontext_t UCONTEXT_T)
 
 check_cxx_source_compiles("
 #include <lwp.h>
-- 
GitLab