From 7601ea68e2a259e683449e5bc6999887d232bdbf Mon Sep 17 00:00:00 2001 From: kamkow1 Date: Sat, 21 Feb 2026 12:00:59 +0100 Subject: [PATCH] Rename libmsl to libsystem --- Makefile | 2 +- aux/compiledb.sh | 2 +- aux/devel.sh | 2 +- aux/docs.sh | 2 +- aux/format.sh | 2 +- init/Makefile | 1 - liballoc/Makefile | 2 +- libkb/Makefile | 2 +- libprocess/Makefile | 2 +- libstring/Makefile | 2 +- {libmsl => libsystem}/.gitignore | 0 {libmsl => libsystem}/Makefile | 2 +- {libmsl => libsystem}/amd64/.gitignore | 0 {libmsl => libsystem}/amd64/_start.S | 0 {libmsl => libsystem}/amd64/src.mk | 0 {libmsl => libsystem}/amd64/syscall.c | 0 {libmsl => libsystem}/amd64/syscall.h | 0 {libmsl => libsystem}/init/.gitignore | 0 {libmsl => libsystem}/init/__premain.c | 0 {libmsl => libsystem}/init/src.mk | 0 {libmsl => libsystem}/src.mk | 0 {libmsl => libsystem}/syscall.h | 0 {libmsl => libsystem}/system.c | 0 {libmsl => libsystem}/system.h | 0 libterminal/Makefile | 2 +- make/libmsl.mk | 16 ---------------- make/libsystem.mk | 16 ++++++++++++++++ make/user.mk | 4 ++-- 28 files changed, 29 insertions(+), 30 deletions(-) rename {libmsl => libsystem}/.gitignore (100%) rename {libmsl => libsystem}/Makefile (80%) rename {libmsl => libsystem}/amd64/.gitignore (100%) rename {libmsl => libsystem}/amd64/_start.S (100%) rename {libmsl => libsystem}/amd64/src.mk (100%) rename {libmsl => libsystem}/amd64/syscall.c (100%) rename {libmsl => libsystem}/amd64/syscall.h (100%) rename {libmsl => libsystem}/init/.gitignore (100%) rename {libmsl => libsystem}/init/__premain.c (100%) rename {libmsl => libsystem}/init/src.mk (100%) rename {libmsl => libsystem}/src.mk (100%) rename {libmsl => libsystem}/syscall.h (100%) rename {libmsl => libsystem}/system.c (100%) rename {libmsl => libsystem}/system.h (100%) delete mode 100644 make/libmsl.mk create mode 100644 make/libsystem.mk diff --git a/Makefile b/Makefile index a11429e..4462424 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ platform ?= amd64 include make/apps.mk include make/kernel.mk include make/dist.mk -include make/libmsl.mk +include make/libsystem.mk include make/liballoc.mk include make/libterminal.mk include make/libprocess.mk diff --git a/aux/compiledb.sh b/aux/compiledb.sh index 44214f0..176571e 100755 --- a/aux/compiledb.sh +++ b/aux/compiledb.sh @@ -4,7 +4,7 @@ set -x make -B all_compiledb_kernel make -B all_compiledb_liballoc -make -B all_compiledb_libmsl +make -B all_compiledb_libsystem make -B all_compiledb_libprocess make -B all_compiledb_libterminal make -B all_compiledb_libstring diff --git a/aux/devel.sh b/aux/devel.sh index e8a59da..c78b6d9 100755 --- a/aux/devel.sh +++ b/aux/devel.sh @@ -8,7 +8,7 @@ else make -B all_kernel fi -make -B all_libmsl +make -B all_libsystem make -B all_liballoc make -B all_libprocess make -B all_libterminal diff --git a/aux/docs.sh b/aux/docs.sh index c07027d..b945783 100755 --- a/aux/docs.sh +++ b/aux/docs.sh @@ -5,7 +5,7 @@ set -x ./aux/compiledb.sh make -B docs_liballoc -make -B docs_libmsl +make -B docs_libsystem make -B docs_libprocess make -B docs_libstring make -B docs_libterminal diff --git a/aux/format.sh b/aux/format.sh index 39811ea..ddc2a46 100755 --- a/aux/format.sh +++ b/aux/format.sh @@ -3,7 +3,7 @@ set -x make -B format_kernel -make -B format_libmsl +make -B format_libsystem make -B format_libterminal make -B format_libprocess make -B format_liballoc diff --git a/init/Makefile b/init/Makefile index 5f495e9..08c01ec 100644 --- a/init/Makefile +++ b/init/Makefile @@ -1,7 +1,6 @@ include ../make/ufuncs.mk $(eval $(call add_lib,libterminal)) -$(eval $(call add_lib,liballoc)) $(eval $(call add_lib,libprocess)) $(eval $(call add_lib,libstring)) $(eval $(call add_lib,libkb)) diff --git a/liballoc/Makefile b/liballoc/Makefile index db5f2c8..7f665d2 100644 --- a/liballoc/Makefile +++ b/liballoc/Makefile @@ -1,6 +1,6 @@ include ../make/ufuncs.mk -$(eval $(call add_include,libmsl)) +$(eval $(call add_include,libsystem)) libname := liballoc diff --git a/libkb/Makefile b/libkb/Makefile index 2148e39..27360f3 100644 --- a/libkb/Makefile +++ b/libkb/Makefile @@ -1,6 +1,6 @@ include ../make/ufuncs.mk -$(eval $(call add_include,libmsl)) +$(eval $(call add_include,libsystem)) libname := libkb diff --git a/libprocess/Makefile b/libprocess/Makefile index c9cfdc9..3f703e7 100644 --- a/libprocess/Makefile +++ b/libprocess/Makefile @@ -1,6 +1,6 @@ include ../make/ufuncs.mk -$(eval $(call add_include,libmsl)) +$(eval $(call add_include,libsystem)) $(eval $(call add_include,liballoc)) libname := libprocess diff --git a/libstring/Makefile b/libstring/Makefile index 67bdb47..c7fd7f2 100644 --- a/libstring/Makefile +++ b/libstring/Makefile @@ -1,6 +1,6 @@ include ../make/ufuncs.mk -$(eval $(call add_include,libmsl)) +$(eval $(call add_include,libsystem)) libname := libstring diff --git a/libmsl/.gitignore b/libsystem/.gitignore similarity index 100% rename from libmsl/.gitignore rename to libsystem/.gitignore diff --git a/libmsl/Makefile b/libsystem/Makefile similarity index 80% rename from libmsl/Makefile rename to libsystem/Makefile index d25bfa0..d486a3c 100644 --- a/libmsl/Makefile +++ b/libsystem/Makefile @@ -2,6 +2,6 @@ include ../make/ufuncs.mk $(eval $(call add_include,liballoc)) -libname := libmsl +libname := libsystem include ../make/lib.mk diff --git a/libmsl/amd64/.gitignore b/libsystem/amd64/.gitignore similarity index 100% rename from libmsl/amd64/.gitignore rename to libsystem/amd64/.gitignore diff --git a/libmsl/amd64/_start.S b/libsystem/amd64/_start.S similarity index 100% rename from libmsl/amd64/_start.S rename to libsystem/amd64/_start.S diff --git a/libmsl/amd64/src.mk b/libsystem/amd64/src.mk similarity index 100% rename from libmsl/amd64/src.mk rename to libsystem/amd64/src.mk diff --git a/libmsl/amd64/syscall.c b/libsystem/amd64/syscall.c similarity index 100% rename from libmsl/amd64/syscall.c rename to libsystem/amd64/syscall.c diff --git a/libmsl/amd64/syscall.h b/libsystem/amd64/syscall.h similarity index 100% rename from libmsl/amd64/syscall.h rename to libsystem/amd64/syscall.h diff --git a/libmsl/init/.gitignore b/libsystem/init/.gitignore similarity index 100% rename from libmsl/init/.gitignore rename to libsystem/init/.gitignore diff --git a/libmsl/init/__premain.c b/libsystem/init/__premain.c similarity index 100% rename from libmsl/init/__premain.c rename to libsystem/init/__premain.c diff --git a/libmsl/init/src.mk b/libsystem/init/src.mk similarity index 100% rename from libmsl/init/src.mk rename to libsystem/init/src.mk diff --git a/libmsl/src.mk b/libsystem/src.mk similarity index 100% rename from libmsl/src.mk rename to libsystem/src.mk diff --git a/libmsl/syscall.h b/libsystem/syscall.h similarity index 100% rename from libmsl/syscall.h rename to libsystem/syscall.h diff --git a/libmsl/system.c b/libsystem/system.c similarity index 100% rename from libmsl/system.c rename to libsystem/system.c diff --git a/libmsl/system.h b/libsystem/system.h similarity index 100% rename from libmsl/system.h rename to libsystem/system.h diff --git a/libterminal/Makefile b/libterminal/Makefile index 687e2f5..e6898fe 100644 --- a/libterminal/Makefile +++ b/libterminal/Makefile @@ -1,6 +1,6 @@ include ../make/ufuncs.mk -$(eval $(call add_include,libmsl)) +$(eval $(call add_include,libsystem)) libname := libterminal diff --git a/make/libmsl.mk b/make/libmsl.mk deleted file mode 100644 index dcff2fb..0000000 --- a/make/libmsl.mk +++ /dev/null @@ -1,16 +0,0 @@ -all_libmsl: - make -C libmsl platform=$(platform) all - -all_compiledb_libmsl: - bear --output libmsl/compile_commands.json -- make -C libmsl platform=$(platform) all - -clean_libmsl: - make -C libmsl platform=$(platform) clean - -format_libmsl: - make -C libmsl platform=$(platform) format - -docs_libmsl: - make -C libmsl platform=$(platform) docs - -.PHONY: all_libmsl clean_libmsl format_libmsl docs_libmsl all_compiledb_libmsl diff --git a/make/libsystem.mk b/make/libsystem.mk new file mode 100644 index 0000000..48e4786 --- /dev/null +++ b/make/libsystem.mk @@ -0,0 +1,16 @@ +all_libsystem: + make -C libsystem platform=$(platform) all + +all_compiledb_libsystem: + bear --output libsystem/compile_commands.json -- make -C libsystem platform=$(platform) all + +clean_libsystem: + make -C libsystem platform=$(platform) clean + +format_libsystem: + make -C libsystem platform=$(platform) format + +docs_libsystem: + make -C libsystem platform=$(platform) docs + +.PHONY: all_libsystem clean_libsystem format_libsystem docs_libsystem all_compiledb_libsystem diff --git a/make/user.mk b/make/user.mk index 4dff98c..8304b4c 100644 --- a/make/user.mk +++ b/make/user.mk @@ -1,8 +1,8 @@ cc := clang o := c := -ldflags += -L ../libmsl/build -l:libmsl.a -cflags += -isystem ../libmsl +ldflags += -L ../libsystem/build -l:libsystem.a -L ../liballoc/build -l:liballoc.a +cflags += -isystem ../libsystem -isystem ../liballoc include src.mk include app.mk