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

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

@ -1 +1 @@
Subproject commit 603b446b09569e22e6b939bf173a518c0955d687
Subproject commit 6a2ca2afcd651e46f1c19f8d8a3f685fd982d824

View File

@ -30,7 +30,7 @@ endif
RSCFLAGS = --emit obj --crate-type staticlib --verbose \
--crate-name=metaverse \
--edition 2021 \
-L crate="${PWD}/../rustlib/${ARCH}/src/" \
-L crate="${PWD}/../rustlib/src/" \
-C code-model=large \
-C relocation-model=static \
-C embed-bitcode=no
@ -47,7 +47,7 @@ ifeq (${ARCH},x86_64)
RSCFLAGS := ${RSCFLAGS} -C target-feature=-sse
endif
RUSTLIB_PATH = ../rustlib/${ARCH}/lib
RUSTLIB_PATH = ../rustlib/${ARCH}
RUST_LIBS = "${RUSTLIB_PATH}/liballoc.rlib" "${RUSTLIB_PATH}/libcompiler_builtins.rlib" \
"${RUSTLIB_PATH}/libcore.rlib" "${RUSTLIB_PATH}/librustc_std_workspace_core.rlib"