diff --git a/.travis.yml b/.travis.yml index 53abd7e..56d7ee9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,4 +38,5 @@ before_script: - (test -x $HOME/.cargo/bin/bootimage || cargo install bootimage) script: - - cd kernel && make build arch=$ARCH + - cd kernel && make build arch=$ARCH && cd .. + - cd user && make arch=$ARCH diff --git a/user/Cargo.toml b/user/Cargo.toml index 0c95325..42811de 100644 --- a/user/Cargo.toml +++ b/user/Cargo.toml @@ -2,6 +2,7 @@ name = "ucore-user-programs" version = "0.1.0" authors = ["Runji Wang "] +edition = "2018" [dependencies] "ucore-ulib" = { path = "ucore-ulib" } \ No newline at end of file diff --git a/user/Makefile b/user/Makefile index 185ca0f..fccacbb 100644 --- a/user/Makefile +++ b/user/Makefile @@ -1,4 +1,4 @@ -# arch = {riscv32, x86_64} +# arch = {riscv32, x86_64, aarch64} arch := riscv32 all: diff --git a/user/ucore-ulib/Cargo.toml b/user/ucore-ulib/Cargo.toml index 186517c..27915b1 100644 --- a/user/ucore-ulib/Cargo.toml +++ b/user/ucore-ulib/Cargo.toml @@ -2,5 +2,6 @@ name = "ucore-ulib" version = "0.1.0" authors = ["WangRunji "] +edition = "2018" [dependencies] diff --git a/user/ucore-ulib/src/lang_items.rs b/user/ucore-ulib/src/lang_items.rs index 89e5334..06b4511 100644 --- a/user/ucore-ulib/src/lang_items.rs +++ b/user/ucore-ulib/src/lang_items.rs @@ -1,4 +1,4 @@ -use syscall::sys_exit; +use crate::syscall::sys_exit; use core::alloc::Layout; use core::panic::PanicInfo; @@ -17,7 +17,7 @@ pub extern fn _start(_argc: isize, _argv: *const *const u8) -> ! { #[lang = "eh_personality"] fn eh_personality() {} -#[panic_implementation] +#[panic_handler] fn panic(info: &PanicInfo) -> ! { let location = info.location().unwrap(); let message = info.message().unwrap(); diff --git a/user/ucore-ulib/src/lib.rs b/user/ucore-ulib/src/lib.rs index fb4cf19..4908eb5 100644 --- a/user/ucore-ulib/src/lib.rs +++ b/user/ucore-ulib/src/lib.rs @@ -1,7 +1,6 @@ #![no_std] #![feature(asm)] #![feature(lang_items)] -#![feature(panic_implementation)] #![feature(panic_info_message)] #![feature(linkage)] #![feature(compiler_builtins_lib)]