Switch to cargo cross build

.cargo/config.toml

@@ -0,0 +1,6 @@
+[build]
+target = "x86_64-cykusz_os.json"
+
+[unstable]
+build-std-features = ["compiler-builtins-mem"]
+build-std = ["alloc", "core", "compiler_builtins"]

Cargo.toml

@@ -1,5 +1,6 @@
 [workspace]
 members = ["syscall-defs", "syscall-user", "user-alloc", "userspace", "acpica", "cykusz-rs"]
+resolver = "2"
 
 [profile.release]
 debug=false

Makefile

@@ -9,7 +9,7 @@ assembly_source_files := $(wildcard cykusz-rs/src/arch/$(arch)/asm/*.asm)
 assembly_object_files := $(patsubst cykusz-rs/src/arch/$(arch)/asm/%.asm, \
 		build/arch/$(arch)/asm/%.o, $(assembly_source_files))
 
-target ?= $(arch)-unknown-none-gnu
+target ?= $(arch)-cykusz_os
 ifdef dev
 rust_os := target/$(target)/debug/libcykusz_rs.a
 rust_shell := target/$(target)/debug/shell
@@ -97,9 +97,9 @@ usb: $(kernel)
 
 cargo:
 ifdef dev
-	RUST_TARGET_PATH=`pwd` xargo build --workspace --target $(target) --verbose
+	cargo build --workspace --verbose
 else
-	RUST_TARGET_PATH=`pwd` xargo build --workspace --release --target $(target) --verbose
+	cargo build --workspace --release --verbose
 endif
 
 toolchain: $(cross_cpp)

cleanup.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-cargo fix -p cykusz_rs -p user_alloc -p syscall-user -p syscall-defs --lib --allow-dirty --allow-staged
+cargo fix -p cykusz-rs -p user-alloc -p syscall-user -p syscall-defs --lib --allow-dirty --allow-staged
 cargo fmt

cykusz-rs/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["Rafal Mielniczuk <rafal.mielniczuk2@gmail.com>"]
 edition = "2021"
-name = "cykusz_rs"
+name = "cykusz-rs"
 version = "0.1.0"
 
 [lib]

cykusz-rs/src/lib.rs

@@ -1,4 +1,5 @@
 #![no_std]
+#![allow(internal_features)]
 #![feature(alloc_error_handler)]
 #![feature(array_methods)]
 #![feature(asm_const)]

disk_scripts/install_os.sh

@@ -17,8 +17,8 @@ PROGS="test testcpp hello stack nyancat ttytest fork stat fbdoom DOOM1.WAD"
 
 mount /dev/loop0p2 mnt
 mkdir -p mnt/bin
-cp -f target/x86_64-unknown-none-gnu/release/init mnt/bin/init
-cp -f target/x86_64-unknown-none-gnu/release/shell mnt/bin/shell
+cp -f target/x86_64-cykusz_os/release/init mnt/bin/init
+cp -f target/x86_64-cykusz_os/release/shell mnt/bin/shell
 
 for prog in $PROGS; do
 	cp -f sysroot/build/$prog mnt/bin/$prog

user-alloc/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "user_alloc"
+name = "user-alloc"
 version = "0.1.0"
 authors = ["Rafal Mielniczuk <rafal.mielniczuk2@gmail.com>"]
 edition = "2021"

userspace/Cargo.toml

@@ -11,7 +11,7 @@ rlibc = "*"
 default-features = false
 version = "*"
 
-[dependencies.user_alloc]
+[dependencies.user-alloc]
 path = "../user-alloc"
 [dependencies.syscall-defs]
 path = "../syscall-defs"