From 5e7bb74c3e899b4d8cbed93269f297006a05218a Mon Sep 17 00:00:00 2001 From: Levi Broderick Date: Wed, 5 Jun 2024 17:49:21 -0700 Subject: [PATCH 1/2] Remove vestigial HAVE_LARGE_SNPRINTF_SUPPORT checks --- eng/native/tryrun.cmake | 3 --- eng/native/tryrun_ios_tvos.cmake | 1 - src/coreclr/pal/src/config.h.in | 1 - src/coreclr/pal/src/configure.cmake | 12 ------------ 4 files changed, 17 deletions(-) diff --git a/eng/native/tryrun.cmake b/eng/native/tryrun.cmake index a4cc7eaf93106f..4bdb59ef42e31c 100644 --- a/eng/native/tryrun.cmake +++ b/eng/native/tryrun.cmake @@ -59,7 +59,6 @@ if(DARWIN) 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_LARGE_SNPRINTF_SUPPORT_EXITCODE 0) set_cache_value(HAVE_MMAP_DEV_ZERO_EXITCODE 1) set_cache_value(HAVE_PROCFS_CTL_EXITCODE 1) set_cache_value(HAVE_PROCFS_STAT_EXITCODE 1) @@ -86,7 +85,6 @@ elseif(TARGET_ARCH_NAME MATCHES "^(armel|arm|armv6|arm64|loongarch64|riscv64|s39 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_LARGE_SNPRINTF_SUPPORT_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) @@ -121,7 +119,6 @@ elseif(TARGET_ARCH_NAME MATCHES "^(armel|arm|armv6|arm64|loongarch64|riscv64|s39 set_cache_value(UNGETC_NOT_RETURN_EOF 0) set_cache_value(HAVE_FUNCTIONAL_PTHREAD_ROBUST_MUTEXES_EXITCODE 0) elseif(ILLUMOS) - set_cache_value(HAVE_LARGE_SNPRINTF_SUPPORT_EXITCODE 1) set_cache_value(HAVE_PROCFS_CTL_EXITCODE 0) set_cache_value(SSCANF_SUPPORT_ll_EXITCODE 1) set_cache_value(UNGETC_NOT_RETURN_EOF_EXITCODE 0) diff --git a/eng/native/tryrun_ios_tvos.cmake b/eng/native/tryrun_ios_tvos.cmake index e3dfeb62780b30..525cc8f040c34e 100644 --- a/eng/native/tryrun_ios_tvos.cmake +++ b/eng/native/tryrun_ios_tvos.cmake @@ -18,7 +18,6 @@ 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_LARGE_SNPRINTF_SUPPORT_EXITCODE 0) set_cache_value(HAVE_MMAP_DEV_ZERO_EXITCODE 1) set_cache_value(HAVE_PROCFS_CTL_EXITCODE 1) set_cache_value(HAVE_PROCFS_STAT_EXITCODE 1) diff --git a/src/coreclr/pal/src/config.h.in b/src/coreclr/pal/src/config.h.in index aba4249541b434..086bcc81ce04d1 100644 --- a/src/coreclr/pal/src/config.h.in +++ b/src/coreclr/pal/src/config.h.in @@ -100,7 +100,6 @@ #cmakedefine01 REALPATH_SUPPORTS_NONEXISTENT_FILES #cmakedefine01 SSCANF_SUPPORT_ll -#cmakedefine01 HAVE_LARGE_SNPRINTF_SUPPORT #cmakedefine01 HAVE_BROKEN_FIFO_SELECT #cmakedefine01 HAVE_BROKEN_FIFO_KEVENT #cmakedefine01 HAS_FTRUNCATE_LENGTH_ISSUE diff --git a/src/coreclr/pal/src/configure.cmake b/src/coreclr/pal/src/configure.cmake index ed730378074c3c..37aee1c8db2703 100644 --- a/src/coreclr/pal/src/configure.cmake +++ b/src/coreclr/pal/src/configure.cmake @@ -220,18 +220,6 @@ int main(void) check_cxx_source_runs(" #include #include - -int main(void) { - char buf[256] = { 0 }; - snprintf(buf, 0x7fffffff, \"%#x\", 0x12345678); - if (buf[0] == 0x0) { - exit(1); - } - exit(0); -}" HAVE_LARGE_SNPRINTF_SUPPORT) -check_cxx_source_runs(" -#include -#include #include #include #include From 27e17b32b559e6d67eed69de239bcce79cb4a2ec Mon Sep 17 00:00:00 2001 From: Levi Broderick Date: Thu, 6 Jun 2024 18:59:06 -0700 Subject: [PATCH 2/2] Remove unneeded references to SSCANF_SUPPORT_ll --- eng/native/tryrun.cmake | 4 ---- eng/native/tryrun_ios_tvos.cmake | 1 - src/coreclr/pal/src/config.h.in | 1 - src/coreclr/pal/src/configure.cmake | 9 --------- 4 files changed, 15 deletions(-) diff --git a/eng/native/tryrun.cmake b/eng/native/tryrun.cmake index 4bdb59ef42e31c..18f37058f5ae54 100644 --- a/eng/native/tryrun.cmake +++ b/eng/native/tryrun.cmake @@ -72,7 +72,6 @@ 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(SSCANF_SUPPORT_ll_EXITCODE 0) set_cache_value(UNGETC_NOT_RETURN_EOF_EXITCODE 1) set_cache_value(HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP_EXITCODE 1) else() @@ -101,11 +100,9 @@ elseif(TARGET_ARCH_NAME MATCHES "^(armel|arm|armv6|arm64|loongarch64|riscv64|s39 if(ALPINE_LINUX) set_cache_value(HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP_EXITCODE 1) - set_cache_value(SSCANF_SUPPORT_ll_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(SSCANF_SUPPORT_ll_EXITCODE 0) set_cache_value(UNGETC_NOT_RETURN_EOF_EXITCODE 0) endif() @@ -120,7 +117,6 @@ elseif(TARGET_ARCH_NAME MATCHES "^(armel|arm|armv6|arm64|loongarch64|riscv64|s39 set_cache_value(HAVE_FUNCTIONAL_PTHREAD_ROBUST_MUTEXES_EXITCODE 0) elseif(ILLUMOS) set_cache_value(HAVE_PROCFS_CTL_EXITCODE 0) - set_cache_value(SSCANF_SUPPORT_ll_EXITCODE 1) 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) diff --git a/eng/native/tryrun_ios_tvos.cmake b/eng/native/tryrun_ios_tvos.cmake index 525cc8f040c34e..59b496ddfafa7c 100644 --- a/eng/native/tryrun_ios_tvos.cmake +++ b/eng/native/tryrun_ios_tvos.cmake @@ -30,6 +30,5 @@ 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(SSCANF_SUPPORT_ll_EXITCODE 0) 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 086bcc81ce04d1..1c4f815c8f8147 100644 --- a/src/coreclr/pal/src/config.h.in +++ b/src/coreclr/pal/src/config.h.in @@ -99,7 +99,6 @@ #cmakedefine01 HAVE__SC_AVPHYS_PAGES #cmakedefine01 REALPATH_SUPPORTS_NONEXISTENT_FILES -#cmakedefine01 SSCANF_SUPPORT_ll #cmakedefine01 HAVE_BROKEN_FIFO_SELECT #cmakedefine01 HAVE_BROKEN_FIFO_KEVENT #cmakedefine01 HAS_FTRUNCATE_LENGTH_ISSUE diff --git a/src/coreclr/pal/src/configure.cmake b/src/coreclr/pal/src/configure.cmake index 37aee1c8db2703..c6b70fb8b02114 100644 --- a/src/coreclr/pal/src/configure.cmake +++ b/src/coreclr/pal/src/configure.cmake @@ -211,15 +211,6 @@ int main(void) { check_cxx_source_runs(" #include #include -int main(void) -{ - long long n = 0; - sscanf(\"5000000000\", \"%qu\", &n); - exit (n != 5000000000); - }" SSCANF_SUPPORT_ll) -check_cxx_source_runs(" -#include -#include #include #include #include