重构内存分配器、增加中断支持、整理rust运行时环境 #4

Merged
pointer-to-bios merged 39 commits from downstream into main 2024-04-11 00:36:14 +08:00
1 changed files with 14 additions and 6 deletions
Showing only changes of commit 2144ad5123 - Show all commits

View File

@ -37,7 +37,7 @@ ifeq (${ARCH},x86_64)
endif endif
ifdef release ifdef release
RSCFLAGS := -O RSCFLAGS := ${RSCFLAGS} -O
endif endif
ifeq (${ARCH},x86_64) ifeq (${ARCH},x86_64)
@ -69,16 +69,24 @@ postproc:
@echo -e "\e[0m" @echo -e "\e[0m"
kernel: kernel:
@echo -e "\e[33m__\e[0m \e[1;35m[Building kernel]\e[0m \e[33m____\e[0m" @if [ ! ${release} ]; then \
echo -e "\e[33m__\e[0m \e[1;35m[Building kernel]\e[0m \e[33m____\e[0m"; \
fi
@make -C kernel all --no-print-directory ${DEFINES} @make -C kernel all --no-print-directory ${DEFINES}
@echo -e "\e[33m-------------------------\e[0m" @if [ ! ${release} ]; then \
echo -e "\e[33m-------------------------\e[0m"; \
fi
libk: libk:
@echo -e "\e[33m__\e[0m \e[1;35m[Building libk]\e[0m \e[33m______\e[0m" @if [ ! ${release} ]; then \
echo -e "\e[33m__\e[0m \e[1;35m[Building libk]\e[0m \e[33m______\e[0m"; \
fi
@make -C libk all --no-print-directory ${DEFINES} @make -C libk all --no-print-directory ${DEFINES}
@echo -e "\e[33m-------------------------\e[0m" @if [ ! ${release} ]; then \
echo -e "\e[33m-------------------------\e[0m"; \
fi
rust: rust: postproc
@echo -e "\e[1m\e[33mrustc\e[0m \e[34m-->\e[0m \e[1m\e[32m$@.o\e[0m" @echo -e "\e[1m\e[33mrustc\e[0m \e[34m-->\e[0m \e[1m\e[32m$@.o\e[0m"
@rustc ${RSCFLAGS} lib.rs -o rust.o @rustc ${RSCFLAGS} lib.rs -o rust.o