Skip to content

Commit 87cd2c4

Browse files
am11am11
authored
Delete some unused cmake defines (#103441)
* Delete some unused cmake defines * Update src/mono/cmake/config.h.in
1 parent 4834a50 commit 87cd2c4

File tree

10 files changed

+0
-338
lines changed

10 files changed

+0
-338
lines changed

‎eng/native/tryrun.cmake

-10
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,12 @@ endif()
4949

5050
if(DARWIN)
5151
if(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
52-
set_cache_value(FILE_OPS_CHECK_FERROR_OF_PREVIOUS_CALL_EXITCODE 1)
5352
set_cache_value(HAS_POSIX_SEMAPHORES_EXITCODE 1)
5453
set_cache_value(HAVE_BROKEN_FIFO_KEVENT_EXITCODE 1)
5554
set_cache_value(HAVE_BROKEN_FIFO_SELECT_EXITCODE 1)
5655
set_cache_value(HAVE_CLOCK_MONOTONIC_COARSE_EXITCODE 1)
5756
set_cache_value(HAVE_CLOCK_MONOTONIC_EXITCODE 0)
5857
set_cache_value(HAVE_CLOCK_REALTIME_EXITCODE 0)
59-
set_cache_value(HAVE_CLOCK_THREAD_CPUTIME_EXITCODE 0)
6058
set_cache_value(HAVE_CLOCK_GETTIME_NSEC_NP_EXITCODE 0)
6159
set_cache_value(HAVE_FUNCTIONAL_PTHREAD_ROBUST_MUTEXES_EXITCODE 1)
6260
set_cache_value(HAVE_MMAP_DEV_ZERO_EXITCODE 1)
@@ -72,18 +70,15 @@ if(DARWIN)
7270
set_cache_value(PTHREAD_CREATE_MODIFIES_ERRNO_EXITCODE 1)
7371
set_cache_value(REALPATH_SUPPORTS_NONEXISTENT_FILES_EXITCODE 1)
7472
set_cache_value(SEM_INIT_MODIFIES_ERRNO_EXITCODE 1)
75-
set_cache_value(UNGETC_NOT_RETURN_EOF_EXITCODE 1)
7673
set_cache_value(HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP_EXITCODE 1)
7774
else()
7875
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm64 or x64 is supported for OSX cross build!")
7976
endif()
8077
elseif(TARGET_ARCH_NAME MATCHES "^(armel|arm|armv6|arm64|loongarch64|riscv64|s390x|ppc64le|x86|x64)$" OR FREEBSD OR ILLUMOS OR TIZEN OR HAIKU)
81-
set_cache_value(FILE_OPS_CHECK_FERROR_OF_PREVIOUS_CALL_EXITCODE 1)
8278
set_cache_value(HAS_POSIX_SEMAPHORES_EXITCODE 0)
8379
set_cache_value(HAVE_CLOCK_MONOTONIC_COARSE_EXITCODE 0)
8480
set_cache_value(HAVE_CLOCK_MONOTONIC_EXITCODE 0)
8581
set_cache_value(HAVE_CLOCK_REALTIME_EXITCODE 0)
86-
set_cache_value(HAVE_CLOCK_THREAD_CPUTIME_EXITCODE 0)
8782
set_cache_value(HAVE_MMAP_DEV_ZERO_EXITCODE 0)
8883
set_cache_value(HAVE_PROCFS_CTL_EXITCODE 1)
8984
set_cache_value(HAVE_PROCFS_STAT_EXITCODE 0)
@@ -97,13 +92,10 @@ elseif(TARGET_ARCH_NAME MATCHES "^(armel|arm|armv6|arm64|loongarch64|riscv64|s39
9792
set_cache_value(REALPATH_SUPPORTS_NONEXISTENT_FILES_EXITCODE 1)
9893
set_cache_value(SEM_INIT_MODIFIES_ERRNO_EXITCODE 1)
9994

100-
10195
if(ALPINE_LINUX)
10296
set_cache_value(HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP_EXITCODE 1)
103-
set_cache_value(UNGETC_NOT_RETURN_EOF_EXITCODE 1)
10497
else()
10598
set_cache_value(HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP_EXITCODE 0)
106-
set_cache_value(UNGETC_NOT_RETURN_EOF_EXITCODE 0)
10799
endif()
108100

109101
if (FREEBSD)
@@ -113,11 +105,9 @@ elseif(TARGET_ARCH_NAME MATCHES "^(armel|arm|armv6|arm64|loongarch64|riscv64|s39
113105
set_cache_value(HAVE_BROKEN_FIFO_KEVENT_EXITCODE 1)
114106
set_cache_value(HAVE_PROCFS_STAT 0)
115107
set_cache_value(HAVE_PROCFS_STATM 0)
116-
set_cache_value(UNGETC_NOT_RETURN_EOF 0)
117108
set_cache_value(HAVE_FUNCTIONAL_PTHREAD_ROBUST_MUTEXES_EXITCODE 0)
118109
elseif(ILLUMOS)
119110
set_cache_value(HAVE_PROCFS_CTL_EXITCODE 0)
120-
set_cache_value(UNGETC_NOT_RETURN_EOF_EXITCODE 0)
121111
set_cache_value(COMPILER_SUPPORTS_W_CLASS_MEMACCESS 1)
122112
set_cache_value(HAVE_SET_MAX_VARIABLE 1)
123113
set_cache_value(HAVE_FULLY_FEATURED_PTHREAD_MUTEXES 1)

‎eng/native/tryrun_ios_tvos.cmake

-3
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ set_cache_value(HAVE_CLOCK_MONOTONIC_EXITCODE 0)
1010

1111
# TODO: these are taken from macOS, check these whether they're correct for iOS
1212
# some of them are probably not used by what we use from NativeAOT so could be reduced
13-
set_cache_value(FILE_OPS_CHECK_FERROR_OF_PREVIOUS_CALL_EXITCODE 1)
1413
set_cache_value(HAS_POSIX_SEMAPHORES_EXITCODE 1)
1514
set_cache_value(HAVE_BROKEN_FIFO_KEVENT_EXITCODE 1)
1615
set_cache_value(HAVE_BROKEN_FIFO_SELECT_EXITCODE 1)
1716
set_cache_value(HAVE_CLOCK_REALTIME_EXITCODE 0)
18-
set_cache_value(HAVE_CLOCK_THREAD_CPUTIME_EXITCODE 0)
1917
set_cache_value(HAVE_CLOCK_GETTIME_NSEC_NP_EXITCODE 0)
2018
set_cache_value(HAVE_FUNCTIONAL_PTHREAD_ROBUST_MUTEXES_EXITCODE 1)
2119
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)
3028
set_cache_value(PTHREAD_CREATE_MODIFIES_ERRNO_EXITCODE 1)
3129
set_cache_value(REALPATH_SUPPORTS_NONEXISTENT_FILES_EXITCODE 1)
3230
set_cache_value(SEM_INIT_MODIFIES_ERRNO_EXITCODE 1)
33-
set_cache_value(UNGETC_NOT_RETURN_EOF_EXITCODE 1)
3431
set_cache_value(HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP_EXITCODE 1)

‎src/coreclr/pal/src/config.h.in

-28
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#cmakedefine01 HAVE_VM_FLAGS_SUPERPAGE_SIZE_ANY
55
#cmakedefine01 HAVE_MAP_HUGETLB
6-
#cmakedefine01 HAVE_IEEEFP_H
76
#cmakedefine01 HAVE_SYS_VMPARAM_H
87
#cmakedefine01 HAVE_MACH_VM_TYPES_H
98
#cmakedefine01 HAVE_MACH_VM_PARAM_H
@@ -22,35 +21,21 @@
2221
#cmakedefine01 HAVE_PTHREAD_NP_H
2322
#cmakedefine01 HAVE_AUXV_HWCAP_H
2423
#cmakedefine01 HAVE_SYS_PTRACE_H
25-
#cmakedefine01 HAVE_SYS_UCONTEXT_H
26-
#cmakedefine01 HAVE_SYS_USER_H
27-
#cmakedefine01 HAVE_SYS_MOUNT_H
2824
#cmakedefine01 HAVE_UCONTEXT_H
2925
#cmakedefine01 HAVE_GETAUXVAL
3026

3127
#cmakedefine01 HAVE_KQUEUE
32-
#cmakedefine01 HAVE_PTHREAD_SUSPEND
33-
#cmakedefine01 HAVE_PTHREAD_SUSPEND_NP
34-
#cmakedefine01 HAVE_PTHREAD_CONTINUE
35-
#cmakedefine01 HAVE_PTHREAD_RESUME_NP
36-
#cmakedefine01 HAVE_PTHREAD_CONTINUE_NP
3728
#cmakedefine01 HAVE_PTHREAD_ATTR_GET_NP
3829
#cmakedefine01 HAVE_PTHREAD_GETATTR_NP
3930
#cmakedefine01 HAVE_PTHREAD_GETCPUCLOCKID
40-
#cmakedefine01 HAVE_PTHREAD_SIGQUEUE
4131
#cmakedefine01 HAVE_PTHREAD_GETAFFINITY_NP
4232
#cmakedefine01 HAVE_CPUSET_T
43-
#cmakedefine01 HAVE_SIGRETURN
44-
#cmakedefine01 HAVE__THREAD_SYS_SIGRETURN
45-
#cmakedefine01 HAVE_COPYSIGN
4633
#cmakedefine01 HAVE_FSYNC
4734
#cmakedefine01 HAVE_FUTIMES
48-
#cmakedefine01 HAVE_UTIMES
4935
#cmakedefine01 HAVE_SYSCTL
5036
#cmakedefine01 HAVE_SYSCTLBYNAME
5137
#cmakedefine01 HAVE_SYSCONF
5238
#cmakedefine01 HAVE_GMTIME_R
53-
#cmakedefine01 HAVE_TIMEGM
5439
#cmakedefine01 HAVE_POLL
5540
#cmakedefine01 HAVE_STATVFS
5641
#cmakedefine01 HAVE_NON_LEGACY_STATFS
@@ -78,62 +63,49 @@
7863
#cmakedefine01 HAVE_STAT_TIMESPEC
7964
#cmakedefine01 HAVE_STAT_TIM
8065
#cmakedefine01 HAVE_STAT_NSEC
81-
#cmakedefine01 HAVE_TM_GMTOFF
8266

8367
#cmakedefine01 HAVE_BSD_REGS_T
8468
#cmakedefine01 HAVE_PT_REGS
8569
#cmakedefine01 HAVE_GREGSET_T
8670
#cmakedefine01 HAVE___GREGSET_T
8771
#cmakedefine01 HAVE_FPSTATE_GLIBC_RESERVED1
8872
#cmakedefine01 HAVE_UCONTEXT_T
89-
#cmakedefine01 HAVE_PTHREAD_RWLOCK_T
90-
#cmakedefine01 HAVE_PRWATCH_T
9173
#cmakedefine SIZEOF_OFF_T @SIZEOF_OFF_T@
9274
#cmakedefine01 HAVE_FPREGS_WITH_CW
9375

9476
#cmakedefine01 HAVE_YIELD_SYSCALL
9577
#cmakedefine01 HAVE_INFTIM
96-
#cmakedefine01 HAVE_CHAR_BIT
9778
#cmakedefine01 USER_H_DEFINES_DEBUG
9879
#cmakedefine01 HAVE__SC_PHYS_PAGES
9980
#cmakedefine01 HAVE__SC_AVPHYS_PAGES
10081

10182
#cmakedefine01 REALPATH_SUPPORTS_NONEXISTENT_FILES
10283
#cmakedefine01 HAVE_BROKEN_FIFO_SELECT
10384
#cmakedefine01 HAVE_BROKEN_FIFO_KEVENT
104-
#cmakedefine01 HAS_FTRUNCATE_LENGTH_ISSUE
10585
#cmakedefine01 UNWIND_CONTEXT_IS_UCONTEXT_T
10686
#cmakedefine01 HAVE_SCHED_GET_PRIORITY
10787
#cmakedefine01 HAVE_WORKING_GETTIMEOFDAY
10888
#cmakedefine01 HAVE_WORKING_CLOCK_GETTIME
10989
#cmakedefine01 HAVE_CLOCK_MONOTONIC
11090
#cmakedefine01 HAVE_CLOCK_MONOTONIC_COARSE
11191
#cmakedefine01 HAVE_CLOCK_GETTIME_NSEC_NP
112-
#cmakedefine01 HAVE_CLOCK_THREAD_CPUTIME
11392
#cmakedefine01 HAVE_PTHREAD_CONDATTR_SETCLOCK
11493
#cmakedefine01 MMAP_ANON_IGNORES_PROTECTION
11594
#cmakedefine01 ONE_SHARED_MAPPING_PER_FILEREGION_PER_PROCESS
11695
#cmakedefine01 PTHREAD_CREATE_MODIFIES_ERRNO
11796
#cmakedefine01 SEM_INIT_MODIFIES_ERRNO
11897
#cmakedefine01 HAVE_PROCFS_CTL
11998
#cmakedefine01 HAVE_PROCFS_STAT
120-
#cmakedefine01 UNGETC_NOT_RETURN_EOF
12199
#cmakedefine01 HAS_POSIX_SEMAPHORES
122-
#cmakedefine01 FILE_OPS_CHECK_FERROR_OF_PREVIOUS_CALL
123100

124101
#define PAL_THREAD_PRIORITY_MIN 0
125102
#define PAL_THREAD_PRIORITY_MAX 0
126103

127104
#cmakedefine01 HAVE__NSGETENVIRON
128105
#cmakedefine01 DEADLOCK_WHEN_THREAD_IS_SUSPENDED_WHILE_BLOCKED_ON_MUTEX
129106
#cmakedefine PAL_PTRACE(cmd, pid, addr, data) @PAL_PTRACE@
130-
#cmakedefine PAL_PT_ATTACH @PAL_PT_ATTACH@
131-
#cmakedefine PAL_PT_DETACH @PAL_PT_DETACH@
132-
#cmakedefine PAL_PT_READ_D @PAL_PT_READ_D@
133-
#cmakedefine PAL_PT_WRITE_D @PAL_PT_WRITE_D@
134107
#cmakedefine01 SYNCHMGR_SUSPENSION_SAFE_CONDITION_SIGNALING
135108
#cmakedefine01 ERROR_FUNC_FOR_GLOB_HAS_FIXED_PARAMS
136-
#cmakedefine01 HAS_FTRUNCATE_LENGTH_ISSUE
137109
#cmakedefine01 HAVE_FULLY_FEATURED_PTHREAD_MUTEXES
138110
#cmakedefine01 HAVE_FUNCTIONAL_PTHREAD_ROBUST_MUTEXES
139111
#cmakedefine BSD_REGS_STYLE(reg, RR, rr) @BSD_REGS_STYLE@

0 commit comments

Comments
 (0)