Skip to content

[libc] Move hdrgen yaml files into include/ #121443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 2, 2025

Conversation

frobtech
Copy link
Contributor

@frobtech frobtech commented Jan 1, 2025

The .yaml files should live next to the corresponding .h.def
files in libc/include/, rather than next to the implementation of
the tool in libc/utils/hdrgen/. As with the .h.def files, there
is no need for a yaml/ subdirectory under include/. This simpler
layout is more natural for maintenance and also simplifies build
integration outside the LLVM CMake build.

The .yaml files should live next to the corresponding .h.def
files in libc/include/, rather than next to the implementation of
the tool in libc/utils/hdrgen/.  As with the .h.def files, there
is no need for a yaml/ subdirectory under include/.  This simpler
layout is more natural for maintenance and also simplifies build
integration outside the LLVM CMake build.
@frobtech frobtech requested review from fabio-d and Caslyn January 1, 2025 23:08
@frobtech frobtech marked this pull request as ready for review January 1, 2025 23:08
@llvmbot llvmbot added the libc label Jan 1, 2025
@llvmbot
Copy link
Member

llvmbot commented Jan 1, 2025

@llvm/pr-subscribers-libc

Author: Roland McGrath (frobtech)

Changes

The .yaml files should live next to the corresponding .h.def
files in libc/include/, rather than next to the implementation of
the tool in libc/utils/hdrgen/. As with the .h.def files, there
is no need for a yaml/ subdirectory under include/. This simpler
layout is more natural for maintenance and also simplifies build
integration outside the LLVM CMake build.


Patch is 21.70 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/121443.diff

58 Files Affected:

  • (modified) libc/docs/dev/header_generation.rst (+3-3)
  • (modified) libc/include/CMakeLists.txt (+55-55)
  • (renamed) libc/include/arpa/inet.yaml ()
  • (renamed) libc/include/assert.yaml ()
  • (renamed) libc/include/complex.yaml ()
  • (renamed) libc/include/ctype.yaml ()
  • (renamed) libc/include/dirent.yaml ()
  • (renamed) libc/include/dlfcn.yaml ()
  • (renamed) libc/include/elf.yaml ()
  • (renamed) libc/include/errno.yaml ()
  • (renamed) libc/include/fcntl.yaml ()
  • (renamed) libc/include/features.yaml ()
  • (renamed) libc/include/fenv.yaml ()
  • (renamed) libc/include/float.yaml ()
  • (renamed) libc/include/inttypes.yaml ()
  • (renamed) libc/include/limits.yaml ()
  • (renamed) libc/include/link.yaml ()
  • (renamed) libc/include/locale.yaml ()
  • (renamed) libc/include/malloc.yaml ()
  • (renamed) libc/include/math.yaml ()
  • (renamed) libc/include/pthread.yaml ()
  • (renamed) libc/include/sched.yaml ()
  • (renamed) libc/include/search.yaml ()
  • (renamed) libc/include/setjmp.yaml ()
  • (renamed) libc/include/signal.yaml ()
  • (renamed) libc/include/spawn.yaml ()
  • (renamed) libc/include/stdbit.yaml ()
  • (renamed) libc/include/stdckdint.yaml ()
  • (renamed) libc/include/stdfix.yaml ()
  • (renamed) libc/include/stdint.yaml ()
  • (renamed) libc/include/stdio.yaml ()
  • (renamed) libc/include/stdlib.yaml ()
  • (renamed) libc/include/string.yaml ()
  • (renamed) libc/include/strings.yaml ()
  • (renamed) libc/include/sys/auxv.yaml ()
  • (renamed) libc/include/sys/epoll.yaml ()
  • (renamed) libc/include/sys/ioctl.yaml ()
  • (renamed) libc/include/sys/mman.yaml ()
  • (renamed) libc/include/sys/prctl.yaml ()
  • (renamed) libc/include/sys/random.yaml ()
  • (renamed) libc/include/sys/resource.yaml ()
  • (renamed) libc/include/sys/select.yaml ()
  • (renamed) libc/include/sys/sendfile.yaml ()
  • (renamed) libc/include/sys/socket.yaml ()
  • (renamed) libc/include/sys/stat.yaml ()
  • (renamed) libc/include/sys/statvfs.yaml ()
  • (renamed) libc/include/sys/syscall.yaml ()
  • (renamed) libc/include/sys/time.yaml ()
  • (renamed) libc/include/sys/types.yaml ()
  • (renamed) libc/include/sys/utsname.yaml ()
  • (renamed) libc/include/sys/wait.yaml ()
  • (renamed) libc/include/termios.yaml ()
  • (renamed) libc/include/threads.yaml ()
  • (renamed) libc/include/time.yaml ()
  • (renamed) libc/include/uchar.yaml ()
  • (renamed) libc/include/unistd.yaml ()
  • (renamed) libc/include/wchar.yaml ()
  • (modified) libc/src/math/docs/add_math_function.md (+1-1)
diff --git a/libc/docs/dev/header_generation.rst b/libc/docs/dev/header_generation.rst
index 17a8d7af3a2c8b..a946106fc70970 100644
--- a/libc/docs/dev/header_generation.rst
+++ b/libc/docs/dev/header_generation.rst
@@ -45,14 +45,14 @@ To add through the command line:
    .. code-block:: none
 
      python3 libc/utils/hdrgen/yaml_to_classes.py
-     libc/utils/hdrgen/yaml/[yaml_file.yaml] --add_function "<return_type>" <function_name> "<function_arg1, function_arg2>" <standard> <guard> <attribute>
+     libc/include/[yaml_file.yaml] --add_function "<return_type>" <function_name> "<function_arg1, function_arg2>" <standard> <guard> <attribute>
 
    Example:
 
    .. code-block:: none
 
       python3 libc/utils/hdrgen/yaml_to_classes.py
-      libc/utils/hdrgen/yaml/ctype.yaml --add_function "char" example_function
+      libc/include/ctype.yaml --add_function "char" example_function
       "int, void, const void" stdc example_float example_attribute
 
    Keep in mind only the return_type and arguments have quotes around them. If
@@ -118,7 +118,7 @@ Common Errors
    missing. Ensure the correct style and required files are present:
 
    | ``[header_name]``
-   | ``[../libc/utils/hdrgen/yaml/[yaml_file.yaml]``
+   | ``[../libc/include/[yaml_file.yaml]``
    | ``[header_name.h.def]``
    | ``[header_name.h]``
    | ``DEPENDS``
diff --git a/libc/include/CMakeLists.txt b/libc/include/CMakeLists.txt
index e490840cafedbb..eb407183c99f5d 100644
--- a/libc/include/CMakeLists.txt
+++ b/libc/include/CMakeLists.txt
@@ -32,7 +32,7 @@ endmacro()
 
 add_header_macro(
   ctype
-  ../libc/utils/hdrgen/yaml/ctype.yaml
+  ../libc/include/ctype.yaml
   ctype.h.def
   ctype.h
   DEPENDS
@@ -42,7 +42,7 @@ add_header_macro(
 
 add_header_macro(
   dirent
-  ../libc/utils/hdrgen/yaml/dirent.yaml
+  ../libc/include/dirent.yaml
   dirent.h.def
   dirent.h
   DEPENDS
@@ -54,7 +54,7 @@ add_header_macro(
 
 add_header_macro(
   fcntl
-  ../libc/utils/hdrgen/yaml/fcntl.yaml
+  ../libc/include/fcntl.yaml
   fcntl.h.def
   fcntl.h
   DEPENDS
@@ -70,7 +70,7 @@ add_header_macro(
 
 add_header_macro(
   dlfcn
-  ../libc/utils/hdrgen/yaml/dlfcn.yaml
+  ../libc/include/dlfcn.yaml
   dlfcn.h.def
   dlfcn.h
   DEPENDS
@@ -80,7 +80,7 @@ add_header_macro(
 
 add_header_macro(
   features
-  ../libc/utils/hdrgen/yaml/features.yaml
+  ../libc/include/features.yaml
   features.h.def
   features.h
   DEPENDS
@@ -90,7 +90,7 @@ add_header_macro(
 
 add_header_macro(
   fenv
-  ../libc/utils/hdrgen/yaml/fenv.yaml
+  ../libc/include/fenv.yaml
   fenv.h.def
   fenv.h
   DEPENDS
@@ -102,7 +102,7 @@ add_header_macro(
 
 add_header_macro(
   inttypes
-  ../libc/utils/hdrgen/yaml/inttypes.yaml
+  ../libc/include/inttypes.yaml
   inttypes.h.def
   inttypes.h
   DEPENDS
@@ -113,7 +113,7 @@ add_header_macro(
 
 add_header_macro(
   float
-  ../libc/utils/hdrgen/yaml/float.yaml
+  ../libc/include/float.yaml
   float.h.def
   float.h
   DEPENDS
@@ -122,7 +122,7 @@ add_header_macro(
 
 add_header_macro(
   stdint
-  ../libc/utils/hdrgen/yaml/stdint.yaml
+  ../libc/include/stdint.yaml
   stdint.h.def
   stdint.h
   DEPENDS
@@ -131,7 +131,7 @@ add_header_macro(
 
 add_header_macro(
   limits
-  ../libc/utils/hdrgen/yaml/limits.yaml
+  ../libc/include/limits.yaml
   limits.h.def
   limits.h
   DEPENDS
@@ -140,7 +140,7 @@ add_header_macro(
 
 add_header_macro(
   malloc
-  ../libc/utils/hdrgen/yaml/malloc.yaml
+  ../libc/include/malloc.yaml
   malloc.h.def
   malloc.h
   DEPENDS
@@ -150,7 +150,7 @@ add_header_macro(
 
 add_header_macro(
   math
-  ../libc/utils/hdrgen/yaml/math.yaml
+  ../libc/include/math.yaml
   math.h.def
   math.h
   DEPENDS
@@ -165,7 +165,7 @@ add_header_macro(
 
 add_header_macro(
   stdfix
-  ../libc/utils/hdrgen/yaml/stdfix.yaml
+  ../libc/include/stdfix.yaml
   stdfix.h.def
   stdfix.h
   DEPENDS
@@ -178,7 +178,7 @@ file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/arpa)
 
 add_header_macro(
   arpa_inet
-  ../libc/utils/hdrgen/yaml/arpa/inet.yaml
+  ../libc/include/arpa/inet.yaml
   arpa/inet.h.def
   arpa/inet.h
   DEPENDS
@@ -187,7 +187,7 @@ add_header_macro(
 
 add_header_macro(
   assert
-  ../libc/utils/hdrgen/yaml/assert.yaml
+  ../libc/include/assert.yaml
   assert.h.def
   assert.h
   DEPENDS
@@ -197,7 +197,7 @@ add_header_macro(
 
 add_header_macro(
   complex
-  ../libc/utils/hdrgen/yaml/complex.yaml
+  ../libc/include/complex.yaml
   complex.h.def
   complex.h
   DEPENDS
@@ -207,7 +207,7 @@ add_header_macro(
 
 add_header_macro(
   setjmp
-  ../libc/utils/hdrgen/yaml/setjmp.yaml
+  ../libc/include/setjmp.yaml
   setjmp.h.def
   setjmp.h
   DEPENDS
@@ -217,7 +217,7 @@ add_header_macro(
 
 add_header_macro(
   string
-  ../libc/utils/hdrgen/yaml/string.yaml
+  ../libc/include/string.yaml
   string.h.def
   string.h
   DEPENDS
@@ -228,7 +228,7 @@ add_header_macro(
 
 add_header_macro(
   strings
-  ../libc/utils/hdrgen/yaml/strings.yaml
+  ../libc/include/strings.yaml
   strings.h.def
   strings.h
   DEPENDS
@@ -238,7 +238,7 @@ add_header_macro(
 
 add_header_macro(
   search
-  ../libc/utils/hdrgen/yaml/search.yaml
+  ../libc/include/search.yaml
   search.h.def
   search.h
   DEPENDS
@@ -252,7 +252,7 @@ add_header_macro(
 
 add_header_macro(
   time
-  ../libc/utils/hdrgen/yaml/time.yaml
+  ../libc/include/time.yaml
   time.h.def
   time.h
   DEPENDS
@@ -268,7 +268,7 @@ add_header_macro(
 
 add_header_macro(
   threads
-  ../libc/utils/hdrgen/yaml/threads.yaml
+  ../libc/include/threads.yaml
   threads.h.def
   threads.h
   DEPENDS
@@ -285,7 +285,7 @@ add_header_macro(
 
 add_header_macro(
   errno
-  ../libc/utils/hdrgen/yaml/errno.yaml
+  ../libc/include/errno.yaml
   errno.h.def
   errno.h
   DEPENDS
@@ -295,7 +295,7 @@ add_header_macro(
 
 add_header_macro(
   signal
-  ../libc/utils/hdrgen/yaml/signal.yaml
+  ../libc/include/signal.yaml
   signal.h.def
   signal.h
   DEPENDS
@@ -311,7 +311,7 @@ add_header_macro(
 
 add_header_macro(
   stdbit
-  ../libc/utils/hdrgen/yaml/stdbit.yaml
+  ../libc/include/stdbit.yaml
   stdbit.h.def
   stdbit.h
   DEPENDS
@@ -321,7 +321,7 @@ add_header_macro(
 
 add_header_macro(
   stdckdint
-  ../libc/utils/hdrgen/yaml/stdckdint.yaml
+  ../libc/include/stdckdint.yaml
   stdckdint.h.def
   stdckdint.h
   DEPENDS
@@ -331,7 +331,7 @@ add_header_macro(
 
 add_header_macro(
   stdio
-  ../libc/utils/hdrgen/yaml/stdio.yaml
+  ../libc/include/stdio.yaml
   stdio.h.def
   stdio.h
   DEPENDS
@@ -347,7 +347,7 @@ add_header_macro(
 
 add_header_macro(
   stdlib
-  ../libc/utils/hdrgen/yaml/stdlib.yaml
+  ../libc/include/stdlib.yaml
   stdlib.h.def
   stdlib.h
   DEPENDS
@@ -366,7 +366,7 @@ add_header_macro(
 
 add_header_macro(
   unistd
-  ../libc/utils/hdrgen/yaml/unistd.yaml
+  ../libc/include/unistd.yaml
   unistd.h.def
   unistd.h
   DEPENDS
@@ -385,7 +385,7 @@ add_header_macro(
 
 add_header_macro(
   pthread
-  ../libc/utils/hdrgen/yaml/pthread.yaml
+  ../libc/include/pthread.yaml
   pthread.h.def
   pthread.h
   DEPENDS
@@ -409,7 +409,7 @@ add_header_macro(
 
 add_header_macro(
   sched
-  ../libc/utils/hdrgen/yaml/sched.yaml
+  ../libc/include/sched.yaml
   sched.h.def
   sched.h
   DEPENDS
@@ -426,7 +426,7 @@ add_header_macro(
 
 add_header_macro(
   spawn
-  ../libc/utils/hdrgen/yaml/spawn.yaml
+  ../libc/include/spawn.yaml
   spawn.h.def
   spawn.h
   DEPENDS
@@ -439,7 +439,7 @@ add_header_macro(
 
 add_header_macro(
   link
-  ../libc/utils/hdrgen/yaml/link.yaml
+  ../libc/include/link.yaml
   link.h.def
   link.h
   DEPENDS
@@ -449,7 +449,7 @@ add_header_macro(
 
 add_header_macro(
   elf
-  ../libc/utils/hdrgen/yaml/elf.yaml
+  ../libc/include/elf.yaml
   elf.h.def
   elf.h
   DEPENDS
@@ -463,7 +463,7 @@ file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/sys)
 
 add_header_macro(
   sys_auxv
-  ../libc/utils/hdrgen/yaml/sys/auxv.yaml
+  ../libc/include/sys/auxv.yaml
   sys/auxv.h.def
   sys/auxv.h
   DEPENDS
@@ -473,7 +473,7 @@ add_header_macro(
 
 add_header_macro(
   sys_epoll
-  ../libc/utils/hdrgen/yaml/sys/epoll.yaml
+  ../libc/include/sys/epoll.yaml
   sys/epoll.h.def
   sys/epoll.h
   DEPENDS
@@ -486,7 +486,7 @@ add_header_macro(
 
 add_header_macro(
   sys_ioctl
-  ../libc/utils/hdrgen/yaml/sys/ioctl.yaml
+  ../libc/include/sys/ioctl.yaml
   sys/ioctl.h.def
   sys/ioctl.h
   DEPENDS
@@ -496,7 +496,7 @@ add_header_macro(
 
 add_header_macro(
   sys_mman
-  ../libc/utils/hdrgen/yaml/sys/mman.yaml
+  ../libc/include/sys/mman.yaml
   sys/mman.h.def
   sys/mman.h
   DEPENDS
@@ -509,7 +509,7 @@ add_header_macro(
 
 add_header_macro(
   sys_prctl
-  ../libc/utils/hdrgen/yaml/sys/prctl.yaml
+  ../libc/include/sys/prctl.yaml
   sys/prctl.h.def
   sys/prctl.h
   DEPENDS
@@ -526,7 +526,7 @@ add_header(
 
 add_header_macro(
   sys_random
-  ../libc/utils/hdrgen/yaml/sys/random.yaml
+  ../libc/include/sys/random.yaml
   sys/random.h.def
   sys/random.h
   DEPENDS
@@ -538,7 +538,7 @@ add_header_macro(
 
 add_header_macro(
   sys_resource
-  ../libc/utils/hdrgen/yaml/sys/resource.yaml
+  ../libc/include/sys/resource.yaml
   sys/resource.h.def
   sys/resource.h
   DEPENDS
@@ -550,7 +550,7 @@ add_header_macro(
 
 add_header_macro(
   sys_stat
-  ../libc/utils/hdrgen/yaml/sys/stat.yaml
+  ../libc/include/sys/stat.yaml
   sys/stat.h.def
   sys/stat.h
   DEPENDS
@@ -572,7 +572,7 @@ add_header_macro(
 
 add_header_macro(
   sys_select
-  ../libc/utils/hdrgen/yaml/sys/select.yaml
+  ../libc/include/sys/select.yaml
   sys/select.h.def
   sys/select.h
   DEPENDS
@@ -588,7 +588,7 @@ add_header_macro(
 
 add_header_macro(
   sys_sendfile
-  ../libc/utils/hdrgen/yaml/sys/sendfile.yaml
+  ../libc/include/sys/sendfile.yaml
   sys/sendfile.h.def
   sys/sendfile.h
   DEPENDS
@@ -600,7 +600,7 @@ add_header_macro(
 
 add_header_macro(
   sys_socket
-  ../libc/utils/hdrgen/yaml/sys/socket.yaml
+  ../libc/include/sys/socket.yaml
   sys/socket.h.def
   sys/socket.h
   DEPENDS
@@ -616,7 +616,7 @@ add_header_macro(
 
 add_header_macro(
   sys_statvfs
-  ../libc/utils/hdrgen/yaml/sys/statvfs.yaml
+  ../libc/include/sys/statvfs.yaml
   sys/statvfs.h.def
   sys/statvfs.h
   DEPENDS
@@ -626,7 +626,7 @@ add_header_macro(
 
 add_header_macro(
   sys_syscall
-  ../libc/utils/hdrgen/yaml/sys/syscall.yaml
+  ../libc/include/sys/syscall.yaml
   sys/syscall.h.def
   sys/syscall.h
   DEPENDS
@@ -634,7 +634,7 @@ add_header_macro(
 
 add_header_macro(
   sys_time
-  ../libc/utils/hdrgen/yaml/sys/time.yaml
+  ../libc/include/sys/time.yaml
   sys/time.h.def
   sys/time.h
   DEPENDS
@@ -645,7 +645,7 @@ add_header_macro(
 
 add_header_macro(
   sys_types
-  ../libc/utils/hdrgen/yaml/sys/types.yaml
+  ../libc/include/sys/types.yaml
   sys/types.h.def
   sys/types.h
   DEPENDS
@@ -675,7 +675,7 @@ add_header_macro(
 
 add_header_macro(
   sys_utsname
-  ../libc/utils/hdrgen/yaml/sys/utsname.yaml
+  ../libc/include/sys/utsname.yaml
   sys/utsname.h.def
   sys/utsname.h
   DEPENDS
@@ -685,7 +685,7 @@ add_header_macro(
 
 add_header_macro(
   sys_wait
-  ../libc/utils/hdrgen/yaml/sys/wait.yaml
+  ../libc/include/sys/wait.yaml
   sys/wait.h.def
   sys/wait.h
   DEPENDS
@@ -698,7 +698,7 @@ add_header_macro(
 
 add_header_macro(
   termios
-  ../libc/utils/hdrgen/yaml/termios.yaml
+  ../libc/include/termios.yaml
   termios.h.def
   termios.h
   DEPENDS
@@ -713,7 +713,7 @@ add_header_macro(
 
 add_header_macro(
   uchar
-  ../libc/utils/hdrgen/yaml/uchar.yaml
+  ../libc/include/uchar.yaml
   uchar.h.def
   uchar.h
   DEPENDS
@@ -726,7 +726,7 @@ add_header_macro(
 
 add_header_macro(
   wchar
-  ../libc/utils/hdrgen/yaml/wchar.yaml
+  ../libc/include/wchar.yaml
   wchar.h.def
   wchar.h
   DEPENDS
@@ -740,7 +740,7 @@ add_header_macro(
 
 add_header_macro(
   locale
-  ../libc/utils/hdrgen/yaml/locale.yaml
+  ../libc/include/locale.yaml
   locale.h.def
   locale.h
   DEPENDS
diff --git a/libc/utils/hdrgen/yaml/arpa/inet.yaml b/libc/include/arpa/inet.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/arpa/inet.yaml
rename to libc/include/arpa/inet.yaml
diff --git a/libc/utils/hdrgen/yaml/assert.yaml b/libc/include/assert.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/assert.yaml
rename to libc/include/assert.yaml
diff --git a/libc/utils/hdrgen/yaml/complex.yaml b/libc/include/complex.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/complex.yaml
rename to libc/include/complex.yaml
diff --git a/libc/utils/hdrgen/yaml/ctype.yaml b/libc/include/ctype.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/ctype.yaml
rename to libc/include/ctype.yaml
diff --git a/libc/utils/hdrgen/yaml/dirent.yaml b/libc/include/dirent.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/dirent.yaml
rename to libc/include/dirent.yaml
diff --git a/libc/utils/hdrgen/yaml/dlfcn.yaml b/libc/include/dlfcn.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/dlfcn.yaml
rename to libc/include/dlfcn.yaml
diff --git a/libc/utils/hdrgen/yaml/elf.yaml b/libc/include/elf.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/elf.yaml
rename to libc/include/elf.yaml
diff --git a/libc/utils/hdrgen/yaml/errno.yaml b/libc/include/errno.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/errno.yaml
rename to libc/include/errno.yaml
diff --git a/libc/utils/hdrgen/yaml/fcntl.yaml b/libc/include/fcntl.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/fcntl.yaml
rename to libc/include/fcntl.yaml
diff --git a/libc/utils/hdrgen/yaml/features.yaml b/libc/include/features.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/features.yaml
rename to libc/include/features.yaml
diff --git a/libc/utils/hdrgen/yaml/fenv.yaml b/libc/include/fenv.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/fenv.yaml
rename to libc/include/fenv.yaml
diff --git a/libc/utils/hdrgen/yaml/float.yaml b/libc/include/float.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/float.yaml
rename to libc/include/float.yaml
diff --git a/libc/utils/hdrgen/yaml/inttypes.yaml b/libc/include/inttypes.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/inttypes.yaml
rename to libc/include/inttypes.yaml
diff --git a/libc/utils/hdrgen/yaml/limits.yaml b/libc/include/limits.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/limits.yaml
rename to libc/include/limits.yaml
diff --git a/libc/utils/hdrgen/yaml/link.yaml b/libc/include/link.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/link.yaml
rename to libc/include/link.yaml
diff --git a/libc/utils/hdrgen/yaml/locale.yaml b/libc/include/locale.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/locale.yaml
rename to libc/include/locale.yaml
diff --git a/libc/utils/hdrgen/yaml/malloc.yaml b/libc/include/malloc.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/malloc.yaml
rename to libc/include/malloc.yaml
diff --git a/libc/utils/hdrgen/yaml/math.yaml b/libc/include/math.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/math.yaml
rename to libc/include/math.yaml
diff --git a/libc/utils/hdrgen/yaml/pthread.yaml b/libc/include/pthread.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/pthread.yaml
rename to libc/include/pthread.yaml
diff --git a/libc/utils/hdrgen/yaml/sched.yaml b/libc/include/sched.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sched.yaml
rename to libc/include/sched.yaml
diff --git a/libc/utils/hdrgen/yaml/search.yaml b/libc/include/search.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/search.yaml
rename to libc/include/search.yaml
diff --git a/libc/utils/hdrgen/yaml/setjmp.yaml b/libc/include/setjmp.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/setjmp.yaml
rename to libc/include/setjmp.yaml
diff --git a/libc/utils/hdrgen/yaml/signal.yaml b/libc/include/signal.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/signal.yaml
rename to libc/include/signal.yaml
diff --git a/libc/utils/hdrgen/yaml/spawn.yaml b/libc/include/spawn.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/spawn.yaml
rename to libc/include/spawn.yaml
diff --git a/libc/utils/hdrgen/yaml/stdbit.yaml b/libc/include/stdbit.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/stdbit.yaml
rename to libc/include/stdbit.yaml
diff --git a/libc/utils/hdrgen/yaml/stdckdint.yaml b/libc/include/stdckdint.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/stdckdint.yaml
rename to libc/include/stdckdint.yaml
diff --git a/libc/utils/hdrgen/yaml/stdfix.yaml b/libc/include/stdfix.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/stdfix.yaml
rename to libc/include/stdfix.yaml
diff --git a/libc/utils/hdrgen/yaml/stdint.yaml b/libc/include/stdint.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/stdint.yaml
rename to libc/include/stdint.yaml
diff --git a/libc/utils/hdrgen/yaml/stdio.yaml b/libc/include/stdio.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/stdio.yaml
rename to libc/include/stdio.yaml
diff --git a/libc/utils/hdrgen/yaml/stdlib.yaml b/libc/include/stdlib.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/stdlib.yaml
rename to libc/include/stdlib.yaml
diff --git a/libc/utils/hdrgen/yaml/string.yaml b/libc/include/string.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/string.yaml
rename to libc/include/string.yaml
diff --git a/libc/utils/hdrgen/yaml/strings.yaml b/libc/include/strings.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/strings.yaml
rename to libc/include/strings.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/auxv.yaml b/libc/include/sys/auxv.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/auxv.yaml
rename to libc/include/sys/auxv.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/epoll.yaml b/libc/include/sys/epoll.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/epoll.yaml
rename to libc/include/sys/epoll.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/ioctl.yaml b/libc/include/sys/ioctl.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/ioctl.yaml
rename to libc/include/sys/ioctl.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/mman.yaml b/libc/include/sys/mman.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/mman.yaml
rename to libc/include/sys/mman.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/prctl.yaml b/libc/include/sys/prctl.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/prctl.yaml
rename to libc/include/sys/prctl.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/random.yaml b/libc/include/sys/random.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/random.yaml
rename to libc/include/sys/random.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/resource.yaml b/libc/include/sys/resource.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/resource.yaml
rename to libc/include/sys/resource.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/select.yaml b/libc/include/sys/select.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/select.yaml
rename to libc/include/sys/select.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/sendfile.yaml b/libc/include/sys/sendfile.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/sendfile.yaml
rename to libc/include/sys/sendfile.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/socket.yaml b/libc/include/sys/socket.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/socket.yaml
rename to libc/include/sys/socket.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/stat.yaml b/libc/include/sys/stat.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/stat.yaml
rename to libc/include/sys/stat.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/statvfs.yaml b/libc/include/sys/statvfs.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/statvfs.yaml
rename to libc/include/sys/statvfs.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/syscall.yaml b/libc/include/sys/syscall.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/syscall.yaml
rename to libc/include/sys/syscall.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/time.yaml b/libc/include/sys/time.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/time.yaml
rename to libc/include/sys/time.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/types.yaml b/libc/include/sys/types.yaml
similarity index 100%
rename from libc/utils/hdrgen/yaml/sys/types.yaml
rename to libc/include/sys/types.yaml
diff --git a/libc/utils/hdrgen/yaml/sys/utsname.yaml b/libc/include/sys/utsname.yaml
similarity index 100%
rename from libc/utils/h...
[truncated]

@jhuber6
Copy link
Contributor

jhuber6 commented Jan 1, 2025

Probably better than #120931

@frobtech frobtech requested a review from jhuber6 January 1, 2025 23:24
@frobtech frobtech merged commit 62cd050 into llvm:main Jan 2, 2025
16 checks passed
@frobtech frobtech deleted the p/libc-yaml-move branch January 2, 2025 01:03
@nickdesaulniers
Copy link
Member

Do you mind updating the libc/utils/hdrgen/README.rst? 9abcca5 added a comment about the yaml subdirectory which now no longer exists after this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants