From df2494e1454a0f83a9c398c51d154c09d56d014f Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Thu, 15 Feb 2024 15:13:47 +0100 Subject: [PATCH] Update the toolchain --- Rakefile | 9 +++++---- dub.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Rakefile b/Rakefile index 908dfdf..025ed5e 100644 --- a/Rakefile +++ b/Rakefile @@ -21,13 +21,13 @@ CLEAN.include '.dub' rule(/build\/riscv\/[^\/\.]+$/ => ->(file) { test_for_out(file, '.o') }) do |t| sh '/opt/riscv/bin/riscv32-unknown-elf-ld', '-o', t.name, - '-L/opt/riscv/lib/gcc/riscv32-unknown-elf/11.1.0', + '-L/opt/riscv/lib/gcc/riscv32-unknown-elf/13.2.0/', '-L/opt/riscv/riscv32-unknown-elf/lib', '/opt/riscv/riscv32-unknown-elf/lib/crt0.o', - '/opt/riscv/lib/gcc/riscv32-unknown-elf/11.1.0/crtbegin.o', + '/opt/riscv/lib/gcc/riscv32-unknown-elf/13.2.0/crtbegin.o', t.source, '--start-group', '-lgcc', '-lc', '-lgloss', '--end-group', - '/opt/riscv/lib/gcc/riscv32-unknown-elf/11.1.0/crtend.o' + '/opt/riscv/lib/gcc/riscv32-unknown-elf/13.2.0/crtend.o' end rule(/build\/riscv\/.+\.o$/ => ->(file) { test_for_object(file, '.eln') }) do |t| @@ -36,7 +36,7 @@ rule(/build\/riscv\/.+\.o$/ => ->(file) { test_for_object(file, '.eln') }) do |t end file BINARY => SOURCES do |t| - sh({ 'DFLAGS' => (DFLAGS * ' ') }, 'dub', 'build', '--compiler=gdc-12') + sh({ 'DFLAGS' => (DFLAGS * ' ') }, 'dub', 'build', '--compiler=gdc') end task default: BINARY @@ -55,6 +55,7 @@ task test: BINARY do if test.include? '/riscv/' spike = [ '/opt/riscv/bin/spike', + '--isa=RV32IMAC', '/opt/riscv/riscv32-unknown-elf/bin/pk', test ] diff --git a/dub.json b/dub.json index 8567d3a..743f619 100644 --- a/dub.json +++ b/dub.json @@ -1,6 +1,6 @@ { "dependencies": { - "tanya": "~>0.18.0" + "tanya": "~>0.19.0" }, "name": "elna", "targetType": "executable",