strip out vestiges of unused assembly code in kernel package

This commit is contained in:
bunnie 2023-07-04 11:06:38 +08:00
parent f0f420d610
commit adbb168343
10 changed files with 5 additions and 87 deletions

View file

@ -1,19 +0,0 @@
# remove existing blobs because otherwise this will append object files to the old blobs
New-Item -Type Directory -Name bin -Force | Out-Null
Remove-Item -Force bin/*.a | Out-Null
$crate = "xous"
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.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
riscv64-unknown-elf-ar crs bin/riscv32i-unknown-none-elf.a bin/$crate.o
riscv64-unknown-elf-gcc -ggdb3 -c -mabi=lp64 -march=rv64imac src/asm.S -o bin/$crate.o
riscv64-unknown-elf-ar crs bin/riscv64imac-unknown-none-elf.a bin/$crate.o
riscv64-unknown-elf-ar crs bin/riscv64gc-unknown-none-elf.a bin/$crate.o
Remove-Item bin/$crate.o

View file

@ -1,55 +0,0 @@
#!/usr/bin/env bash
# SPDX-FileCopyrightText: 2020 Sean Cross <sean@xobs.io>
# SPDX-FileCopyrightText: 2023 Foundation Devices, Inc <hello@foundationdevices.com>
# SPDX-License-Identifier: Apache-2.0
set -euxo pipefail
crate=xous-kernel
usage() {
echo "Usage: $0 [-a riscv]"
exit 1
}
while getopts "a:" o; do
case "${o}" in
a)
arch=$OPTARG
;;
*)
usage
;;
esac
done
arch=${arch:-riscv}
mkdir -p bin
case $arch in
riscv)
# Remove existing blobs because otherwise this will append object
# files to the old blobs
rm -f bin/riscv*.a
riscv-none-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32imac src/arch/riscv/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
riscv-none-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32i src/arch/riscv/asm.S -DSKIP_MULTICORE -o bin/$crate.o
ar crs bin/riscv32i-unknown-none-elf.a bin/$crate.o
riscv-none-elf-gcc -ggdb3 -c -mabi=lp64 -march=rv64imac src/arch/riscv/asm.S -o bin/$crate.o
ar crs bin/riscv64imac-unknown-none-elf.a bin/$crate.o
ar crs bin/riscv64gc-unknown-none-elf.a bin/$crate.o
;;
default)
usage
;;
esac
rm bin/$crate.o

View file

@ -8,17 +8,5 @@ fn main() {
let target = env::var("TARGET").unwrap();
let name = env::var("CARGO_PKG_NAME").unwrap();
if target.starts_with("riscv") {
fs::copy(
format!("bin/{}.a", target),
out_dir.join(format!("lib{}.a", name)),
)
.expect("couldn't find asm support library for target platform");
println!("cargo:rustc-link-lib=static={}", name);
println!("cargo:rustc-link-search={}", out_dir.display());
println!("cargo:rerun-if-changed=bin/{}.a", target);
}
println!("cargo:rerun-if-changed=build.rs");
}

View file

@ -321,5 +321,9 @@ extern "C" {
}
pub fn cache_flush() {
unsafe { riscv_cache_flush() };
unsafe {
asm!(
"fence"
)
};
}