omve compiler to buildroot's to match Linux ABI for gettimeofday()

This commit is contained in:
Romain Dolbeau 2021-02-04 11:18:40 -05:00
parent 744968b5bf
commit f74ff13d7f
6 changed files with 63 additions and 62 deletions

View file

@ -2,37 +2,37 @@ SRCs=riscv32.c try-anything.c
OBJs=$(SRCs:.c=.o)
SCLIBS=cpucycles.o kernelrandombytes.o
COMPDIR=/home/dolbeau/LITEX/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-ubuntu14
COMPDIR=~dolbeau2/LITEX/buildroot-rv32/output/host
ALTCOMPDIR=/opt/riscv64b
CC=$(COMPDIR)/bin/riscv64-unknown-elf-gcc
CC=$(COMPDIR)/bin/riscv32-buildroot-linux-gnu-gcc
ALTCC=$(ALTCOMPDIR)/bin/riscv64-unknown-elf-gcc
CC=$(ALTCC)
CXX=$(COMPDIR)/bin/riscv64-unknown-elf-g++
STRIP=$(COMPDIR)/bin/riscv64-unknown-elf-strip
CXX=$(COMPDIR)/bin/riscv32-buildroot-linux-gnu-g++
STRIP=$(COMPDIR)/bin/riscv32-buildroot-linux-gnu-strip
NEWOPT=-march=rv32imab -mabi=ilp32 -I. -O3 -DRV32B #-fno-vectorize #-DUSE_EPI_CUSTOM
OPT=-march=rv32ima -mabi=ilp32 -I. -O3 #-fno-vectorize #-DUSE_EPI_CUSTOM
#ALTCC=$(CC)
#NEWOPT=$(OPT)
all: aes256ctr aes256ctr_small
clean:
rm -f $(OBJs) try.o try_small.o riscv32.o aes256ctr aes256ctr_small
rm -f $(OBJs) *.S try.o try_small.o riscv32.o aes256ctr aes256ctr_small
%.o: %.c
$(CC) $(NEWOPT) $< -c -o $@
$(CC) $(OPT) $< -c -o $@
try.o: try.c
$(CC) $(NEWOPT) $< -c -o $@
$(CC) $(OPT) $< -c -o $@
try_small.o: try.c
$(CC) $(NEWOPT) $< -c -o $@ -DSMALL
$(CC) $(OPT) $< -c -o $@ -DSMALL
riscv32.S: riscv32.c
$(CC) $(NEWOPT) $< -S -o $@
$(ALTCC) $(NEWOPT) $< -S -o $@
riscv32.o: riscv32.S
$(CC) $(NEWOPT) $< -c -o $@
$(ALTCC) $(NEWOPT) $< -c -o $@
aes256ctr: $(OBJs) riscv32.o try.o $(SCLIBS)
$(CXX) $(OPT) $^ -o $@

View file

@ -2,37 +2,37 @@ SRCs=encrypt.c try-anything.c verify.c
OBJs=$(SRCs:.c=.o)
SCLIBS=cpucycles.o kernelrandombytes.o
COMPDIR=/home/dolbeau/LITEX/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-ubuntu14
COMPDIR=~dolbeau2/LITEX/buildroot-rv32/output/host
ALTCOMPDIR=/opt/riscv64b
CC=$(COMPDIR)/bin/riscv64-unknown-elf-gcc
CC=$(COMPDIR)/bin/riscv32-buildroot-linux-gnu-gcc
ALTCC=$(ALTCOMPDIR)/bin/riscv64-unknown-elf-gcc
CC=$(ALTCC)
CXX=$(COMPDIR)/bin/riscv64-unknown-elf-g++
STRIP=$(COMPDIR)/bin/riscv64-unknown-elf-strip
CXX=$(COMPDIR)/bin/riscv32-buildroot-linux-gnu-g++
STRIP=$(COMPDIR)/bin/riscv32-buildroot-linux-gnu-strip
NEWOPT=-march=rv32imab -mabi=ilp32 -I. -O3 -DRV32B #-fno-vectorize #-DUSE_EPI_CUSTOM
OPT=-march=rv32ima -mabi=ilp32 -I. -O3 #-fno-vectorize #-DUSE_EPI_CUSTOM
#ALTCC=$(CC)
#NEWOPT=$(OPT)
all: aes256gcmv1 aes256gcmv1_small
clean:
rm -f $(OBJs) try.o try_small.o encrypt.o aes256gcmv1 aes256gcmv1_small
rm -f $(OBJs) *.S try.o try_small.o encrypt.o aes256gcmv1 aes256gcmv1_small
%.o: %.c
$(CC) $(NEWOPT) $< -c -o $@
$(CC) $(OPT) $< -c -o $@
try.o: try.c
$(CC) $(NEWOPT) $< -c -o $@
$(CC) $(OPT) $< -c -o $@
try_small.o: try.c
$(CC) $(NEWOPT) $< -c -o $@ -DSMALL
$(CC) $(OPT) $< -c -o $@ -DSMALL
encrypt.S: encrypt.c
$(CC) $(NEWOPT) $< -S -o $@
$(ALTCC) $(NEWOPT) $< -S -o $@
encrypt.o: encrypt.S
$(CC) $(NEWOPT) $< -c -o $@
$(ALTCC) $(NEWOPT) $< -c -o $@
aes256gcmv1: $(OBJs) encrypt.o try.o $(SCLIBS)
$(CXX) $(OPT) $^ -o $@

View file

@ -2,36 +2,37 @@ SRCs=api.c try-anything.c
OBJs=$(SRCs:.c=.o)
SCLIBS=cpucycles.o kernelrandombytes.o
COMPDIR=/home/dolbeau/LITEX/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-ubuntu14
COMPDIR=~dolbeau2/LITEX/buildroot-rv32/output/host
ALTCOMPDIR=/opt/riscv64b
CC=$(COMPDIR)/bin/riscv64-unknown-elf-gcc
CC=$(COMPDIR)/bin/riscv32-buildroot-linux-gnu-gcc
ALTCC=$(ALTCOMPDIR)/bin/riscv64-unknown-elf-gcc
CC=$(ALTCC)
CXX=$(COMPDIR)/bin/riscv64-unknown-elf-g++
STRIP=$(COMPDIR)/bin/riscv64-unknown-elf-strip
NEWOPT=-march=rv32imab -mabi=ilp32 -I. -O3 #-fno-vectorize #-DUSE_EPI_CUSTOM
CXX=$(COMPDIR)/bin/riscv32-buildroot-linux-gnu-g++
STRIP=$(COMPDIR)/bin/riscv32-buildroot-linux-gnu-strip
NEWOPT=-march=rv32imab -mabi=ilp32 -I. -O3 -DRV32B #-fno-vectorize #-DUSE_EPI_CUSTOM
OPT=-march=rv32ima -mabi=ilp32 -I. -O3 #-fno-vectorize #-DUSE_EPI_CUSTOM
#ALTCC=$(CC)
#NEWOPT=$(OPT)
all: chacha20 chacha20_small
clean:
rm -f $(OBJs) try.o try_small.o chacha.o chacha20 chacha20_small chacha20_small_var chacha.s chacha_var.s
rm -f $(OBJs) *.S try.o try_small.o chacha.o chacha20 chacha20_small chacha20_small_var chacha.s chacha_var.s
%.o: %.c
$(CC) $(NEWOPT) $< -c -o $@
$(CC) $(OPT) $< -c -o $@
try.o: try.c
$(CC) $(NEWOPT) $< -c -o $@
$(CC) $(OPT) $< -c -o $@
try_small.o: try.c
$(CC) $(NEWOPT) $< -c -o $@ -DSMALL
$(CC) $(OPT) $< -c -o $@ -DSMALL
chacha.s: chacha.c
$(CC) $(NEWOPT) $< -S -o $@
chacha.S: chacha.c
$(ALTCC) $(NEWOPT) $< -S -o $@
chacha.o: chacha.s
$(CC) $(NEWOPT) $< -c -o $@
chacha.o: chacha.S
$(ALTCC) $(NEWOPT) $< -c -o $@
chacha20: $(OBJs) chacha.o try.o $(SCLIBS)
$(CXX) $(OPT) $^ -o $@

View file

@ -32,7 +32,7 @@
#endif
#ifdef __riscv
#if 0 //def __riscv
#warning "Hardwiring support for B"
#include <rvintrin.h>
#undef ROTL32
@ -49,7 +49,7 @@
#define ECRYPT_MACHINE_SWAP
#ifdef __riscv
#if 0 //def __riscv
#warning "Hardwiring support for B"
#include <rvintrin.h>
#undef SWAP32

View file

@ -2,37 +2,37 @@ SRCs=blocks.c try-anything.c
OBJs=$(SRCs:.c=.o)
SCLIBS=cpucycles.o kernelrandombytes.o
COMPDIR=/home/dolbeau/LITEX/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-ubuntu14
COMPDIR=~dolbeau2/LITEX/buildroot-rv32/output/host
ALTCOMPDIR=/opt/riscv64b
CC=$(COMPDIR)/bin/riscv64-unknown-elf-gcc
CC=$(COMPDIR)/bin/riscv32-buildroot-linux-gnu-gcc
ALTCC=$(ALTCOMPDIR)/bin/riscv64-unknown-elf-gcc
CC=$(ALTCC)
CXX=$(COMPDIR)/bin/riscv64-unknown-elf-g++
STRIP=$(COMPDIR)/bin/riscv64-unknown-elf-strip
NEWOPT=-march=rv32imab -mabi=ilp32 -I. -O3 -DRV32ZKNH #-fno-vectorize #-DUSE_EPI_CUSTOM
CXX=$(COMPDIR)/bin/riscv32-buildroot-linux-gnu-g++
STRIP=$(COMPDIR)/bin/riscv32-buildroot-linux-gnu-strip
NEWOPT=-march=rv32imab -mabi=ilp32 -I. -O3 -DRV32B #-fno-vectorize #-DUSE_EPI_CUSTOM
OPT=-march=rv32ima -mabi=ilp32 -I. -O3 #-fno-vectorize #-DUSE_EPI_CUSTOM
#ALTCC=$(CC)
#NEWOPT=$(OPT)
all: sha256 sha256_small
clean:
rm -f $(OBJs) try.o try_small.o blocks.o sha256 sha256_small blocks.S
rm -f $(OBJs) *.S try.o try_small.o blocks.o sha256 sha256_small blocks.S
%.o: %.c
$(CC) $(NEWOPT) $< -c -o $@
$(CC) $(OPT) $< -c -o $@
try.o: try.c
$(CC) $(NEWOPT) $< -c -o $@
$(CC) $(OPT) $< -c -o $@
try_small.o: try.c
$(CC) $(NEWOPT) $< -c -o $@ -DSMALL
$(CC) $(OPT) $< -c -o $@ -DSMALL
blocks.S: blocks.c
$(CC) $(NEWOPT) $< -S -o $@
$(ALTCC) $(NEWOPT) $< -S -o $@
blocks.o: blocks.S
$(CC) $(NEWOPT) $< -c -o $@
$(ALTCC) $(NEWOPT) $< -c -o $@
sha256: $(OBJs) blocks.o try.o $(SCLIBS)
$(CXX) $(OPT) $^ -o $@

View file

@ -2,37 +2,37 @@ SRCs=blocks.c try-anything.c
OBJs=$(SRCs:.c=.o)
SCLIBS=cpucycles.o kernelrandombytes.o
COMPDIR=/home/dolbeau/LITEX/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-ubuntu14
COMPDIR=~dolbeau2/LITEX/buildroot-rv32/output/host
ALTCOMPDIR=/opt/riscv64b
CC=$(COMPDIR)/bin/riscv64-unknown-elf-gcc
CC=$(COMPDIR)/bin/riscv32-buildroot-linux-gnu-gcc
ALTCC=$(ALTCOMPDIR)/bin/riscv64-unknown-elf-gcc
CC=$(ALTCC)
CXX=$(COMPDIR)/bin/riscv64-unknown-elf-g++
STRIP=$(COMPDIR)/bin/riscv64-unknown-elf-strip
NEWOPT=-march=rv32imab -mabi=ilp32 -I. -O3 -DRV32ZKNH #-fno-vectorize #-DUSE_EPI_CUSTOM
CXX=$(COMPDIR)/bin/riscv32-buildroot-linux-gnu-g++
STRIP=$(COMPDIR)/bin/riscv32-buildroot-linux-gnu-strip
NEWOPT=-march=rv32imab -mabi=ilp32 -I. -O3 -DRV32B #-fno-vectorize #-DUSE_EPI_CUSTOM
OPT=-march=rv32ima -mabi=ilp32 -I. -O3 #-fno-vectorize #-DUSE_EPI_CUSTOM
#ALTCC=$(CC)
#NEWOPT=$(OPT)
all: sha512 sha512_small
clean:
rm -f $(OBJs) try.o try_small.o blocks.o sha512 sha512_small blocks.S
rm -f $(OBJs) *.S try.o try_small.o blocks.o sha512 sha512_small blocks.S
%.o: %.c
$(CC) $(NEWOPT) $< -c -o $@
$(CC) $(OPT) $< -c -o $@
try.o: try.c
$(CC) $(NEWOPT) $< -c -o $@
$(CC) $(OPT) $< -c -o $@
try_small.o: try.c
$(CC) $(NEWOPT) $< -c -o $@ -DSMALL
$(CC) $(OPT) $< -c -o $@ -DSMALL
blocks.S: blocks.c
$(CC) $(NEWOPT) $< -S -o $@
$(ALTCC) $(NEWOPT) $< -S -o $@
blocks.o: blocks.S
$(CC) $(NEWOPT) $< -c -o $@
$(ALTCC) $(NEWOPT) $< -c -o $@
sha512: $(OBJs) blocks.o try.o $(SCLIBS)
$(CXX) $(OPT) $^ -o $@