faet: remove axlibc

.cargo/config.toml

@@ -1,4 +1,4 @@
 
 [env]
 AX_WORK_DIR = { value = ".", relative = true }
-AX_LIBC_DIR = { value = "tools/axlibc", relative = true }
+AX_LIBC_DIR = { value = "crates/axlibc", relative = true }

.gitignore

@@ -11,6 +11,4 @@ arceos-fada.bin.gz
 arceos-fada.itb
 .tmp_its
 !tools/rk3588/ramdisk.img
-!tools/axlibc
 linker_*
-crates/

Cargo.toml

@@ -9,5 +9,5 @@ lto = true
 lto = true
 
 [workspace]
-members = ["tools/axlibc", "apps/display", "apps/exception", "apps/helloworld", "apps/memtest", "apps/fs/shell", "apps/net/echoserver", "apps/net/httpclient", "apps/net/httpserver", "apps/net/udpserver", "apps/net/bwbench", "apps/task/parallel", "apps/task/sleep", "apps/task/yield", "apps/task/priority", "apps/task/tls", "apps/monolithic_userboot"]
+members = ["crates/axlibc", "apps/display", "apps/exception", "apps/helloworld", "apps/memtest", "apps/fs/shell", "apps/net/echoserver", "apps/net/httpclient", "apps/net/httpserver", "apps/net/udpserver", "apps/net/bwbench", "apps/task/parallel", "apps/task/sleep", "apps/task/yield", "apps/task/priority", "apps/task/tls", "apps/monolithic_userboot"]
 resolver = "2"

Makefile

@@ -42,6 +42,7 @@ FEATURES ?=
 APP_FEATURES ?=
 RUSTFLAGS ?=
 STRUCT ?= Unikernel
+LIBC_DIR = crates/axlibc
 
 override FEATURES += fp_simd
 
@@ -202,7 +203,7 @@ fmt:
 	cargo fmt --all
 
 fmt_c:
-	@clang-format --style=file -i $(shell find tools/axlibc -iname '*.c' -o -iname '*.h')
+	@clang-format --style=file -i $(shell find crates/axlibc -iname '*.c' -o -iname '*.h')
 
 test:
 	$(call app_test)
@@ -222,7 +223,7 @@ clean: clean_c
 	cargo clean
 
 clean_c::
-	rm -rf tools/axlibc/build_*
+	rm -rf crates/axlibc/build_*
 	rm -rf $(app-objs)
 
 .PHONY: all build disasm run justrun debug clippy fmt fmt_c test test_no_fail_fast clean clean_c doc disk_image make_bin

scripts/make/build.mk

@@ -37,6 +37,12 @@ else ifeq ($(filter $(MAKECMDGOALS),clippy unittest unittest_no_fail_fast),) # n
 endif
 
 _cargo_build: $(build_deplibs)
+  # if `crates/axlibc` is not added, add it
+ifeq ($(wildcard $(LIBC_DIR)/include),)
+	@rm -rf crates/axlibc
+	@git clone git@github.com:Starry-OS/axlibc.git crates/axlibc
+	@cargo update axlibc
+endif
 	@printf "    $(GREEN_C)Building$(END_C) App: $(APP_NAME), Arch: $(ARCH), Platform: $(PLATFORM_NAME), App type: $(APP_TYPE)\n"
 ifeq ($(APP_TYPE), rust)
 	$(call cargo_build,--manifest-path $(APP)/Cargo.toml,$(AX_FEAT) $(LIB_FEAT) $(APP_FEAT))

scripts/make/build_c.mk

@@ -1,7 +1,7 @@
 rust_lib_name := axlibc
 rust_lib := target/$(TARGET)/$(MODE)/lib$(rust_lib_name).a
 
-ulib_dir := tools/axlibc
+ulib_dir := crates/axlibc
 src_dir := $(ulib_dir)/c
 obj_dir := $(ulib_dir)/build_$(ARCH)
 inc_dir := $(ulib_dir)/include

scripts/make/build_lwext4.mk

@@ -6,7 +6,7 @@ local_lib_feat := fp_simd alloc paging fs fd
 export LIBC_BUILD_TARGET_DIR=$(abspath $(local_obj_dir))
 
 ### include scripts/make/build_c.mk
-local_ulib_dir := tools/axlibc
+local_ulib_dir := crates/axlibc
 local_src_dir := $(local_ulib_dir)/c
 local_inc_dir := $(local_ulib_dir)/include
 local_obj_dir := $(local_ulib_dir)/lwext4_libc_$(ARCH)

scripts/make/utils.mk

@@ -31,3 +31,9 @@ define make_bin
   @rm -rf $(A)/syscall.S
   @sh ./build_img.sh sdcard
 endef
+
+# To compile the c program, it should load the axlibc first
+define load_axlibc
+  @kbuild patch add axlibc
+  @echo OK
+endef