metaverse
/
kernel-dev
1
2
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Merged
pointer-to-bios merged 39 commits from downstream into main 2024-04-11 00:36:14 +08:00
Conversation 0 Commits 39 Files Changed 51 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b0b790fab8 - Show all commits

2
rustlib

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

4
src/Makefile
View File

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