From 2bc93eb8d048f855ffccde23eff583e98430e209 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Mon, 10 Jul 2017 11:52:10 +0200 Subject: [PATCH] Fix scripts/torture gcc calls --- scripts/torture/Makefile | 2 +- scripts/torture/test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/torture/Makefile b/scripts/torture/Makefile index 17b838e..4dd075c 100644 --- a/scripts/torture/Makefile +++ b/scripts/torture/Makefile @@ -58,7 +58,7 @@ tests/test_$(1).S: tests/generated.ok touch tests/test_$(1).S tests/test_$(1).elf: tests/test_$(1).S - riscv32-unknown-elf-gcc -m32 `sed '/march=/ ! d; s,^// ,-,;' config.vh` -ffreestanding -nostdlib \ + riscv32-unknown-elf-gcc `sed '/march=/ ! d; s,^// ,-,; y/RVIMC/rvimc/;' config.vh` -ffreestanding -nostdlib \ -Wl,-Bstatic,-T,sections.lds -I. -o tests/test_$(1).elf tests/test_$(1).S tests/test_$(1).bin: tests/test_$(1).elf diff --git a/scripts/torture/test.sh b/scripts/torture/test.sh index eae1b75..17c5a7c 100644 --- a/scripts/torture/test.sh +++ b/scripts/torture/test.sh @@ -19,7 +19,7 @@ fi ## Compile test case and create reference -riscv32-unknown-elf-gcc -m32 `sed '/march=/ ! d; s,^// ,-,;' config.vh` -ffreestanding -nostdlib -Wl,-Bstatic,-T,sections.lds -o test.elf test.S +riscv32-unknown-elf-gcc `sed '/march=/ ! d; s,^// ,-,; y/RVIMC/rvimc/;' config.vh` -ffreestanding -nostdlib -Wl,-Bstatic,-T,sections.lds -o test.elf test.S LD_LIBRARY_PATH="./riscv-isa-sim:./riscv-fesvr" ./riscv-isa-sim/spike test.elf > test.ref riscv32-unknown-elf-objcopy -O binary test.elf test.bin python3 ../../firmware/makehex.py test.bin 4096 > test.hex