add function to linux x86 entrypoint

Author: bassiounix

libc/config/linux/x86_64/entrypoints.txt

@@ -198,6 +198,7 @@ set(TARGET_LIBC_ENTRYPOINTS
     libc.src.stdlib.qsort
     libc.src.stdlib.qsort_r
     libc.src.stdlib.rand
+    libc.src.stdlib.set_constraint_handler_s
     libc.src.stdlib.srand
     libc.src.stdlib.strfromd
     libc.src.stdlib.strfromf
@@ -1127,6 +1128,7 @@ if(LLVM_LIBC_FULL_BUILD)
     libc.src.stdio.fileno
     libc.src.stdio.flockfile
     libc.src.stdio.fopen
+    libc.src.stdio.fopen_s
     libc.src.stdio.fopencookie
     libc.src.stdio.fputc
     libc.src.stdio.fputs
@@ -1162,6 +1164,7 @@ if(LLVM_LIBC_FULL_BUILD)
     libc.src.stdlib.exit
     libc.src.stdlib.getenv
     libc.src.stdlib.quick_exit
+    libc.src.stdlib.set_constraint_handler_s
 
     # signal.h entrypoints
     libc.src.signal.kill

libc/include/CMakeLists.txt

@@ -360,6 +360,7 @@ add_header_macro(
     .llvm-libc-types.lldiv_t
     .llvm-libc-types.locale_t
     .llvm-libc-types.size_t
+    .llvm-libc-types.rsize_t
     .llvm-libc-types.constraint_handler_t
     .llvm_libc_common_h
 )

libc/include/llvm-libc-types/CMakeLists.txt

@@ -1,5 +1,6 @@
 add_header(off64_t HDR off64_t.h)
 add_header(size_t HDR size_t.h)
+add_header(rsize_t HDR rsize_t.h)
 add_header(ssize_t HDR ssize_t.h)
 add_header(__atfork_callback_t HDR __atfork_callback_t.h)
 add_header(__search_compare_t HDR __search_compare_t.h)

libc/include/llvm-libc-types/rsize_t.h

@@ -0,0 +1,14 @@
+//===-- Definition of rsize_t types ---------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_RSIZE_T_H
+#define LLVM_LIBC_TYPES_RSIZE_T_H
+
+typedef __SIZE_TYPE__ rsize_t;
+
+#endif // LLVM_LIBC_TYPES_RSIZE_T_H

libc/include/stdlib.yaml

@@ -17,6 +17,7 @@ types:
   - type_name: lldiv_t
   - type_name: locale_t
   - type_name: size_t
+  - type_name: rsize_t
   - type_name: errno_t
   - type_name: constraint_handler_t
 enums: []
@@ -188,6 +189,22 @@ functions:
     return_type: constraint_handler_t
     arguments:
       - type: constraint_handler_t
+  - name: abort_handler_s
+    standards:
+      - stdc
+    return_type: void
+    arguments:
+      - type: const char *__restrict
+      - type: void *__restrict
+      - type: errno_t
+  - name: ignore_handler_s
+    standards:
+      - stdc
+    return_type: void
+    arguments:
+      - type: const char *__restrict
+      - type: void *__restrict
+      - type: errno_t
   - name: srand
     standards:
       - stdc

libc/src/__support/annex_k/CMakeLists.txt

@@ -35,6 +35,6 @@ add_header_library(
   HDRS
     libc_constraint_handler.h
   DEPENDS
-    libc.src.__support.annex_k.abort_handler_s
+    .abort_handler_s
     libc.hdr.types.errno_t
 )

libc/src/__support/annex_k/abort_handler_s.h

@@ -21,7 +21,8 @@
 namespace LIBC_NAMESPACE_DECL {
 
 LIBC_INLINE static void abort_handler_s(const char *__restrict msg,
-                                        void *__restrict ptr, errno_t error) {
+                                        [[maybe_unused]] void *__restrict ptr,
+                                        errno_t error) {
   libc_errno = error;
   fprintf(stderr, "abort_handler_s was called in response to a "
                   "runtime-constraint violation.\n\n");

libc/src/__support/annex_k/helper_macros.h

@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_SRC___SUPPORT_ANNEX_K_HELPER_MACROS_H
 #define LLVM_LIBC_SRC___SUPPORT_ANNEX_K_HELPER_MACROS_H
 
-#include "libc_constraint_hander.h"
+#include "libc_constraint_handler.h"
 
 #define _CONSTRAINT_VIOLATION(msg, error_code, ret_code)                       \
   {                                                                            \

…support/annex_k/libc_constraint_hander.h …upport/annex_k/libc_constraint_handler.hlibc/src/__support/annex_k/libc_constraint_hander.h renamed to libc/src/__support/annex_k/libc_constraint_handler.h libc/src/__support/annex_k/libc_constraint_hander.h renamed to libc/src/__support/annex_k/libc_constraint_handler.h

@@ -9,8 +9,8 @@
 #ifndef LLVM_LIBC_SRC___SUPPORT_ANNEX_K_LIBC_CONSTRAINT_HANDER_H
 #define LLVM_LIBC_SRC___SUPPORT_ANNEX_K_LIBC_CONSTRAINT_HANDER_H
 
+#include "abort_handler_s.h"
 #include "hdr/types/constraint_handler_t.h"
-#include "src/__support/annex_k/abort_handler_s.h"
 
 namespace LIBC_NAMESPACE_DECL {
 

libc/src/stdio/CMakeLists.txt

@@ -204,14 +204,6 @@ add_entrypoint_object(
     .${LIBC_TARGET_OS}.fdopen
 )
 
-add_entrypoint_object(
-  fopen_s
-  HDRS
-    fopen_s.h
-  DEPENDS
-    .generic.fopen_s
-)
-
 # These entrypoints have multiple potential implementations.
 add_stdio_entrypoint_object(feof)
 add_stdio_entrypoint_object(feof_unlocked)
@@ -226,6 +218,7 @@ add_stdio_entrypoint_object(fflush)
 add_stdio_entrypoint_object(clearerr)
 add_stdio_entrypoint_object(clearerr_unlocked)
 add_stdio_entrypoint_object(fopen)
+add_stdio_entrypoint_object(fopen_s)
 add_stdio_entrypoint_object(fclose)
 add_stdio_entrypoint_object(fread_unlocked)
 add_stdio_entrypoint_object(fread)