[libc-commits] [libc] d6722bc - [libc] Move EOF macro to stdio-macros.h (#85159)

[via libc-commits]

Author: Petr Hosek
Date: 2024-03-15T10:56:39-07:00
New Revision: d6722bcbd60af7d56a201cb6ff47097d98b03be9

URL: https://github.com/llvm/llvm-project/commit/d6722bcbd60af7d56a201cb6ff47097d98b03be9
DIFF: https://github.com/llvm/llvm-project/commit/d6722bcbd60af7d56a201cb6ff47097d98b03be9.diff

LOG: [libc] Move EOF macro to stdio-macros.h (#85159)

libc++ char_traits.h assumes EOF is always available

See #85158 for more details.

Added: 
    

Modified: 
    libc/config/baremetal/api.td
    libc/config/gpu/api.td
    libc/config/linux/api.td
    libc/include/llvm-libc-macros/stdio-macros.h

Removed: 
    


################################################################################
diff  --git a/libc/config/baremetal/api.td b/libc/config/baremetal/api.td
index 80d0e0ba22ca51..9548cc47203d7d 100644
--- a/libc/config/baremetal/api.td
+++ b/libc/config/baremetal/api.td
@@ -52,6 +52,10 @@ def IntTypesAPI : PublicAPI<"inttypes.h"> {
   let Types = ["imaxdiv_t"];
 }
 
+def StdIOAPI : PublicAPI<"stdio.h"> {
+  let Types = ["size_t"];
+}
+
 def StdlibAPI : PublicAPI<"stdlib.h"> {
   let Types = [
     "div_t",

diff  --git a/libc/config/gpu/api.td b/libc/config/gpu/api.td
index 607b8b6d5900c8..adaf5bfd747ac7 100644
--- a/libc/config/gpu/api.td
+++ b/libc/config/gpu/api.td
@@ -63,7 +63,6 @@ def StdIOAPI : PublicAPI<"stdio.h"> {
     SimpleMacroDef<"_IOFBF", "0">,
     SimpleMacroDef<"_IOLBF", "1">,
     SimpleMacroDef<"_IONBF", "2">,
-    SimpleMacroDef<"EOF", "-1">,
   ];
   let Types = ["size_t", "FILE"];
 }

diff  --git a/libc/config/linux/api.td b/libc/config/linux/api.td
index 75432a2a298652..04d720daf9509c 100644
--- a/libc/config/linux/api.td
+++ b/libc/config/linux/api.td
@@ -76,7 +76,6 @@ def StdIOAPI : PublicAPI<"stdio.h"> {
     SimpleMacroDef<"_IOFBF", "0">,
     SimpleMacroDef<"_IOLBF", "1">,
     SimpleMacroDef<"_IONBF", "2">,
-    SimpleMacroDef<"EOF", "-1">,
   ];
   let Types = ["size_t", "FILE", "cookie_io_functions_t"];
 }

diff  --git a/libc/include/llvm-libc-macros/stdio-macros.h b/libc/include/llvm-libc-macros/stdio-macros.h
index db747c5d5d6755..4664801c5731f0 100644
--- a/libc/include/llvm-libc-macros/stdio-macros.h
+++ b/libc/include/llvm-libc-macros/stdio-macros.h
@@ -9,6 +9,10 @@
 #ifndef LLVM_LIBC_MACROS_STDIO_MACROS_H
 #define LLVM_LIBC_MACROS_STDIO_MACROS_H
 
+#ifndef EOF
+#define EOF (-1)
+#endif
+
 #define BUFSIZ 1024
 
 #endif // LLVM_LIBC_MACROS_STDIO_MACROS_H