This commit is contained in:
darotsr 2024-09-16 18:43:18 +03:00
parent 9359f22b0b
commit 6230ab864d
7 changed files with 19 additions and 8 deletions

3
.gitignore vendored
View file

@ -26,8 +26,7 @@ vendor/verilator/
install/
sim.fst
isolde/sw/
*.headers
*.tar.gz
logs/
*.log
*.csv

View file

@ -52,16 +52,16 @@ $(GCC_INSTALL_DIR): vendor/riscv32-elf-gcc.url
riscv32-llvm: $(LLVM_INSTALL_DIR)
vendor/riscv32-llvm.tar.gz:
vendor/riscv32-elf-llvm.tar.gz: vendor/riscv32-elf-llvm.url
cd vendor && \
wget https://buildbot.embecosm.com/job/riscv32-clang-ubuntu2004-release/24/artifact/riscv32-embecosm-ubuntu2004-clang16.0.2.tar.gz -O riscv32-llvm.tar.gz
touch riscv32-llvm.tar.gz
wget `cat $(CURDIR)/$<` -O riscv32-elf-llvm.tar.gz
touch riscv32-elf-llvm.tar.gz
$(LLVM_INSTALL_DIR): vendor/riscv32-llvm.tar.gz
rm -fr $(LLVM_INSTALL_DIR)
mkdir -p $(INSTALL_DIR)
cd vendor && \
tar -xzvf riscv32-llvm.tar.gz -C $(INSTALL_DIR)/ riscv32-embecosm-ubuntu2004-clang16.0.2
tar -xzvf riscv32-elf-llvm.tar.gz -C $(INSTALL_DIR)/ riscv
mv $(INSTALL_DIR)/riscv32-embecosm-ubuntu2004-clang16.0.2 $(LLVM_INSTALL_DIR)
touch $(LLVM_INSTALL_DIR)

View file

@ -4,3 +4,4 @@
*.elf
*.vmem
*.d
*.headers

View file

@ -24,6 +24,7 @@ clean-test:
run-test:
@rm -f ibex_simple_system.log
@rm -f trace_core_00000000.log
./$(BUILD_DIR)/sim-verilator/Vibex_simple_system -t --meminit=ram,$(test-program)
@echo
@echo ibex_simple_system.log

8
isolde/sw/.gitignore vendored Normal file
View file

@ -0,0 +1,8 @@
*.o
*.bin
*.dis
*.elf
*.vmem
*.d
*.map
*.headers

View file

@ -35,7 +35,8 @@ C_SRCS = $(filter %.c, $(SRCS))
ASM_SRCS = $(filter %.S, $(SRCS))
CC := $(LLVM_TOOLCHAIN)/clang
LD := $(LLVM_TOOLCHAIN)/ld.lld
LD := $(LLVM_TOOLCHAIN)/riscv32-unknown-elf-ld
#LD := $(LLVM_TOOLCHAIN)/ld.lld
#LD := $(GCC_TOOLCHAIN)/riscv32-unknown-elf-gcc
@ -63,7 +64,7 @@ all: $(OUTFILES)
ifdef PROGRAM
$(PROGRAM).elf: $(OBJS) $(LINKER_SCRIPT)
# $(LD) $(CFLAGS) -T $(LINKER_SCRIPT) $(OBJS) -o $@ $(LIBS)
$(LD) $(RISCV_LDFLAGS) -Map $@.map $(LINKER_SCRIPT) $(OBJS) -o $@ $(LIBS)
$(LD) $(RISCV_LDFLAGS) -Map $@.map -T $(LINKER_SCRIPT) $(OBJS) -o $@ $(LIBS)
$(OBJDUMP) -dh $@ >$@.headers

1
vendor/riscv32-elf-llvm.url vendored Normal file
View file

@ -0,0 +1 @@
https://github.com/riscv-collab/riscv-gnu-toolchain/releases/download/2024.09.03/riscv32-elf-ubuntu-20.04-llvm-nightly-2024.09.03-nightly.tar.gz