This commit is contained in:
Romain Dolbeau 2022-08-27 08:32:38 +02:00
parent 53ce112f0d
commit b01eb633ff
9 changed files with 14 additions and 10 deletions

View file

@ -37,4 +37,4 @@ kernelrandombytes.o: random.cpp
$(R5IMA_GXX) $(R5IMA_OPT) $< -c -o $@
cpucycles.o: riscv.c
$(R5IMA_GCC) $< -march=rv32ima -mabi=ilp32 -I. -O1 -c -o $@
$(R5IMA_GCC) $< -march=$(R5ISA) -mabi=$(R5ABI) -I. -O1 -c -o $@

View file

@ -37,4 +37,4 @@ kernelrandombytes.o: random.cpp
$(R5IMA_GXX) $(R5IMA_OPT) $< -c -o $@
cpucycles.o: riscv.c
$(R5IMA_GCC) $< -march=rv32ima -mabi=ilp32 -I. -O1 -c -o $@
$(R5IMA_GCC) $< -march=$(R5ISA) -mabi=$(R5ABI) -I. -O1 -c -o $@

View file

@ -37,4 +37,4 @@ kernelrandombytes.o: random.cpp
$(R5IMA_GXX) $(R5IMA_OPT) $< -c -o $@
cpucycles.o: riscv.c
$(R5IMA_GCC) $< -march=rv32ima -mabi=ilp32 -I. -O1 -c -o $@
$(R5IMA_GCC) $< -march=$(R5ISA) -mabi=$(R5ABI) -I. -O1 -c -o $@

View file

@ -37,4 +37,4 @@ kernelrandombytes.o: random.cpp
$(R5IMA_GXX) $(R5IMA_OPT) $< -c -o $@
cpucycles.o: riscv.c
$(R5IMA_GCC) $< -march=rv32ima -mabi=ilp32 -I. -O1 -c -o $@
$(R5IMA_GCC) $< -march=$(R5ISA) -mabi=$(R5ABI) -I. -O1 -c -o $@

View file

@ -37,4 +37,4 @@ kernelrandombytes.o: random.cpp
$(R5IMA_GXX) $(R5IMA_OPT) $< -c -o $@
cpucycles.o: riscv.c
$(R5IMA_GCC) $< -march=rv32ima -mabi=ilp32 -I. -O1 -c -o $@
$(R5IMA_GCC) $< -march=$(R5ISA) -mabi=$(R5ABI) -I. -O1 -c -o $@

View file

@ -40,7 +40,7 @@ kernelrandombytes.o: random.cpp
$(R5IMA_GXX) $(R5IMA_OPT) $< -c -o $@
cpucycles.o: riscv.c
$(R5IMA_GCC) $< -march=rv32ima -mabi=ilp32 -I. -O1 -c -o $@
$(R5IMA_GCC) $< -march=$(R5ISA) -mabi=$(R5ABI) -I. -O1 -c -o $@
chacha_XAR.S: chacha.c

8
r5.mk
View file

@ -1,7 +1,11 @@
R5ISA=rv32imafdc
R5ABI=ilp32d
## B Toolchain so we get some automatic B generation
R5B_TOOLCHAIN=/opt/riscv64bk/
R5B_GCC=$(R5B_TOOLCHAIN)/bin/riscv64-unknown-elf-gcc
R5B_OPT=-Os -march=rv32imacb -mabi=ilp32 -I.
#R5B_TOOLCHAIN=/opt/rv32bk
#R5B_GCC=$(R5B_TOOLCHAIN)/bin/riscv32-buildroot-linux-gnu-gcc
R5B_OPT=-Os -march=$(R5ISA)b -mabi=$(R5ABI) -I.
## Buildroot toolchain for linking and having up-to-date libraries and systems calls
## Requires enabling C++ in buildroot with e.g.
@ -10,5 +14,5 @@ R5B_OPT=-Os -march=rv32imacb -mabi=ilp32 -I.
R5IMA_TOOLCHAIN=/home/dolbeau2/LITEX/buildroot-rv32/output/host
R5IMA_GCC=$(R5IMA_TOOLCHAIN)/bin/riscv32-buildroot-linux-gnu-gcc
R5IMA_GXX=$(R5IMA_TOOLCHAIN)/bin/riscv32-buildroot-linux-gnu-g++
R5IMA_OPT=-Os -march=rv32imac -mabi=ilp32 -I.
R5IMA_OPT=-Os -march=$(R5ISA) -mabi=$(R5ABI) -I.
R5IMA_STRIP=$(R5IMA_TOOLCHAIN)/riscv32-buildroot-linux-gnu-strip

View file

@ -37,4 +37,4 @@ kernelrandombytes.o: random.cpp
$(R5IMA_GXX) $(R5IMA_OPT) $< -c -o $@
cpucycles.o: riscv.c
$(R5IMA_GCC) $< -march=rv32ima -mabi=ilp32 -I. -O1 -c -o $@
$(R5IMA_GCC) $< -march=$(R5ISA) -mabi=$(R5ABI) -I. -O1 -c -o $@

View file

@ -37,4 +37,4 @@ kernelrandombytes.o: random.cpp
$(R5IMA_GXX) $(R5IMA_OPT) $< -c -o $@
cpucycles.o: riscv.c
$(R5IMA_GCC) $< -march=rv32ima -mabi=ilp32 -I. -O1 -c -o $@
$(R5IMA_GCC) $< -march=$(R5ISA) -mabi=$(R5ABI) -I. -O1 -c -o $@