From 415ab2694633abd4a90ab40a676058e3ff57e719 Mon Sep 17 00:00:00 2001
From: Andre Richter <andre.o.richter@gmail.com>
Date: Sat, 15 Jan 2022 22:11:32 +0100
Subject: [PATCH] Minor (toolchain) fixes

---
 .github/workflows/test.yml   |  1 -
 Makefile                     | 12 ++++++------
 tests/exit_13.rs             |  1 -
 tests/test_runner_wrapper.sh |  5 +----
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9ce492e..ea06c6f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,7 +39,6 @@ jobs:
       - name: Run tests AARCH64
         if: matrix.target == 'aarch64-unknown-none-softfloat'
         run: |
-          cargo install cargo-binutils
           RUSTFLAGS="-C link-arg=-Ttests/aarch64_raspi3/link.ld" cargo test --target ${{ matrix.target }} --release
 
       - name: Run tests RISCV64
diff --git a/Makefile b/Makefile
index bc914e4..24e92b6 100644
--- a/Makefile
+++ b/Makefile
@@ -16,13 +16,13 @@ clippy:
 
 test:
 	RUSTFLAGS="-C link-arg=-T$(LINKER_SCRIPT_AARCH64)" \
-	cargo test \
-	--target $(TARGET_AARCH64) \
-	--release
+                cargo test \
+                --target $(TARGET_AARCH64) \
+                --release
 	RUSTFLAGS="-C link-arg=-T$(LINKER_SCRIPT_RISCV64)" \
-	cargo test \
-	--target $(TARGET_RISCV64) \
-	--release
+                cargo test \
+                --target $(TARGET_RISCV64) \
+                --release
 
 fmt:
 	cargo fmt
diff --git a/tests/exit_13.rs b/tests/exit_13.rs
index 0648897..a54b115 100644
--- a/tests/exit_13.rs
+++ b/tests/exit_13.rs
@@ -4,7 +4,6 @@
 
 //! A simple test that exits QEMU with code 13.
 
-#![feature(asm)]
 #![no_main]
 #![no_std]
 
diff --git a/tests/test_runner_wrapper.sh b/tests/test_runner_wrapper.sh
index 7518821..ec9f6cd 100755
--- a/tests/test_runner_wrapper.sh
+++ b/tests/test_runner_wrapper.sh
@@ -3,10 +3,7 @@
 TIMEOUT="timeout 10"
 
 if [[ $1 == *"aarch64"* ]]; then
-    rust-objcopy --strip-all -O binary $1 $1.img
-    STRIPPED_BINARY=$(echo $1.img | sed -e 's/.*target/target/g')
-
-    $TIMEOUT qemu-system-aarch64 -M raspi3 -display none -semihosting -kernel $STRIPPED_BINARY
+    $TIMEOUT qemu-system-aarch64 -M raspi3 -display none -semihosting -kernel $1
 elif [[ $1 == *"riscv64"* ]]; then
     $TIMEOUT qemu-system-riscv64 -M virt -bios tests/riscv64_virt/fw_jump.elf -display none -kernel $1
 fi