[libcxx][c++26] 2937R0: Freestanding: Remove strtok

libcxx/include/cstring

@@ -47,7 +47,7 @@ const char* strrchr(const char* s, int c);
 size_t strspn(const char* s1, const char* s2);
 const char* strstr(const char* s1, const char* s2);
       char* strstr(      char* s1, const char* s2);
-char* strtok(char* restrict s1, const char* restrict s2);
+char* strtok(char* restrict s1, const char* restrict s2); // not freestanding
 void* memset(void* s, int c, size_t n);
 char* strerror(int errnum);
 size_t strlen(const char* s);

libcxx/include/version

@@ -116,7 +116,7 @@ __cpp_lib_formatters                                    202302L <stacktrace> <th
 __cpp_lib_forward_like                                  202207L <utility>
 __cpp_lib_freestanding_algorithm                        202311L <algorithm>
 __cpp_lib_freestanding_array                            202311L <array>
-__cpp_lib_freestanding_cstring                          202306L <cstring>
+__cpp_lib_freestanding_cstring                          202307L <cstring>
 __cpp_lib_freestanding_expected                         202311L <expected>
 __cpp_lib_freestanding_mdspan                           202311L <mdspan>
 __cpp_lib_freestanding_optional                         202311L <optional>
@@ -558,7 +558,7 @@ __cpp_lib_void_t                                        201411L <type_traits>
 // # define __cpp_lib_format_path                          202403L
 // # define __cpp_lib_freestanding_algorithm               202311L
 // # define __cpp_lib_freestanding_array                   202311L
-// # define __cpp_lib_freestanding_cstring                 202306L
+// # define __cpp_lib_freestanding_cstring                 202307L
 // # define __cpp_lib_freestanding_expected                202311L
 // # define __cpp_lib_freestanding_mdspan                  202311L
 // # define __cpp_lib_freestanding_optional                202311L

libcxx/test/std/cstring/freestanding/strtok_removed.verify.cpp

@@ -0,0 +1,14 @@
+// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20, c++23
+// REQUIRES: c++2c
+// XFAIL: *
+
+// RUN: %clang %s -c -o /dev/null -ffreestanding --std=c++2c 2>&1
+
+#include <cstring> 
+
+int main() {
+  char s[] = "hello world";
+  char* tok = std::strtok(s, " ");
+  (void)tok;
+  return 0;
+}

libcxx/test/std/language.support/support.limits/support.limits.general/cstring.version.compile.pass.cpp

@@ -54,8 +54,8 @@
 #    ifndef __cpp_lib_freestanding_cstring
 #      error "__cpp_lib_freestanding_cstring should be defined in c++26"
 #    endif
-#    if __cpp_lib_freestanding_cstring != 202306L
-#      error "__cpp_lib_freestanding_cstring should have the value 202306L in c++26"
+#    if __cpp_lib_freestanding_cstring != 202307L
+#      error "__cpp_lib_freestanding_cstring should have the value 202307L in c++26"
 #    endif
 #  else
 #    ifdef __cpp_lib_freestanding_cstring

libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp

@@ -6809,8 +6809,8 @@
 #    ifndef __cpp_lib_freestanding_cstring
 #      error "__cpp_lib_freestanding_cstring should be defined in c++26"
 #    endif
-#    if __cpp_lib_freestanding_cstring != 202306L
-#      error "__cpp_lib_freestanding_cstring should have the value 202306L in c++26"
+#    if __cpp_lib_freestanding_cstring != 202307L
+#      error "__cpp_lib_freestanding_cstring should have the value 202307L in c++26"
 #    endif
 #  else
 #    ifdef __cpp_lib_freestanding_cstring

libcxx/utils/generate_feature_test_macro_components.py

@@ -615,7 +615,8 @@ def add_version_header(tc):
         {
             "name": "__cpp_lib_freestanding_cstring",
             "values": {
-                "c++26": 202306  # P2338R4 Freestanding Library: Character primitives and the C library
+                "c++26": 202307  # P2937R0 Freestanding: Remove strtok
+                # 		 202306	 # P2338R4 Freestanding Library: Character primitives and the C library
                 #        202311  # P2407R5 Freestanding Library: Partial Classes
             },
             "headers": ["cstring"],