diff --git a/eng/native/tryrun.cmake b/eng/native/tryrun.cmake index 18f37058f5a..c0fe823dd78 100644 --- a/eng/native/tryrun.cmake +++ b/eng/native/tryrun.cmake @@ -49,14 +49,12 @@ endif() if(DARWIN) if(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$") - set_cache_value(FILE_OPS_CHECK_FERROR_OF_PREVIOUS_CALL_EXITCODE 1) set_cache_value(HAS_POSIX_SEMAPHORES_EXITCODE 1) set_cache_value(HAVE_BROKEN_FIFO_KEVENT_EXITCODE 1) set_cache_value(HAVE_BROKEN_FIFO_SELECT_EXITCODE 1) set_cache_value(HAVE_CLOCK_MONOTONIC_COARSE_EXITCODE 1) set_cache_value(HAVE_CLOCK_MONOTONIC_EXITCODE 0) set_cache_value(HAVE_CLOCK_REALTIME_EXITCODE 0) - set_cache_value(HAVE_CLOCK_THREAD_CPUTIME_EXITCODE 0) set_cache_value(HAVE_CLOCK_GETTIME_NSEC_NP_EXITCODE 0) set_cache_value(HAVE_FUNCTIONAL_PTHREAD_ROBUST_MUTEXES_EXITCODE 1) set_cache_value(HAVE_MMAP_DEV_ZERO_EXITCODE 1) @@ -72,18 +70,15 @@ if(DARWIN) set_cache_value(PTHREAD_CREATE_MODIFIES_ERRNO_EXITCODE 1) set_cache_value(REALPATH_SUPPORTS_NONEXISTENT_FILES_EXITCODE 1) set_cache_value(SEM_INIT_MODIFIES_ERRNO_EXITCODE 1) - set_cache_value(UNGETC_NOT_RETURN_EOF_EXITCODE 1) set_cache_value(HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP_EXITCODE 1) else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm64 or x64 is supported for OSX cross build!") endif() elseif(TARGET_ARCH_NAME MATCHES "^(armel|arm|armv6|arm64|loongarch64|riscv64|s390x|ppc64le|x86|x64)$" OR FREEBSD OR ILLUMOS OR TIZEN OR HAIKU) - set_cache_value(FILE_OPS_CHECK_FERROR_OF_PREVIOUS_CALL_EXITCODE 1) set_cache_value(HAS_POSIX_SEMAPHORES_EXITCODE 0) set_cache_value(HAVE_CLOCK_MONOTONIC_COARSE_EXITCODE 0) set_cache_value(HAVE_CLOCK_MONOTONIC_EXITCODE 0) set_cache_value(HAVE_CLOCK_REALTIME_EXITCODE 0) - set_cache_value(HAVE_CLOCK_THREAD_CPUTIME_EXITCODE 0) set_cache_value(HAVE_MMAP_DEV_ZERO_EXITCODE 0) set_cache_value(HAVE_PROCFS_CTL_EXITCODE 1) set_cache_value(HAVE_PROCFS_STAT_EXITCODE 0) @@ -97,13 +92,10 @@ elseif(TARGET_ARCH_NAME MATCHES "^(armel|arm|armv6|arm64|loongarch64|riscv64|s39 set_cache_value(REALPATH_SUPPORTS_NONEXISTENT_FILES_EXITCODE 1) set_cache_value(SEM_INIT_MODIFIES_ERRNO_EXITCODE 1) - if(ALPINE_LINUX) set_cache_value(HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP_EXITCODE 1) - set_cache_value(UNGETC_NOT_RETURN_EOF_EXITCODE 1) else() set_cache_value(HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP_EXITCODE 0) - set_cache_value(UNGETC_NOT_RETURN_EOF_EXITCODE 0) endif() if (FREEBSD) @@ -113,11 +105,9 @@ elseif(TARGET_ARCH_NAME MATCHES "^(armel|arm|armv6|arm64|loongarch64|riscv64|s39 set_cache_value(HAVE_BROKEN_FIFO_KEVENT_EXITCODE 1) set_cache_value(HAVE_PROCFS_STAT 0) set_cache_value(HAVE_PROCFS_STATM 0) - set_cache_value(UNGETC_NOT_RETURN_EOF 0) set_cache_value(HAVE_FUNCTIONAL_PTHREAD_ROBUST_MUTEXES_EXITCODE 0) elseif(ILLUMOS) set_cache_value(HAVE_PROCFS_CTL_EXITCODE 0) - set_cache_value(UNGETC_NOT_RETURN_EOF_EXITCODE 0) set_cache_value(COMPILER_SUPPORTS_W_CLASS_MEMACCESS 1) set_cache_value(HAVE_SET_MAX_VARIABLE 1) set_cache_value(HAVE_FULLY_FEATURED_PTHREAD_MUTEXES 1) diff --git a/eng/native/tryrun_ios_tvos.cmake b/eng/native/tryrun_ios_tvos.cmake index 59b496ddfaf..cb82c7af067 100644 --- a/eng/native/tryrun_ios_tvos.cmake +++ b/eng/native/tryrun_ios_tvos.cmake @@ -10,12 +10,10 @@ set_cache_value(HAVE_CLOCK_MONOTONIC_EXITCODE 0) # TODO: these are taken from macOS, check these whether they're correct for iOS # some of them are probably not used by what we use from NativeAOT so could be reduced -set_cache_value(FILE_OPS_CHECK_FERROR_OF_PREVIOUS_CALL_EXITCODE 1) set_cache_value(HAS_POSIX_SEMAPHORES_EXITCODE 1) set_cache_value(HAVE_BROKEN_FIFO_KEVENT_EXITCODE 1) set_cache_value(HAVE_BROKEN_FIFO_SELECT_EXITCODE 1) set_cache_value(HAVE_CLOCK_REALTIME_EXITCODE 0) -set_cache_value(HAVE_CLOCK_THREAD_CPUTIME_EXITCODE 0) set_cache_value(HAVE_CLOCK_GETTIME_NSEC_NP_EXITCODE 0) set_cache_value(HAVE_FUNCTIONAL_PTHREAD_ROBUST_MUTEXES_EXITCODE 1) set_cache_value(HAVE_MMAP_DEV_ZERO_EXITCODE 1) @@ -30,5 +28,4 @@ set_cache_value(ONE_SHARED_MAPPING_PER_FILEREGION_PER_PROCESS_EXITCODE 1) set_cache_value(PTHREAD_CREATE_MODIFIES_ERRNO_EXITCODE 1) set_cache_value(REALPATH_SUPPORTS_NONEXISTENT_FILES_EXITCODE 1) set_cache_value(SEM_INIT_MODIFIES_ERRNO_EXITCODE 1) -set_cache_value(UNGETC_NOT_RETURN_EOF_EXITCODE 1) set_cache_value(HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP_EXITCODE 1) diff --git a/src/coreclr/pal/src/config.h.in b/src/coreclr/pal/src/config.h.in index 1c4f815c8f8..8d72289ff08 100644 --- a/src/coreclr/pal/src/config.h.in +++ b/src/coreclr/pal/src/config.h.in @@ -3,7 +3,6 @@ #cmakedefine01 HAVE_VM_FLAGS_SUPERPAGE_SIZE_ANY #cmakedefine01 HAVE_MAP_HUGETLB -#cmakedefine01 HAVE_IEEEFP_H #cmakedefine01 HAVE_SYS_VMPARAM_H #cmakedefine01 HAVE_MACH_VM_TYPES_H #cmakedefine01 HAVE_MACH_VM_PARAM_H @@ -22,35 +21,21 @@ #cmakedefine01 HAVE_PTHREAD_NP_H #cmakedefine01 HAVE_AUXV_HWCAP_H #cmakedefine01 HAVE_SYS_PTRACE_H -#cmakedefine01 HAVE_SYS_UCONTEXT_H -#cmakedefine01 HAVE_SYS_USER_H -#cmakedefine01 HAVE_SYS_MOUNT_H #cmakedefine01 HAVE_UCONTEXT_H #cmakedefine01 HAVE_GETAUXVAL #cmakedefine01 HAVE_KQUEUE -#cmakedefine01 HAVE_PTHREAD_SUSPEND -#cmakedefine01 HAVE_PTHREAD_SUSPEND_NP -#cmakedefine01 HAVE_PTHREAD_CONTINUE -#cmakedefine01 HAVE_PTHREAD_RESUME_NP -#cmakedefine01 HAVE_PTHREAD_CONTINUE_NP #cmakedefine01 HAVE_PTHREAD_ATTR_GET_NP #cmakedefine01 HAVE_PTHREAD_GETATTR_NP #cmakedefine01 HAVE_PTHREAD_GETCPUCLOCKID -#cmakedefine01 HAVE_PTHREAD_SIGQUEUE #cmakedefine01 HAVE_PTHREAD_GETAFFINITY_NP #cmakedefine01 HAVE_CPUSET_T -#cmakedefine01 HAVE_SIGRETURN -#cmakedefine01 HAVE__THREAD_SYS_SIGRETURN -#cmakedefine01 HAVE_COPYSIGN #cmakedefine01 HAVE_FSYNC #cmakedefine01 HAVE_FUTIMES -#cmakedefine01 HAVE_UTIMES #cmakedefine01 HAVE_SYSCTL #cmakedefine01 HAVE_SYSCTLBYNAME #cmakedefine01 HAVE_SYSCONF #cmakedefine01 HAVE_GMTIME_R -#cmakedefine01 HAVE_TIMEGM #cmakedefine01 HAVE_POLL #cmakedefine01 HAVE_STATVFS #cmakedefine01 HAVE_NON_LEGACY_STATFS @@ -78,7 +63,6 @@ #cmakedefine01 HAVE_STAT_TIMESPEC #cmakedefine01 HAVE_STAT_TIM #cmakedefine01 HAVE_STAT_NSEC -#cmakedefine01 HAVE_TM_GMTOFF #cmakedefine01 HAVE_BSD_REGS_T #cmakedefine01 HAVE_PT_REGS @@ -86,14 +70,11 @@ #cmakedefine01 HAVE___GREGSET_T #cmakedefine01 HAVE_FPSTATE_GLIBC_RESERVED1 #cmakedefine01 HAVE_UCONTEXT_T -#cmakedefine01 HAVE_PTHREAD_RWLOCK_T -#cmakedefine01 HAVE_PRWATCH_T #cmakedefine SIZEOF_OFF_T @SIZEOF_OFF_T@ #cmakedefine01 HAVE_FPREGS_WITH_CW #cmakedefine01 HAVE_YIELD_SYSCALL #cmakedefine01 HAVE_INFTIM -#cmakedefine01 HAVE_CHAR_BIT #cmakedefine01 USER_H_DEFINES_DEBUG #cmakedefine01 HAVE__SC_PHYS_PAGES #cmakedefine01 HAVE__SC_AVPHYS_PAGES @@ -101,7 +82,6 @@ #cmakedefine01 REALPATH_SUPPORTS_NONEXISTENT_FILES #cmakedefine01 HAVE_BROKEN_FIFO_SELECT #cmakedefine01 HAVE_BROKEN_FIFO_KEVENT -#cmakedefine01 HAS_FTRUNCATE_LENGTH_ISSUE #cmakedefine01 UNWIND_CONTEXT_IS_UCONTEXT_T #cmakedefine01 HAVE_SCHED_GET_PRIORITY #cmakedefine01 HAVE_WORKING_GETTIMEOFDAY @@ -109,7 +89,6 @@ #cmakedefine01 HAVE_CLOCK_MONOTONIC #cmakedefine01 HAVE_CLOCK_MONOTONIC_COARSE #cmakedefine01 HAVE_CLOCK_GETTIME_NSEC_NP -#cmakedefine01 HAVE_CLOCK_THREAD_CPUTIME #cmakedefine01 HAVE_PTHREAD_CONDATTR_SETCLOCK #cmakedefine01 MMAP_ANON_IGNORES_PROTECTION #cmakedefine01 ONE_SHARED_MAPPING_PER_FILEREGION_PER_PROCESS @@ -117,9 +96,7 @@ #cmakedefine01 SEM_INIT_MODIFIES_ERRNO #cmakedefine01 HAVE_PROCFS_CTL #cmakedefine01 HAVE_PROCFS_STAT -#cmakedefine01 UNGETC_NOT_RETURN_EOF #cmakedefine01 HAS_POSIX_SEMAPHORES -#cmakedefine01 FILE_OPS_CHECK_FERROR_OF_PREVIOUS_CALL #define PAL_THREAD_PRIORITY_MIN 0 #define PAL_THREAD_PRIORITY_MAX 0 @@ -127,13 +104,8 @@ #cmakedefine01 HAVE__NSGETENVIRON #cmakedefine01 DEADLOCK_WHEN_THREAD_IS_SUSPENDED_WHILE_BLOCKED_ON_MUTEX #cmakedefine PAL_PTRACE(cmd, pid, addr, data) @PAL_PTRACE@ -#cmakedefine PAL_PT_ATTACH @PAL_PT_ATTACH@ -#cmakedefine PAL_PT_DETACH @PAL_PT_DETACH@ -#cmakedefine PAL_PT_READ_D @PAL_PT_READ_D@ -#cmakedefine PAL_PT_WRITE_D @PAL_PT_WRITE_D@ #cmakedefine01 SYNCHMGR_SUSPENSION_SAFE_CONDITION_SIGNALING #cmakedefine01 ERROR_FUNC_FOR_GLOB_HAS_FIXED_PARAMS -#cmakedefine01 HAS_FTRUNCATE_LENGTH_ISSUE #cmakedefine01 HAVE_FULLY_FEATURED_PTHREAD_MUTEXES #cmakedefine01 HAVE_FUNCTIONAL_PTHREAD_ROBUST_MUTEXES #cmakedefine BSD_REGS_STYLE(reg, RR, rr) @BSD_REGS_STYLE@ diff --git a/src/coreclr/pal/src/configure.cmake b/src/coreclr/pal/src/configure.cmake index c6b70fb8b02..b27cedb844e 100644 --- a/src/coreclr/pal/src/configure.cmake +++ b/src/coreclr/pal/src/configure.cmake @@ -30,7 +30,6 @@ endif() list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_FILE_OFFSET_BITS=64) -check_include_files(ieeefp.h HAVE_IEEEFP_H) 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) @@ -48,9 +47,6 @@ check_include_files(semaphore.h HAVE_SEMAPHORE_H) check_include_files(sys/prctl.h HAVE_PRCTL_H) check_include_files("sys/auxv.h;asm/hwcap.h" HAVE_AUXV_HWCAP_H) check_include_files("sys/ptrace.h" HAVE_SYS_PTRACE_H) -check_include_files("sys/ucontext.h" HAVE_SYS_UCONTEXT_H) -check_include_files("sys/user.h" HAVE_SYS_USER_H) -check_include_files("sys/mount.h" HAVE_SYS_MOUNT_H) check_include_files(ucontext.h HAVE_UCONTEXT_H) check_symbol_exists(getauxval sys/auxv.h HAVE_GETAUXVAL) @@ -101,25 +97,13 @@ elseif (HAVE_PTHREAD_IN_LIBC) set(PTHREAD_LIBRARY c) endif() -check_library_exists(${PTHREAD_LIBRARY} pthread_suspend "" HAVE_PTHREAD_SUSPEND) -check_library_exists(${PTHREAD_LIBRARY} pthread_suspend_np "" HAVE_PTHREAD_SUSPEND_NP) -check_library_exists(${PTHREAD_LIBRARY} pthread_continue "" HAVE_PTHREAD_CONTINUE) -check_library_exists(${PTHREAD_LIBRARY} pthread_continue_np "" HAVE_PTHREAD_CONTINUE_NP) -check_library_exists(${PTHREAD_LIBRARY} pthread_resume_np "" HAVE_PTHREAD_RESUME_NP) check_library_exists(${PTHREAD_LIBRARY} pthread_attr_get_np "" HAVE_PTHREAD_ATTR_GET_NP) check_library_exists(${PTHREAD_LIBRARY} pthread_getattr_np "" HAVE_PTHREAD_GETATTR_NP) check_library_exists(${PTHREAD_LIBRARY} pthread_getcpuclockid "" HAVE_PTHREAD_GETCPUCLOCKID) -check_library_exists(${PTHREAD_LIBRARY} pthread_sigqueue "" HAVE_PTHREAD_SIGQUEUE) check_library_exists(${PTHREAD_LIBRARY} pthread_getaffinity_np "" HAVE_PTHREAD_GETAFFINITY_NP) -check_function_exists(sigreturn HAVE_SIGRETURN) -check_function_exists(_thread_sys_sigreturn HAVE__THREAD_SYS_SIGRETURN) -set(CMAKE_REQUIRED_LIBRARIES m) -check_function_exists(copysign HAVE_COPYSIGN) -set(CMAKE_REQUIRED_LIBRARIES) check_function_exists(fsync HAVE_FSYNC) check_function_exists(futimes HAVE_FUTIMES) -check_function_exists(utimes HAVE_UTIMES) if(CLR_CMAKE_TARGET_LINUX) # sysctl is deprecated on Linux set(HAVE_SYSCTL 0) @@ -128,7 +112,6 @@ else() endif() check_function_exists(sysconf HAVE_SYSCONF) check_function_exists(gmtime_r HAVE_GMTIME_R) -check_function_exists(timegm HAVE_TIMEGM) check_function_exists(poll HAVE_POLL) check_function_exists(statvfs HAVE_STATVFS) check_function_exists(thread_self HAVE_THREAD_SELF) @@ -155,7 +138,6 @@ int main(int argc, char **argv) { check_struct_has_member ("struct stat" st_atimespec "sys/types.h;sys/stat.h" HAVE_STAT_TIMESPEC) check_struct_has_member ("struct stat" st_atim "sys/types.h;sys/stat.h" HAVE_STAT_TIM) check_struct_has_member ("struct stat" st_atimensec "sys/types.h;sys/stat.h" HAVE_STAT_NSEC) -check_struct_has_member ("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF) check_struct_has_member ("ucontext_t" uc_mcontext.gregs[0] ucontext.h HAVE_GREGSET_T) check_struct_has_member ("ucontext_t" uc_mcontext.__gregs[0] ucontext.h HAVE___GREGSET_T) check_struct_has_member ("ucontext_t" uc_mcontext.fpregs->__glibc_reserved1[0] ucontext.h HAVE_FPSTATE_GLIBC_RESERVED1) @@ -184,7 +166,6 @@ check_type_size(off_t SIZEOF_OFF_T) check_cxx_symbol_exists(SYS_yield sys/syscall.h HAVE_YIELD_SYSCALL) check_cxx_symbol_exists(INFTIM poll.h HAVE_INFTIM) -check_cxx_symbol_exists(CHAR_BIT limits.h HAVE_CHAR_BIT) check_cxx_symbol_exists(_DEBUG sys/user.h USER_H_DEFINES_DEBUG) check_cxx_symbol_exists(_SC_PHYS_PAGES unistd.h HAVE__SC_PHYS_PAGES) check_cxx_symbol_exists(_SC_AVPHYS_PAGES unistd.h HAVE__SC_AVPHYS_PAGES) @@ -418,22 +399,6 @@ int main() exit((ret == 0) ? 1 : 0); }" HAVE_CLOCK_GETTIME_NSEC_NP) -set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_RT_LIBS}) -check_cxx_source_runs(" -#include -#include -#include - -int main() -{ - int ret; - struct timespec ts; - ret = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts); - - exit(ret); -}" HAVE_CLOCK_THREAD_CPUTIME) -set(CMAKE_REQUIRED_LIBRARIES) - check_cxx_source_runs(" #include #include @@ -623,32 +588,6 @@ int main(void) { exit(0); }" HAVE_PROCFS_STAT) set(CMAKE_REQUIRED_LIBRARIES) -check_cxx_source_runs(" -#include -#include -#include - -int main(void) -{ - char* szFileName; - FILE* pFile = NULL; - int ret = 1; - - szFileName = tempnam(\".\", \"tmp\"); - - /* open the file write-only */ - pFile = fopen(szFileName, \"a\"); - if (pFile == NULL) - { - exit(0); - } - if (ungetc('A', pFile) != EOF) - { - ret = 0; - } - unlink(szFileName); - exit(ret); -}" UNGETC_NOT_RETURN_EOF) set(CMAKE_REQUIRED_LIBRARIES ${PTHREAD_LIBRARY}) check_cxx_source_runs(" @@ -664,41 +603,6 @@ int main() { exit(0); }" HAS_POSIX_SEMAPHORES) set(CMAKE_REQUIRED_LIBRARIES) -check_cxx_source_runs(" -#include -#include - -int main() -{ - FILE *fp = NULL; - char *fileName = \"/dev/zero\"; - char buf[10]; - - /* - * Open the file in append mode and try to read some text. - * And, make sure ferror() is set. - */ - fp = fopen (fileName, \"a\"); - if ( (NULL == fp) || - (fread (buf, sizeof(buf), 1, fp) > 0) || - (!ferror(fp)) - ) - { - return 0; - } - - /* - * Now that ferror() is set, try to close the file. - * If we get an error, we can conclude that this - * fgets() depended on the previous ferror(). - */ - if ( fclose(fp) != 0 ) - { - return 0; - } - - return 1; -}" FILE_OPS_CHECK_FERROR_OF_PREVIOUS_CALL) set(SYNCHMGR_SUSPENSION_SAFE_CONDITION_SIGNALING 1) set(ERROR_FUNC_FOR_GLOB_HAS_FIXED_PARAMS 1) @@ -985,21 +889,11 @@ if(CLR_CMAKE_TARGET_OSX) set(HAVE__NSGETENVIRON 1) set(DEADLOCK_WHEN_THREAD_IS_SUSPENDED_WHILE_BLOCKED_ON_MUTEX 1) set(PAL_PTRACE "ptrace((cmd), (pid), (caddr_t)(addr), (data))") - set(PAL_PT_ATTACH PT_ATTACH) - set(PAL_PT_DETACH PT_DETACH) - set(PAL_PT_READ_D PT_READ_D) - set(PAL_PT_WRITE_D PT_WRITE_D) - set(HAS_FTRUNCATE_LENGTH_ISSUE 1) set(HAVE_SCHED_OTHER_ASSIGNABLE 1) elseif(CLR_CMAKE_TARGET_FREEBSD) set(DEADLOCK_WHEN_THREAD_IS_SUSPENDED_WHILE_BLOCKED_ON_MUTEX 0) set(PAL_PTRACE "ptrace((cmd), (pid), (caddr_t)(addr), (data))") - set(PAL_PT_ATTACH PT_ATTACH) - set(PAL_PT_DETACH PT_DETACH) - set(PAL_PT_READ_D PT_READ_D) - set(PAL_PT_WRITE_D PT_WRITE_D) - set(HAS_FTRUNCATE_LENGTH_ISSUE 0) if (CLR_CMAKE_HOST_ARCH_AMD64) set(BSD_REGS_STYLE "((reg).r_##rr)") elseif(CLR_CMAKE_HOST_ARCH_ARM64) @@ -1011,26 +905,15 @@ elseif(CLR_CMAKE_TARGET_FREEBSD) elseif(CLR_CMAKE_TARGET_NETBSD) set(DEADLOCK_WHEN_THREAD_IS_SUSPENDED_WHILE_BLOCKED_ON_MUTEX 0) set(PAL_PTRACE "ptrace((cmd), (pid), (void*)(addr), (data))") - set(PAL_PT_ATTACH PT_ATTACH) - set(PAL_PT_DETACH PT_DETACH) - set(PAL_PT_READ_D PT_READ_D) - set(PAL_PT_WRITE_D PT_WRITE_D) - set(HAS_FTRUNCATE_LENGTH_ISSUE 0) set(BSD_REGS_STYLE "((reg).regs[_REG_##RR])") set(HAVE_SCHED_OTHER_ASSIGNABLE 0) elseif(CLR_CMAKE_TARGET_SUNOS) set(DEADLOCK_WHEN_THREAD_IS_SUSPENDED_WHILE_BLOCKED_ON_MUTEX 0) set(PAL_PTRACE "ptrace((cmd), (pid), (caddr_t)(addr), (data))") - set(PAL_PT_ATTACH PT_ATTACH) - set(PAL_PT_DETACH PT_DETACH) - set(PAL_PT_READ_D PT_READ_D) - set(PAL_PT_WRITE_D PT_WRITE_D) - set(HAS_FTRUNCATE_LENGTH_ISSUE 0) elseif(CLR_CMAKE_TARGET_HAIKU) # Haiku does not have ptrace. set(DEADLOCK_WHEN_THREAD_IS_SUSPENDED_WHILE_BLOCKED_ON_MUTEX 0) - set(HAS_FTRUNCATE_LENGTH_ISSUE 0) set(HAVE_SCHED_OTHER_ASSIGNABLE 1) else() # Anything else is Linux if(NOT HAVE_LTTNG_TRACEPOINT_H AND FEATURE_EVENT_TRACE) @@ -1039,11 +922,6 @@ else() # Anything else is Linux endif() set(DEADLOCK_WHEN_THREAD_IS_SUSPENDED_WHILE_BLOCKED_ON_MUTEX 0) set(PAL_PTRACE "ptrace((cmd), (pid), (void*)(addr), (data))") - set(PAL_PT_ATTACH PTRACE_ATTACH) - set(PAL_PT_DETACH PTRACE_DETACH) - set(PAL_PT_READ_D PTRACE_PEEKDATA) - set(PAL_PT_WRITE_D PTRACE_POKEDATA) - set(HAS_FTRUNCATE_LENGTH_ISSUE 0) set(HAVE_SCHED_OTHER_ASSIGNABLE 1) endif(CLR_CMAKE_TARGET_OSX) diff --git a/src/mono/cmake/config.h.in b/src/mono/cmake/config.h.in index 1fd699e7610..e972500d1cd 100644 --- a/src/mono/cmake/config.h.in +++ b/src/mono/cmake/config.h.in @@ -54,9 +54,6 @@ /* Targeting the Fuchsia platform */ #cmakedefine HOST_FUCHSIA 1 -/* Targeting the AIX and PASE platforms */ -#cmakedefine HOST_AIX 1 - /* Host Platform is Win32 */ #cmakedefine HOST_WIN32 1 @@ -108,12 +105,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_UNISTD_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SIGNAL_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SETJMP_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYSLOG_H 1 @@ -132,9 +123,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_SYSCALL_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_UIO_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_PARAM_H 1 @@ -162,9 +150,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_PWD_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_GRP_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_SELECT_H 1 @@ -198,9 +183,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_WCHAR_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_LINUX_MAGIC_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_ANDROID_LEGACY_SIGNAL_INLINES_H 1 @@ -242,9 +224,6 @@ /* Disable the interpreter. */ #cmakedefine DISABLE_INTERPRETER 1 -/* Disable non-blittable marshalling */ -#cmakedefine DISABLE_NONBLITTABLE - /* Disable SIMD intrinsics related optimizations. */ #cmakedefine DISABLE_SIMD 1 @@ -353,9 +332,6 @@ /* Define to 1 if you have the `closelog' function. */ #cmakedefine HAVE_CLOSELOG 1 -/* Define to 1 if you have the `atexit' function. */ -#cmakedefine HAVE_ATEXIT 1 - /* Define to 1 if you have the `popen' function. */ #cmakedefine HAVE_POPEN 1 @@ -383,9 +359,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_PTHREAD_NP_H 1 -/* Define to 1 if you have the `pthread_mutex_timedlock' function. */ -#cmakedefine HAVE_PTHREAD_MUTEX_TIMEDLOCK 1 - /* Define to 1 if you have the `pthread_getattr_np' function. */ #cmakedefine HAVE_PTHREAD_GETATTR_NP 1 @@ -442,15 +415,9 @@ /* Have getpid */ #cmakedefine HAVE_GETPID 1 -/* Have mktemp */ -#cmakedefine HAVE_MKTEMP 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_MMAN_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_MOUNT_H 1 - /* Define to 1 if you have the `mremap' function. */ #cmakedefine HAVE_MREMAP 1 @@ -498,9 +465,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_TIME_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_DIRENT_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_COMMONCRYPTO_COMMONDIGEST_H 1 @@ -519,9 +483,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_WINTERNL_H 1 -/* Have socklen_t */ -#cmakedefine HAVE_SOCKLEN_T 1 - /* Define to 1 if you have the `execvp' function. */ #cmakedefine HAVE_EXECVP 1 @@ -561,12 +522,6 @@ /* ... */ #cmakedefine TARGET_PS3 1 -/* ... */ -#cmakedefine TARGET_XBOX360 1 - -/* ... */ -#cmakedefine TARGET_PS4 1 - /* Target is RISC-V */ #cmakedefine TARGET_RISCV 1 @@ -669,9 +624,6 @@ /* host or target doesn't allow unaligned memory access */ #cmakedefine NO_UNALIGNED_ACCESS 1 -/* Support for the deprecated attribute */ -#cmakedefine HAVE_DEPRECATED 1 - /* Moving collector */ #cmakedefine HAVE_MOVING_COLLECTOR 1 diff --git a/src/mono/cmake/configure.cmake b/src/mono/cmake/configure.cmake index c15aeb143fa..aa8295c11fc 100644 --- a/src/mono/cmake/configure.cmake +++ b/src/mono/cmake/configure.cmake @@ -234,12 +234,9 @@ if(HOST_WIN32) # Dynamic lookup using ac_check_headers/ac_check_functions is extremly slow on Windows, espacially on msbuild. # Since majority of the checks above will fail on Windows host, we can just directly define the available static # API surface. - set(HAVE_ATEXIT 1) set(HAVE_GETADDRINFO 1) set(HAVE_GETPEERNAME 1) set(HAVE_GETHOSTBYNAME 1) - set(HAVE_SETJMP_H 1) - set(HAVE_SIGNAL_H 1) set(HAVE_STDINT_H 1) set(HAVE_STRTOK_R 1) set(HAVE_STRUCT_SOCKADDR_IN6 1) diff --git a/src/native/external/libunwind_extras/config.h.in b/src/native/external/libunwind_extras/config.h.in index 35b44b11d80..733738c4154 100644 --- a/src/native/external/libunwind_extras/config.h.in +++ b/src/native/external/libunwind_extras/config.h.in @@ -13,19 +13,9 @@ #cmakedefine HAVE_SYS_LINK_H #cmakedefine HAVE__BUILTIN_UNREACHABLE -#cmakedefine HAVE_SYNC_ATOMICS - -#cmakedefine HAVE_ATOMIC_OPS_H #cmakedefine HAVE_STDALIGN_H -#cmakedefine HAVE_STDALIGN_ALIGNAS #cmakedefine HAVE_PIPE2 -#if defined(_MSC_VER) && defined(HAVE_STDALIGN_H) && !defined(HAVE_STDALIGN_ALIGNAS) -// alignment is a performance optimization for the cross compile libunwind -// Simply ignore it if it is not supported by the compiler -#define alignas(x) -#endif - #endif diff --git a/src/native/external/libunwind_extras/configure.cmake b/src/native/external/libunwind_extras/configure.cmake index 711f64f040b..c95dfbefc84 100644 --- a/src/native/external/libunwind_extras/configure.cmake +++ b/src/native/external/libunwind_extras/configure.cmake @@ -36,20 +36,8 @@ endif(CLR_CMAKE_HOST_WIN32) check_include_files(link.h HAVE_LINK_H) check_include_files(sys/link.h HAVE_SYS_LINK_H) -check_include_files(atomic_ops.h HAVE_ATOMIC_OPS_H) - check_function_exists(pipe2 HAVE_PIPE2) -check_c_source_compiles(" -int main(int argc, char **argv) -{ - __sync_bool_compare_and_swap((int *)0, 0, 1); - __sync_fetch_and_add((int *)0, 1); - - return 0; -}" HAVE_SYNC_ATOMICS) - - check_c_source_compiles(" int main(int argc, char **argv) { @@ -58,16 +46,6 @@ int main(int argc, char **argv) return 0; }" HAVE__BUILTIN_UNREACHABLE) -check_c_source_compiles(" -#include - -int main(void) -{ - alignas(128) char result = 0; - - return result; -}" HAVE_STDALIGN_ALIGNAS) - configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/config.h) add_definitions(-DHAVE_CONFIG_H=1) diff --git a/src/native/libs/Common/pal_config.h.in b/src/native/libs/Common/pal_config.h.in index 9f409dc3195..0960f6aa971 100644 --- a/src/native/libs/Common/pal_config.h.in +++ b/src/native/libs/Common/pal_config.h.in @@ -32,7 +32,6 @@ #cmakedefine01 HAVE_MNTINFO #cmakedefine01 HAVE_STATFS_FSTYPENAME #cmakedefine01 HAVE_STATVFS_FSTYPENAME -#cmakedefine01 HAVE_STATVFS_BASETYPE #cmakedefine01 HAVE_NON_LEGACY_STATFS #cmakedefine01 HAVE_STRCPY_S #cmakedefine01 HAVE_STRLCPY @@ -53,13 +52,10 @@ #cmakedefine01 HAVE_PTHREAD_SETCANCELSTATE #cmakedefine01 HAVE_GNU_LIBNAMES_H #cmakedefine01 KEVENT_HAS_VOID_UDATA -#cmakedefine01 HAVE_FDS_BITS -#cmakedefine01 HAVE_PRIVATE_FDS_BITS #cmakedefine01 HAVE_STATFS #cmakedefine01 HAVE_SYS_SOCKIO_H #cmakedefine01 HAVE_ETHTOOL_H #cmakedefine01 HAVE_SYS_POLL_H -#cmakedefine01 HAVE_SYS_INOTIFY_H #cmakedefine01 HAVE_EPOLL #cmakedefine01 HAVE_ACCEPT4 #cmakedefine01 HAVE_KQUEUE @@ -70,11 +66,6 @@ #cmakedefine01 HAVE_GETNAMEINFO_SIGNED_FLAGS #cmakedefine01 HAVE_GETPEEREID #cmakedefine01 HAVE_SUPPORT_FOR_DUAL_MODE_IPV4_PACKET_INFO -#cmakedefine01 HAVE_TCGETATTR -#cmakedefine01 HAVE_TCSETATTR -#cmakedefine01 HAVE_ECHO -#cmakedefine01 HAVE_ICANON -#cmakedefine01 HAVE_TCSANOW #cmakedefine01 HAVE_IN_PKTINFO #cmakedefine01 HAVE_IP_MREQN #cmakedefine01 HAVE_NETINET_TCP_VAR_H @@ -95,7 +86,6 @@ #cmakedefine01 HAVE_NETPACKET_PACKET_H #cmakedefine01 HAVE_NET_IF_ARP_H #cmakedefine01 HAVE_SYS_MNTENT_H -#cmakedefine01 HAVE_MNTENT_H #cmakedefine01 HAVE_NET_IFMEDIA_H #cmakedefine01 HAVE_IOS_NET_IFMEDIA_H #cmakedefine01 HAVE_LINUX_RTNETLINK_H @@ -116,7 +106,6 @@ #cmakedefine01 HAVE_GETAUXVAL #cmakedefine01 HAVE_CRT_EXTERNS_H #cmakedefine01 HAVE_GETDOMAINNAME -#cmakedefine01 HAVE_UNAME #cmakedefine01 HAVE_UTIMENSAT #cmakedefine01 HAVE_LUTIMES #cmakedefine01 HAVE_FUTIMES @@ -124,7 +113,6 @@ #cmakedefine01 HAVE_MKSTEMPS #cmakedefine01 HAVE_MKSTEMP #cmakedefine01 IPV6MR_INTERFACE_UNSIGNED -#cmakedefine01 BIND_ADDRLEN_UNSIGNED #cmakedefine01 INOTIFY_RM_WATCH_WD_UNSIGNED #cmakedefine01 HAVE_IN_EXCL_UNLINK #cmakedefine01 HAVE_TCP_H_TCP_KEEPALIVE @@ -138,7 +126,6 @@ #cmakedefine01 HAVE_TERMIOS_H #cmakedefine01 HAVE_DLFCN_H #cmakedefine01 HAVE_PTHREAD_H -#cmakedefine01 HAVE_SYS_STATFS_H #cmakedefine01 HAVE_SYS_STATVFS_H #cmakedefine01 HAVE_NET_IF_H #cmakedefine01 HAVE_SYS_PROCINFO_H @@ -152,8 +139,6 @@ #cmakedefine01 HAVE_MAKEDEV_SYSMACROSH #cmakedefine01 HAVE_GETGRGID_R #cmakedefine01 HAVE_TERMIOS2 -#cmakedefine01 HAVE_DIRENT_NAME_SIZE -#cmakedefine01 DIRENT_NAME_SIZE #ifndef HOST_WASI #cmakedefine01 HAVE_GETRUSAGE diff --git a/src/native/libs/configure.cmake b/src/native/libs/configure.cmake index d15a5ff74bc..871e5bd2ea8 100644 --- a/src/native/libs/configure.cmake +++ b/src/native/libs/configure.cmake @@ -260,31 +260,6 @@ check_symbol_exists( "sys/ioctl.h" HAVE_TIOCSWINSZ) -check_symbol_exists( - tcgetattr - termios.h - HAVE_TCGETATTR) - -check_symbol_exists( - tcsetattr - termios.h - HAVE_TCSETATTR) - -check_symbol_exists( - ECHO - "termios.h" - HAVE_ECHO) - -check_symbol_exists( - ICANON - "termios.h" - HAVE_ICANON) - -check_symbol_exists( - TCSANOW - "termios.h" - HAVE_TCSANOW) - check_symbol_exists( cfsetspeed termios.h @@ -354,17 +329,7 @@ check_struct_has_member( "sys/mount.h" HAVE_STATVFS_FSTYPENAME) -check_struct_has_member( - "struct statvfs" - f_basetype - "sys/statvfs.h" - HAVE_STATVFS_BASETYPE) - set(CMAKE_EXTRA_INCLUDE_FILES dirent.h) -check_type_size( - "((struct dirent*)0)->d_name" - DIRENT_NAME_SIZE) -set(CMAKE_EXTRA_INCLUDE_FILES) # statfs: Find whether this struct exists if (HAVE_STATFS_FSTYPENAME OR HAVE_STATVFS_FSTYPENAME) @@ -438,18 +403,6 @@ check_c_source_compiles( " KEVENT_HAS_VOID_UDATA) -check_struct_has_member( - "struct fd_set" - fds_bits - "sys/select.h" - HAVE_FDS_BITS) - -check_struct_has_member( - "struct fd_set" - __fds_bits - "sys/select.h" - HAVE_PRIVATE_FDS_BITS) - # do not use sendfile() on iOS/tvOS, it causes SIGSYS at runtime on devices if(NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS) check_c_source_compiles( @@ -731,23 +684,6 @@ check_symbol_exists( set (PREVIOUS_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) set (CMAKE_REQUIRED_FLAGS "-Werror -Wsign-conversion") -check_c_source_compiles( - " - #include - #include - - int main(void) - { - int fd = -1; - struct sockaddr* addr = NULL; - socklen_t addrLen = 0; - - int err = bind(fd, addr, addrLen); - return 0; - } - " - BIND_ADDRLEN_UNSIGNED) - check_c_source_compiles( " #include @@ -948,10 +884,6 @@ check_include_files( "pthread.h" HAVE_PTHREAD_H) -check_include_files( - "sys/statfs.h" - HAVE_SYS_STATFS_H) - if(CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS) set(HAVE_IOS_NET_ROUTE_H 1) set(HAVE_IOS_NET_IFMEDIA_H 1) @@ -1013,10 +945,6 @@ check_include_files( "sys/mntent.h" HAVE_SYS_MNTENT_H) -check_include_files( - "mntent.h" - HAVE_MNTENT_H) - check_include_files( "stdint.h;net/if_media.h" HAVE_NET_IFMEDIA_H) @@ -1043,11 +971,6 @@ check_symbol_exists( unistd.h HAVE_GETDOMAINNAME) -check_symbol_exists( - uname - sys/utsname.h - HAVE_UNAME) - # getdomainname on OSX takes an 'int' instead of a 'size_t' # check if compiling with 'size_t' would cause a warning set (PREVIOUS_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})