From e9ad65f77f333d6776dd41f87860d399f5c08e11 Mon Sep 17 00:00:00 2001 From: Michael Zhang Date: Thu, 22 Feb 2024 23:21:05 -0600 Subject: [PATCH] wtf --- aarch64-unknown-none.json | 52 ++++++++++++++++----------------------- debug.sh | 0 run.sh | 5 +++- 3 files changed, 25 insertions(+), 32 deletions(-) mode change 100644 => 100755 debug.sh diff --git a/aarch64-unknown-none.json b/aarch64-unknown-none.json index ca8f942..6d0a622 100644 --- a/aarch64-unknown-none.json +++ b/aarch64-unknown-none.json @@ -1,33 +1,23 @@ { - "arch": "aarch64", - "crt-objects-fallback": "false", - "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", - "disable-redzone": true, - "features": "+v8a,+strict-align,+neon,+fp-armv8", - "linker": "rust-lld", - "linker-flavor": "gnu-lld", - "llvm-target": "aarch64-unknown-none", - "max-atomic-width": 128, - "panic-strategy": "abort", - "pre-link-args": { - "gnu": [ - "--fix-cortex-a53-843419" - ], - "gnu-lld": [ - "--fix-cortex-a53-843419", - "-Taarch64-qemu.ld" - ], - "ld.lld": [ - "-Taarch64-qemu.ld" - ] - }, - "relocation-model": "static", - "stack-probes": { - "kind": "inline" - }, - "supported-sanitizers": [ - "kcfi", - "kernel-address" - ], - "target-pointer-width": "64" + "arch": "aarch64", + "crt-objects-fallback": "false", + "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", + "disable-redzone": true, + "features": "+v8a,+strict-align,-neon,+fp-armv8", + "linker": "rust-lld", + "linker-flavor": "gnu-lld", + "llvm-target": "aarch64-unknown-none", + "max-atomic-width": 128, + "panic-strategy": "abort", + "pre-link-args": { + "gnu": ["--fix-cortex-a53-843419"], + "gnu-lld": ["--fix-cortex-a53-843419", "-Taarch64-qemu.ld"], + "ld.lld": ["-Taarch64-qemu.ld"] + }, + "relocation-model": "static", + "stack-probes": { + "kind": "inline" + }, + "supported-sanitizers": ["kcfi", "kernel-address"], + "target-pointer-width": "64" } diff --git a/debug.sh b/debug.sh old mode 100644 new mode 100755 diff --git a/run.sh b/run.sh index c596ac6..40f7281 100755 --- a/run.sh +++ b/run.sh @@ -1,11 +1,14 @@ set -euo pipefail cargo xbuild --target=aarch64-unknown-none.json +DEBUG= +# DEBUG="-s -S -d exec" + printf "Running with qemu...\n" set -x exec qemu-system-aarch64 \ -machine virt \ - -s -S \ + $DEBUG \ -m 1024M \ -cpu cortex-a53 \ -nographic \