From a5d99ca2488b1f8861c56cfbb9ff629ea04781f3 Mon Sep 17 00:00:00 2001 From: Max Wash Date: Thu, 28 May 2026 20:39:54 +0100 Subject: [PATCH] libc: update kernel library references --- lib/libc/CMakeLists.txt | 2 +- lib/libc/core/CMakeLists.txt | 2 +- lib/libc/core/errno/errno.c | 2 +- lib/libc/core/stdlib/abort.c | 2 +- lib/libc/core/stdlib/exit.c | 2 +- lib/libc/core/sys/x86_64/init.c | 2 +- lib/libc/include/sys/mman.h | 2 +- lib/libc/include/sys/remote.h | 2 +- lib/libc/include/sys/types.h | 2 +- lib/libc/io/CMakeLists.txt | 2 +- lib/libc/io/stdio/fclose.c | 2 +- lib/libc/io/stdio/file.c | 4 ++-- lib/libc/io/stdio/file.h | 2 +- lib/libc/io/stdio/ringbuf.c | 2 +- lib/libc/io/unistd/close.c | 4 ++-- lib/libc/io/unistd/getdents.c | 4 ++-- lib/libc/io/unistd/lseek.c | 4 ++-- lib/libc/io/unistd/mmap.c | 7 ++++--- lib/libc/io/unistd/munmap.c | 6 +++--- lib/libc/io/unistd/open.c | 4 ++-- lib/libc/io/unistd/read.c | 4 ++-- lib/libc/io/unistd/write.c | 4 ++-- lib/libc/malloc/CMakeLists.txt | 2 +- lib/libc/malloc/heap.c | 10 +++++----- lib/libc/malloc/include/heap/heap.h | 2 +- lib/libc/pthread/CMakeLists.txt | 4 ++-- lib/libc/pthread/include/pthread.h | 2 +- lib/libc/pthread/sys/x86_64/pthread_unmap_exit.S | 2 +- lib/libc/pthread/thread/pthread.h | 2 +- lib/libc/pthread/thread/pthread_create.c | 4 ++-- lib/libc/pthread/thread/pthread_detach.c | 8 ++++---- lib/libc/pthread/thread/pthread_exit.c | 4 ++-- lib/libc/pthread/thread/pthread_join.c | 8 ++++---- lib/libc/pthread/thread/pthread_self.c | 4 ++-- 34 files changed, 60 insertions(+), 59 deletions(-) diff --git a/lib/libc/CMakeLists.txt b/lib/libc/CMakeLists.txt index 021c290..d8c9081 100644 --- a/lib/libc/CMakeLists.txt +++ b/lib/libc/CMakeLists.txt @@ -27,7 +27,7 @@ bsp_add_library( LIB_DIR /usr/lib) target_link_libraries(libc PRIVATE librosetta libxpc-static interface::fs) -target_link_libraries(libc PUBLIC libmango) +target_link_libraries(libc PUBLIC libmagenta) target_compile_definitions(libc PRIVATE ENABLE_GLOBAL_HEAP=1) add_subdirectory(pthread) diff --git a/lib/libc/core/CMakeLists.txt b/lib/libc/core/CMakeLists.txt index 2fc7684..5a2c280 100644 --- a/lib/libc/core/CMakeLists.txt +++ b/lib/libc/core/CMakeLists.txt @@ -26,4 +26,4 @@ sysroot_add_library( HEADER_DIR /usr/include LIB_DIR /usr/lib) -target_link_libraries(libc-core PRIVATE libmango librosetta) +target_link_libraries(libc-core PRIVATE libmagenta librosetta) diff --git a/lib/libc/core/errno/errno.c b/lib/libc/core/errno/errno.c index 1e5f7cc..304bef5 100644 --- a/lib/libc/core/errno/errno.c +++ b/lib/libc/core/errno/errno.c @@ -1,5 +1,5 @@ #include -#include +#include static int __errno = SUCCESS; diff --git a/lib/libc/core/stdlib/abort.c b/lib/libc/core/stdlib/abort.c index 42dbb1f..654a0fb 100644 --- a/lib/libc/core/stdlib/abort.c +++ b/lib/libc/core/stdlib/abort.c @@ -1,4 +1,4 @@ -#include +#include void abort(void) { diff --git a/lib/libc/core/stdlib/exit.c b/lib/libc/core/stdlib/exit.c index 6ea6ca7..cc47499 100644 --- a/lib/libc/core/stdlib/exit.c +++ b/lib/libc/core/stdlib/exit.c @@ -1,4 +1,4 @@ -#include +#include void exit(int code) { diff --git a/lib/libc/core/sys/x86_64/init.c b/lib/libc/core/sys/x86_64/init.c index 70ee31a..413785b 100644 --- a/lib/libc/core/sys/x86_64/init.c +++ b/lib/libc/core/sys/x86_64/init.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/lib/libc/include/sys/mman.h b/lib/libc/include/sys/mman.h index 74e1a04..ff2d061 100644 --- a/lib/libc/include/sys/mman.h +++ b/lib/libc/include/sys/mman.h @@ -1,7 +1,7 @@ #ifndef SYS_MMAN_H_ #define SYS_MMAN_H_ -#include +#include #include #define PROT_NONE 0x00u diff --git a/lib/libc/include/sys/remote.h b/lib/libc/include/sys/remote.h index 390cfff..5c2a7c5 100644 --- a/lib/libc/include/sys/remote.h +++ b/lib/libc/include/sys/remote.h @@ -1,7 +1,7 @@ #ifndef SYS_REMOTE_H_ #define SYS_REMOTE_H_ -#include +#include #include enum sys_remote_id { diff --git a/lib/libc/include/sys/types.h b/lib/libc/include/sys/types.h index 7ee646d..535e7dc 100644 --- a/lib/libc/include/sys/types.h +++ b/lib/libc/include/sys/types.h @@ -1,7 +1,7 @@ #ifndef SYS_TYPES_H_ #define SYS_TYPES_H_ -#include +#include #define SEEK_SET 0 #define SEEK_CUR 1 diff --git a/lib/libc/io/CMakeLists.txt b/lib/libc/io/CMakeLists.txt index 8293e77..7f4783a 100644 --- a/lib/libc/io/CMakeLists.txt +++ b/lib/libc/io/CMakeLists.txt @@ -30,4 +30,4 @@ sysroot_add_library( HEADER_DIR /usr/include LIB_DIR /usr/lib) -target_link_libraries(libc-io libc-core interface::fs libxpc-static libmango) +target_link_libraries(libc-io libc-core interface::fs libxpc-static libmagenta) diff --git a/lib/libc/io/stdio/fclose.c b/lib/libc/io/stdio/fclose.c index 15041a8..ca14220 100644 --- a/lib/libc/io/stdio/fclose.c +++ b/lib/libc/io/stdio/fclose.c @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/libc/io/stdio/file.c b/lib/libc/io/stdio/file.c index dd2cb0f..02b5c7a 100644 --- a/lib/libc/io/stdio/file.c +++ b/lib/libc/io/stdio/file.c @@ -1,8 +1,8 @@ #include "file.h" #include -#include -#include +#include +#include #include #include #include diff --git a/lib/libc/io/stdio/file.h b/lib/libc/io/stdio/file.h index 30d1c36..9a24636 100644 --- a/lib/libc/io/stdio/file.h +++ b/lib/libc/io/stdio/file.h @@ -3,7 +3,7 @@ #include "ringbuf.h" -#include +#include #include enum file_flags { diff --git a/lib/libc/io/stdio/ringbuf.c b/lib/libc/io/stdio/ringbuf.c index 2115dc1..a88f608 100644 --- a/lib/libc/io/stdio/ringbuf.c +++ b/lib/libc/io/stdio/ringbuf.c @@ -1,7 +1,7 @@ #include "file.h" #include -#include +#include #include #include #include diff --git a/lib/libc/io/unistd/close.c b/lib/libc/io/unistd/close.c index 9a412ef..5abf39d 100644 --- a/lib/libc/io/unistd/close.c +++ b/lib/libc/io/unistd/close.c @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include #include diff --git a/lib/libc/io/unistd/getdents.c b/lib/libc/io/unistd/getdents.c index 99c75c3..6ec0c52 100644 --- a/lib/libc/io/unistd/getdents.c +++ b/lib/libc/io/unistd/getdents.c @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include #include #include diff --git a/lib/libc/io/unistd/lseek.c b/lib/libc/io/unistd/lseek.c index fcdf71e..c8783f8 100644 --- a/lib/libc/io/unistd/lseek.c +++ b/lib/libc/io/unistd/lseek.c @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include #include diff --git a/lib/libc/io/unistd/mmap.c b/lib/libc/io/unistd/mmap.c index 43fa7d4..ba0e8fd 100644 --- a/lib/libc/io/unistd/mmap.c +++ b/lib/libc/io/unistd/mmap.c @@ -1,7 +1,8 @@ #include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/lib/libc/io/unistd/munmap.c b/lib/libc/io/unistd/munmap.c index ec7d213..0f6b65b 100644 --- a/lib/libc/io/unistd/munmap.c +++ b/lib/libc/io/unistd/munmap.c @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/lib/libc/io/unistd/open.c b/lib/libc/io/unistd/open.c index 6b343eb..49067b4 100644 --- a/lib/libc/io/unistd/open.c +++ b/lib/libc/io/unistd/open.c @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include #include diff --git a/lib/libc/io/unistd/read.c b/lib/libc/io/unistd/read.c index 15b3add..90a2121 100644 --- a/lib/libc/io/unistd/read.c +++ b/lib/libc/io/unistd/read.c @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include #include diff --git a/lib/libc/io/unistd/write.c b/lib/libc/io/unistd/write.c index 6e95f0b..a78fa67 100644 --- a/lib/libc/io/unistd/write.c +++ b/lib/libc/io/unistd/write.c @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include #include diff --git a/lib/libc/malloc/CMakeLists.txt b/lib/libc/malloc/CMakeLists.txt index a01a54f..c68243b 100644 --- a/lib/libc/malloc/CMakeLists.txt +++ b/lib/libc/malloc/CMakeLists.txt @@ -31,4 +31,4 @@ sysroot_add_library( LIB_DIR /usr/lib) target_compile_definitions(libc-malloc PRIVATE ENABLE_GLOBAL_HEAP=1) -target_link_libraries(libc-malloc libc-core libmango) +target_link_libraries(libc-malloc libc-core libmagenta) diff --git a/lib/libc/malloc/heap.c b/lib/libc/malloc/heap.c index a117e40..9b5f1a8 100644 --- a/lib/libc/malloc/heap.c +++ b/lib/libc/malloc/heap.c @@ -1,11 +1,11 @@ #include "liballoc.h" #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #define HEAP_REGION_SIZE 0x40000000 diff --git a/lib/libc/malloc/include/heap/heap.h b/lib/libc/malloc/include/heap/heap.h index bb7475d..a0a4557 100644 --- a/lib/libc/malloc/include/heap/heap.h +++ b/lib/libc/malloc/include/heap/heap.h @@ -2,7 +2,7 @@ #define HEAP_H_ #include -#include +#include #include typedef enum heap_result { diff --git a/lib/libc/pthread/CMakeLists.txt b/lib/libc/pthread/CMakeLists.txt index 0f616e1..1e7c758 100644 --- a/lib/libc/pthread/CMakeLists.txt +++ b/lib/libc/pthread/CMakeLists.txt @@ -41,6 +41,6 @@ bsp_add_library( NAME libpthread LIB_DIR /usr/lib) -target_link_libraries(libc-pthread PRIVATE libc-io libmango) -target_link_libraries(libpthread PRIVATE libmango) +target_link_libraries(libc-pthread PRIVATE libc-io libmagenta) +target_link_libraries(libpthread PRIVATE libmagenta) target_link_libraries(libpthread PUBLIC libc) diff --git a/lib/libc/pthread/include/pthread.h b/lib/libc/pthread/include/pthread.h index 43c2381..f029886 100644 --- a/lib/libc/pthread/include/pthread.h +++ b/lib/libc/pthread/include/pthread.h @@ -1,7 +1,7 @@ #ifndef PTHREAD_H_ #define PTHREAD_H_ -#include +#include #define __PTHREAD_ATTR_SIZE__ 32 diff --git a/lib/libc/pthread/sys/x86_64/pthread_unmap_exit.S b/lib/libc/pthread/sys/x86_64/pthread_unmap_exit.S index 112d2e0..e6c17ac 100644 --- a/lib/libc/pthread/sys/x86_64/pthread_unmap_exit.S +++ b/lib/libc/pthread/sys/x86_64/pthread_unmap_exit.S @@ -1,6 +1,6 @@ .code64 -#include "mango/syscall.h" +#include "magenta/syscall.h" .global __pthread_unmap_exit .type __pthread_unmap_exit, @function diff --git a/lib/libc/pthread/thread/pthread.h b/lib/libc/pthread/thread/pthread.h index 905ea9d..11b8744 100644 --- a/lib/libc/pthread/thread/pthread.h +++ b/lib/libc/pthread/thread/pthread.h @@ -1,7 +1,7 @@ #ifndef _THREAD_PTHREAD_H_ #define _THREAD_PTHREAD_H_ -#include +#include enum pthread_flags { THREAD_DETACHED = 0x01u, diff --git a/lib/libc/pthread/thread/pthread_create.c b/lib/libc/pthread/thread/pthread_create.c index fb6c067..eee2db0 100644 --- a/lib/libc/pthread/thread/pthread_create.c +++ b/lib/libc/pthread/thread/pthread_create.c @@ -1,8 +1,8 @@ #include "pthread.h" #include -#include -#include +#include +#include #include #include #include diff --git a/lib/libc/pthread/thread/pthread_detach.c b/lib/libc/pthread/thread/pthread_detach.c index 887cb72..8dc69a6 100644 --- a/lib/libc/pthread/thread/pthread_detach.c +++ b/lib/libc/pthread/thread/pthread_detach.c @@ -1,10 +1,10 @@ #include "pthread.h" #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/lib/libc/pthread/thread/pthread_exit.c b/lib/libc/pthread/thread/pthread_exit.c index 7d3fb53..e6cacc5 100644 --- a/lib/libc/pthread/thread/pthread_exit.c +++ b/lib/libc/pthread/thread/pthread_exit.c @@ -1,7 +1,7 @@ #include "pthread.h" -#include -#include +#include +#include #include #include diff --git a/lib/libc/pthread/thread/pthread_join.c b/lib/libc/pthread/thread/pthread_join.c index 9f0f9ce..6fe2171 100644 --- a/lib/libc/pthread/thread/pthread_join.c +++ b/lib/libc/pthread/thread/pthread_join.c @@ -1,10 +1,10 @@ #include "pthread.h" #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/lib/libc/pthread/thread/pthread_self.c b/lib/libc/pthread/thread/pthread_self.c index 982a68b..f516987 100644 --- a/lib/libc/pthread/thread/pthread_self.c +++ b/lib/libc/pthread/thread/pthread_self.c @@ -1,7 +1,7 @@ #include "pthread.h" -#include -#include +#include +#include #include #include