diff --git a/loader/assemble.ps1 b/loader/assemble.ps1 index b0295d439..a56afbec4 100644 --- a/loader/assemble.ps1 +++ b/loader/assemble.ps1 @@ -5,6 +5,7 @@ $crate = "xous-kernel" riscv64-unknown-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32imac src/asm.S -o bin/$crate.o riscv64-unknown-elf-ar crs bin/riscv32imac-unknown-none-elf.a bin/$crate.o +riscv64-unknown-elf-ar crs bin/riscv32imac-unknown-xous-elf.a bin/$crate.o riscv64-unknown-elf-ar crs bin/riscv32imc-unknown-none-elf.a bin/$crate.o riscv64-unknown-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32i src/asm.S -DSKIP_MULTICORE -o bin/$crate.o diff --git a/loader/assemble.sh b/loader/assemble.sh index 9ee94973b..5e305f861 100755 --- a/loader/assemble.sh +++ b/loader/assemble.sh @@ -10,6 +10,7 @@ rm -f bin/*.a riscv64-unknown-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32imac src/asm.S -o bin/$crate.o ar crs bin/riscv32imac-unknown-none-elf.a bin/$crate.o +ar crs bin/riscv32imac-unknown-xous-elf.a bin/$crate.o ar crs bin/riscv32imc-unknown-none-elf.a bin/$crate.o riscv64-unknown-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32i src/asm.S -DSKIP_MULTICORE -o bin/$crate.o diff --git a/loader/bin/riscv32i-unknown-none-elf.a b/loader/bin/riscv32i-unknown-none-elf.a index 00b0e5c35..e4622674b 100755 Binary files a/loader/bin/riscv32i-unknown-none-elf.a and b/loader/bin/riscv32i-unknown-none-elf.a differ diff --git a/loader/bin/riscv32imac-unknown-none-elf.a b/loader/bin/riscv32imac-unknown-none-elf.a index fe2b07cc1..ef790b671 100755 Binary files a/loader/bin/riscv32imac-unknown-none-elf.a and b/loader/bin/riscv32imac-unknown-none-elf.a differ diff --git a/loader/bin/riscv32imac-unknown-xous-elf.a b/loader/bin/riscv32imac-unknown-xous-elf.a new file mode 100644 index 000000000..ef790b671 Binary files /dev/null and b/loader/bin/riscv32imac-unknown-xous-elf.a differ diff --git a/loader/bin/riscv32imc-unknown-none-elf.a b/loader/bin/riscv32imc-unknown-none-elf.a index fe2b07cc1..ef790b671 100755 Binary files a/loader/bin/riscv32imc-unknown-none-elf.a and b/loader/bin/riscv32imc-unknown-none-elf.a differ diff --git a/loader/bin/riscv64gc-unknown-none-elf.a b/loader/bin/riscv64gc-unknown-none-elf.a index 8eeeea44c..6ec46e5fb 100755 Binary files a/loader/bin/riscv64gc-unknown-none-elf.a and b/loader/bin/riscv64gc-unknown-none-elf.a differ diff --git a/loader/bin/riscv64imac-unknown-none-elf.a b/loader/bin/riscv64imac-unknown-none-elf.a index 8eeeea44c..6ec46e5fb 100755 Binary files a/loader/bin/riscv64imac-unknown-none-elf.a and b/loader/bin/riscv64imac-unknown-none-elf.a differ diff --git a/loader/link.x b/loader/link.x index 035c30181..0664ad85d 100644 --- a/loader/link.x +++ b/loader/link.x @@ -133,6 +133,7 @@ SECTIONS /DISCARD/ : { *(.eh_frame); + *(.eh_frame_hdr); } } diff --git a/loader/sha2/src/lib.rs b/loader/sha2/src/lib.rs index 87ad49c7d..e3538eec1 100644 --- a/loader/sha2/src/lib.rs +++ b/loader/sha2/src/lib.rs @@ -1,4 +1,4 @@ -#![cfg_attr(target_os = "none", no_std)] +#![cfg_attr(any(target_os = "none", target_os = "xous"), no_std)] use digest::{BlockInput, FixedOutputDirty, Reset, Update}; use digest::consts::{U64, U128}; diff --git a/loader/utralib/src/lib.rs b/loader/utralib/src/lib.rs index 6cf78339f..24d4bdeb5 100644 --- a/loader/utralib/src/lib.rs +++ b/loader/utralib/src/lib.rs @@ -1,3 +1,3 @@ -#![cfg_attr(target_os = "none", no_std)] +#![cfg_attr(any(target_os = "none", target_os = "xous"), no_std)] pub mod generated; pub use generated::*;