posix: sysconf: match _SC* defines with newlib/picolib

It's possible for newlib/picolib libc libraries to
internally call sysconf() which would execute zephyr's
implementation.  However, if the _SC* defines do not have
matching values, then the incorrect switch case executes.

This issue arises when using newlib/picolib libc that includes
sysconf implementation for ARM.  With current defaults, the
zephyr sysconf() overrides the original libc sysconf() so
we must ensure proper operation.

Signed-off-by: Nicholas Lowell <[email protected]>

Author: Nicholas Lowell

include/zephyr/posix/sys/sysconf.h

@@ -13,132 +13,162 @@
 extern "C" {
 #endif
 
+/* Values assigned are intended to match the values assigned in newlib and picolib
+ * Even though the POSIX standard does not require specific values, this seems to be
+ * required for proper sysconf() operation when called from within newlib/picolib itself.
+ */
 enum {
-	_SC_ADVISORY_INFO,
-	_SC_ASYNCHRONOUS_IO,
-	_SC_BARRIERS,
-	_SC_CLOCK_SELECTION,
-	_SC_CPUTIME,
-	_SC_FSYNC,
-	_SC_IPV6,
-	_SC_JOB_CONTROL,
-	_SC_MAPPED_FILES,
-	_SC_MEMLOCK,
-	_SC_MEMLOCK_RANGE,
-	_SC_MEMORY_PROTECTION,
-	_SC_MESSAGE_PASSING,
-	_SC_MONOTONIC_CLOCK,
-	_SC_PRIORITIZED_IO,
-	_SC_PRIORITY_SCHEDULING,
-	_SC_RAW_SOCKETS,
-	_SC_RE_DUP_MAX,
-	_SC_READER_WRITER_LOCKS,
-	_SC_REALTIME_SIGNALS,
-	_SC_REGEXP,
-	_SC_SAVED_IDS,
-	_SC_SEMAPHORES,
-	_SC_SHARED_MEMORY_OBJECTS,
-	_SC_SHELL,
-	_SC_SPAWN,
-	_SC_SPIN_LOCKS,
-	_SC_SPORADIC_SERVER,
-	_SC_SS_REPL_MAX,
-	_SC_SYNCHRONIZED_IO,
-	_SC_THREAD_ATTR_STACKADDR,
-	_SC_THREAD_ATTR_STACKSIZE,
-	_SC_THREAD_CPUTIME,
-	_SC_THREAD_PRIO_INHERIT,
-	_SC_THREAD_PRIO_PROTECT,
-	_SC_THREAD_PRIORITY_SCHEDULING,
-	_SC_THREAD_PROCESS_SHARED,
-	_SC_THREAD_ROBUST_PRIO_INHERIT,
-	_SC_THREAD_ROBUST_PRIO_PROTECT,
-	_SC_THREAD_SAFE_FUNCTIONS,
-	_SC_THREAD_SPORADIC_SERVER,
-	_SC_THREADS,
-	_SC_TIMEOUTS,
-	_SC_TIMERS,
-	_SC_TRACE,
-	_SC_TRACE_EVENT_FILTER,
-	_SC_TRACE_EVENT_NAME_MAX,
-	_SC_TRACE_INHERIT,
-	_SC_TRACE_LOG,
-	_SC_TRACE_NAME_MAX,
-	_SC_TRACE_SYS_MAX,
-	_SC_TRACE_USER_EVENT_MAX,
-	_SC_TYPED_MEMORY_OBJECTS,
-	_SC_VERSION,
-	_SC_V7_ILP32_OFF32,
-	_SC_V7_ILP32_OFFBIG,
-	_SC_V7_LP64_OFF64,
-	_SC_V7_LPBIG_OFFBIG,
-	_SC_V6_ILP32_OFF32,
-	_SC_V6_ILP32_OFFBIG,
-	_SC_V6_LP64_OFF64,
-	_SC_V6_LPBIG_OFFBIG,
-	_SC_BC_BASE_MAX,
-	_SC_BC_DIM_MAX,
-	_SC_BC_SCALE_MAX,
-	_SC_BC_STRING_MAX,
-	_SC_2_C_BIND,
-	_SC_2_C_DEV,
-	_SC_2_CHAR_TERM,
-	_SC_COLL_WEIGHTS_MAX,
-	_SC_DELAYTIMER_MAX,
-	_SC_EXPR_NEST_MAX,
-	_SC_2_FORT_DEV,
-	_SC_2_FORT_RUN,
-	_SC_LINE_MAX,
-	_SC_2_LOCALEDEF,
-	_SC_2_PBS,
-	_SC_2_PBS_ACCOUNTING,
-	_SC_2_PBS_CHECKPOINT,
-	_SC_2_PBS_LOCATE,
-	_SC_2_PBS_MESSAGE,
-	_SC_2_PBS_TRACK,
-	_SC_2_SW_DEV,
-	_SC_2_UPE,
-	_SC_2_VERSION,
-	_SC_XOPEN_CRYPT,
-	_SC_XOPEN_ENH_I18N,
-	_SC_XOPEN_REALTIME,
-	_SC_XOPEN_REALTIME_THREADS,
-	_SC_XOPEN_SHM,
-	_SC_XOPEN_STREAMS,
-	_SC_XOPEN_UNIX,
-	_SC_XOPEN_UUCP,
-	_SC_XOPEN_VERSION,
-	_SC_CLK_TCK,
-	_SC_GETGR_R_SIZE_MAX,
-	_SC_GETPW_R_SIZE_MAX,
-	_SC_AIO_LISTIO_MAX,
-	_SC_AIO_MAX,
-	_SC_AIO_PRIO_DELTA_MAX,
-	_SC_ARG_MAX,
-	_SC_ATEXIT_MAX,
-	_SC_CHILD_MAX,
-	_SC_HOST_NAME_MAX,
-	_SC_IOV_MAX,
-	_SC_LOGIN_NAME_MAX,
-	_SC_NGROUPS_MAX,
-	_SC_MQ_OPEN_MAX,
-	_SC_MQ_PRIO_MAX,
-	_SC_OPEN_MAX,
-	_SC_PAGE_SIZE,
-	_SC_PAGESIZE,
-	_SC_THREAD_DESTRUCTOR_ITERATIONS,
-	_SC_THREAD_KEYS_MAX,
-	_SC_THREAD_STACK_MIN,
-	_SC_THREAD_THREADS_MAX,
-	_SC_RTSIG_MAX,
-	_SC_SEM_NSEMS_MAX,
-	_SC_SEM_VALUE_MAX,
-	_SC_SIGQUEUE_MAX,
-	_SC_STREAM_MAX,
-	_SC_SYMLOOP_MAX,
-	_SC_TIMER_MAX,
-	_SC_TTY_NAME_MAX,
-	_SC_TZNAME_MAX,
+	_SC_ARG_MAX = 0,
+	_SC_CHILD_MAX = 1,
+	_SC_CLK_TCK = 2,
+	_SC_NGROUPS_MAX = 3,
+	_SC_OPEN_MAX = 4,
+	_SC_JOB_CONTROL = 5,
+	_SC_SAVED_IDS = 6,
+	_SC_VERSION = 7,
+	_SC_PAGESIZE = 8,
+	_SC_PAGE_SIZE = _SC_PAGESIZE,
+	_SC_NPROCESSORS_CONF = 9,
+	_SC_NPROCESSORS_ONLN = 10,
+	_SC_PHYS_PAGES = 11,
+	_SC_AVPHYS_PAGES = 12,
+	_SC_MQ_OPEN_MAX = 13,
+	_SC_MQ_PRIO_MAX = 14,
+	_SC_RTSIG_MAX = 15,
+	_SC_SEM_NSEMS_MAX = 16,
+	_SC_SEM_VALUE_MAX = 17,
+	_SC_SIGQUEUE_MAX = 18,
+	_SC_TIMER_MAX = 19,
+	_SC_TZNAME_MAX = 20,
+	_SC_ASYNCHRONOUS_IO = 21,
+	_SC_FSYNC = 22,
+	_SC_MAPPED_FILES = 23,
+	_SC_MEMLOCK = 24,
+	_SC_MEMLOCK_RANGE = 25,
+	_SC_MEMORY_PROTECTION = 26,
+	_SC_MESSAGE_PASSING = 27,
+	_SC_PRIORITIZED_IO = 28,
+	_SC_REALTIME_SIGNALS = 29,
+	_SC_SEMAPHORES = 30,
+	_SC_SHARED_MEMORY_OBJECTS = 31,
+	_SC_SYNCHRONIZED_IO = 32,
+	_SC_TIMERS = 33,
+	_SC_AIO_LISTIO_MAX = 34,
+	_SC_AIO_MAX = 35,
+	_SC_AIO_PRIO_DELTA_MAX = 36,
+	_SC_DELAYTIMER_MAX = 37,
+	_SC_THREAD_KEYS_MAX = 38,
+	_SC_THREAD_STACK_MIN = 39,
+	_SC_THREAD_THREADS_MAX = 40,
+	_SC_TTY_NAME_MAX = 41,
+	_SC_THREADS = 42,
+	_SC_THREAD_ATTR_STACKADDR = 43,
+	_SC_THREAD_ATTR_STACKSIZE = 44,
+	_SC_THREAD_PRIORITY_SCHEDULING = 45,
+	_SC_THREAD_PRIO_INHERIT = 46,
+	_SC_THREAD_PRIO_PROTECT = 47,
+	_SC_THREAD_PRIO_CEILING = _SC_THREAD_PRIO_PROTECT,
+	_SC_THREAD_PROCESS_SHARED = 48,
+	_SC_THREAD_SAFE_FUNCTIONS = 49,
+	_SC_GETGR_R_SIZE_MAX = 50,
+	_SC_GETPW_R_SIZE_MAX = 51,
+	_SC_LOGIN_NAME_MAX = 52,
+	_SC_THREAD_DESTRUCTOR_ITERATIONS = 53,
+	_SC_ADVISORY_INFO = 54,
+	_SC_ATEXIT_MAX = 55,
+	_SC_BARRIERS = 56,
+	_SC_BC_BASE_MAX = 57,
+	_SC_BC_DIM_MAX = 58,
+	_SC_BC_SCALE_MAX = 59,
+	_SC_BC_STRING_MAX = 60,
+	_SC_CLOCK_SELECTION = 61,
+	_SC_COLL_WEIGHTS_MAX = 62,
+	_SC_CPUTIME = 63,
+	_SC_EXPR_NEST_MAX = 64,
+	_SC_HOST_NAME_MAX = 65,
+	_SC_IOV_MAX = 66,
+	_SC_IPV6 = 67,
+	_SC_LINE_MAX = 68,
+	_SC_MONOTONIC_CLOCK = 69,
+	_SC_RAW_SOCKETS = 70,
+	_SC_READER_WRITER_LOCKS = 71,
+	_SC_REGEXP = 72,
+	_SC_RE_DUP_MAX = 73,
+	_SC_SHELL = 74,
+	_SC_SPAWN = 75,
+	_SC_SPIN_LOCKS = 76,
+	_SC_SPORADIC_SERVER = 77,
+	_SC_SS_REPL_MAX = 78,
+	_SC_SYMLOOP_MAX = 79,
+	_SC_THREAD_CPUTIME = 80,
+	_SC_THREAD_SPORADIC_SERVER = 81,
+	_SC_TIMEOUTS = 82,
+	_SC_TRACE = 83,
+	_SC_TRACE_EVENT_FILTER = 84,
+	_SC_TRACE_EVENT_NAME_MAX = 85,
+	_SC_TRACE_INHERIT = 86,
+	_SC_TRACE_LOG = 87,
+	_SC_TRACE_NAME_MAX = 88,
+	_SC_TRACE_SYS_MAX = 89,
+	_SC_TRACE_USER_EVENT_MAX = 90,
+	_SC_TYPED_MEMORY_OBJECTS = 91,
+	_SC_V7_ILP32_OFF32 = 92,
+	_SC_V6_ILP32_OFF32 = _SC_V7_ILP32_OFF32,
+	_SC_XBS5_ILP32_OFF32 = _SC_V7_ILP32_OFF32,
+	_SC_V7_ILP32_OFFBIG = 93,
+	_SC_V6_ILP32_OFFBIG = _SC_V7_ILP32_OFFBIG,
+	_SC_XBS5_ILP32_OFFBIG = _SC_V7_ILP32_OFFBIG,
+	_SC_V7_LP64_OFF64 = 94,
+	_SC_V6_LP64_OFF64 = _SC_V7_LP64_OFF64,
+	_SC_XBS5_LP64_OFF64 = _SC_V7_LP64_OFF64,
+	_SC_V7_LPBIG_OFFBIG = 95,
+	_SC_V6_LPBIG_OFFBIG = _SC_V7_LPBIG_OFFBIG,
+	_SC_XBS5_LPBIG_OFFBIG = _SC_V7_LPBIG_OFFBIG,
+	_SC_XOPEN_CRYPT = 96,
+	_SC_XOPEN_ENH_I18N = 97,
+	_SC_XOPEN_LEGACY = 98,
+	_SC_XOPEN_REALTIME = 99,
+	_SC_STREAM_MAX = 100,
+	_SC_PRIORITY_SCHEDULING = 101,
+	_SC_XOPEN_REALTIME_THREADS = 102,
+	_SC_XOPEN_SHM = 103,
+	_SC_XOPEN_STREAMS = 104,
+	_SC_XOPEN_UNIX = 105,
+	_SC_XOPEN_VERSION = 106,
+	_SC_2_CHAR_TERM = 107,
+	_SC_2_C_BIND = 108,
+	_SC_2_C_DEV = 109,
+	_SC_2_FORT_DEV = 110,
+	_SC_2_FORT_RUN = 111,
+	_SC_2_LOCALEDEF = 112,
+	_SC_2_PBS = 113,
+	_SC_2_PBS_ACCOUNTING = 114,
+	_SC_2_PBS_CHECKPOINT = 115,
+	_SC_2_PBS_LOCATE = 116,
+	_SC_2_PBS_MESSAGE = 117,
+	_SC_2_PBS_TRACK = 118,
+	_SC_2_SW_DEV = 119,
+	_SC_2_UPE = 120,
+	_SC_2_VERSION = 121,
+	_SC_THREAD_ROBUST_PRIO_INHERIT = 122,
+	_SC_THREAD_ROBUST_PRIO_PROTECT = 123,
+	_SC_XOPEN_UUCP = 124,
+	_SC_LEVEL1_ICACHE_SIZE = 125,
+	_SC_LEVEL1_ICACHE_ASSOC = 126,
+	_SC_LEVEL1_ICACHE_LINESIZE = 127,
+	_SC_LEVEL1_DCACHE_SIZE = 128,
+	_SC_LEVEL1_DCACHE_ASSOC = 129,
+	_SC_LEVEL1_DCACHE_LINESIZE = 130,
+	_SC_LEVEL2_CACHE_SIZE = 131,
+	_SC_LEVEL2_CACHE_ASSOC = 132,
+	_SC_LEVEL2_CACHE_LINESIZE = 133,
+	_SC_LEVEL3_CACHE_SIZE = 134,
+	_SC_LEVEL3_CACHE_ASSOC = 135,
+	_SC_LEVEL3_CACHE_LINESIZE = 136,
+	_SC_LEVEL4_CACHE_SIZE = 137,
+	_SC_LEVEL4_CACHE_ASSOC = 138,
+	_SC_LEVEL4_CACHE_LINESIZE = 139,
+	_SC_POSIX_26_VERSION = 140,
 };
 
 #define __z_posix_sysconf_SC_ADVISORY_INFO (-1L)
@@ -220,10 +250,6 @@ enum {
 #define __z_posix_sysconf_SC_TRACE_USER_EVENT_MAX         _POSIX_TRACE_USER_EVENT_MAX
 #define __z_posix_sysconf_SC_TYPED_MEMORY_OBJECTS         (-1L)
 #define __z_posix_sysconf_SC_VERSION                      _POSIX_VERSION
-#define __z_posix_sysconf_SC_V6_ILP32_OFF32               (-1L)
-#define __z_posix_sysconf_SC_V6_ILP32_OFFBIG              (-1L)
-#define __z_posix_sysconf_SC_V6_LP64_OFF64                (-1L)
-#define __z_posix_sysconf_SC_V6_LPBIG_OFFBIG              (-1L)
 #define __z_posix_sysconf_SC_V7_ILP32_OFF32               (-1L)
 #define __z_posix_sysconf_SC_V7_ILP32_OFFBIG              (-1L)
 #define __z_posix_sysconf_SC_V7_LP64_OFF64                (-1L)
@@ -280,7 +306,6 @@ enum {
 #define __z_posix_sysconf_SC_MQ_PRIO_MAX                  MQ_PRIO_MAX
 #define __z_posix_sysconf_SC_OPEN_MAX                     CONFIG_ZVFS_OPEN_MAX
 #define __z_posix_sysconf_SC_PAGE_SIZE                    PAGE_SIZE
-#define __z_posix_sysconf_SC_PAGESIZE                     PAGESIZE
 #define __z_posix_sysconf_SC_THREAD_DESTRUCTOR_ITERATIONS PTHREAD_DESTRUCTOR_ITERATIONS
 #define __z_posix_sysconf_SC_THREAD_KEYS_MAX              PTHREAD_KEYS_MAX
 #define __z_posix_sysconf_SC_THREAD_STACK_MIN             PTHREAD_STACK_MIN

lib/posix/options/sysconf.c

@@ -125,21 +125,17 @@ long sysconf(int x)
 		return z_sysconf(_SC_TYPED_MEMORY_OBJECTS);
 	case _SC_VERSION:
 		return z_sysconf(_SC_VERSION);
-	case _SC_V6_ILP32_OFF32:
-		return z_sysconf(_SC_V6_ILP32_OFF32);
-	case _SC_V6_ILP32_OFFBIG:
-		return z_sysconf(_SC_V6_ILP32_OFFBIG);
-	case _SC_V6_LP64_OFF64:
-		return z_sysconf(_SC_V6_LP64_OFF64);
-	case _SC_V6_LPBIG_OFFBIG:
-		return z_sysconf(_SC_V6_LPBIG_OFFBIG);
 	case _SC_V7_ILP32_OFF32:
+	/* case _SC_V6_ILP32_OFF32: */
 		return z_sysconf(_SC_V7_ILP32_OFF32);
 	case _SC_V7_ILP32_OFFBIG:
+	/* case _SC_V6_ILP32_OFFBIG: */
 		return z_sysconf(_SC_V7_ILP32_OFFBIG);
 	case _SC_V7_LP64_OFF64:
+	/* case _SC_V6_LP64_OFF64: */
 		return z_sysconf(_SC_V7_LP64_OFF64);
 	case _SC_V7_LPBIG_OFFBIG:
+	/* case _SC_V6_LPBIG_OFFBIG: */
 		return z_sysconf(_SC_V7_LPBIG_OFFBIG);
 	case _SC_BC_BASE_MAX:
 		return z_sysconf(_SC_BC_BASE_MAX);
@@ -237,10 +233,9 @@ long sysconf(int x)
 		return z_sysconf(_SC_MQ_PRIO_MAX);
 	case _SC_OPEN_MAX:
 		return z_sysconf(_SC_OPEN_MAX);
-	case _SC_PAGE_SIZE:
-		return z_sysconf(_SC_PAGE_SIZE);
 	case _SC_PAGESIZE:
-		return z_sysconf(_SC_PAGESIZE);
+	/* case _SC_PAGE_SIZE: */
+		return z_sysconf(_SC_PAGE_SIZE);
 	case _SC_THREAD_DESTRUCTOR_ITERATIONS:
 		return z_sysconf(_SC_THREAD_DESTRUCTOR_ITERATIONS);
 	case _SC_THREAD_KEYS_MAX: