File tree Expand file tree Collapse file tree 9 files changed +363
-17
lines changed Expand file tree Collapse file tree 9 files changed +363
-17
lines changed Original file line number Diff line number Diff line change @@ -232,7 +232,7 @@ jobs:
232232 if : ${{ always() }}
233233 - name : undefined behavior test
234234 run : |
235- make clean && make ENABLE_UBSAN=1 check -j$(nproc)
235+ make distclean && make ENABLE_UBSAN=1 check -j$(nproc)
236236 make ENABLE_JIT=1 clean && make ENABLE_JIT=1 ENABLE_UBSAN=1 check -j$(nproc)
237237 if : ${{ always() }}
238238 - name : boot Linux kernel test
@@ -260,22 +260,23 @@ jobs:
260260 - name : build artifact
261261 # The GitHub Action for non-x86 CPU
262262 uses : allinurl/run-on-arch-action@master
263- # FIXME: gcc build fails on Aarch64/Linux hosts
264- env :
265- CC : clang
266263 with :
267264 arch : aarch64
268265 distro : ubuntu24.04
266+ githubToken : ${{ github.token }}
269267 # No 'sudo' is available
270268 install : |
271269 apt-get update -q=2
272- apt-get install -q=2 make git clang python3 python3-pip build-essential libsdl2-dev libsdl2-mixer-dev lsb-release wget software-properties-common gnupg bc
270+ apt-get install -q=2 make git clang python3 python3-pip python3-venv libsdl2-dev libsdl2-mixer-dev lsb-release wget software-properties-common gnupg bc
273271 git config --global --add safe.directory ${{ github.workspace }}
274272 git config --global --add safe.directory ${{ github.workspace }}/src/softfloat
275273 git config --global --add safe.directory ${{ github.workspace }}/src/mini-gdbstub
276274 wget https://apt.llvm.org/llvm.sh
277275 chmod +x ./llvm.sh
278276 ./llvm.sh 18
277+ # FIXME: gcc build fails on Aarch64/Linux hosts
278+ env : |
279+ CC: clang-18
279280 # Append custom commands here
280281 run : |
281282 make artifact
Original file line number Diff line number Diff line change 88 shallow = true
99[submodule "softfloat "]
1010 path = src/softfloat
11- url = https://github.com/sysprog21/berkeley-softfloat-3
12- branch = rv32emu
11+ url = https://github.com/ucb-bar/berkeley-softfloat-3
1312 shallow = true
1413[submodule "tests/ansibench "]
1514 path = tests/ansibench
Original file line number Diff line number Diff line change @@ -114,12 +114,10 @@ AR := ar
114114ifeq ("$(CC_IS_EMCC ) ", "1")
115115AR = emar
116116endif
117- SOFTFLOAT_OUT = $(abspath $(OUT ) /softfloat)
118- src/softfloat/build/Linux-RISCV-GCC/Makefile :
119- git submodule update --init src/softfloat/
120- SOFTFLOAT_LIB := $(SOFTFLOAT_OUT ) /softfloat.a
121- $(SOFTFLOAT_LIB ) : src/softfloat/build/Linux-RISCV-GCC/Makefile
122- $(MAKE ) -C $(dir $< ) BUILD_DIR=$(SOFTFLOAT_OUT ) CC=$(CC ) AR=$(AR )
117+
118+ # Berkeley SoftFloat
119+ include mk/softfloat.mk
120+
123121ifeq ($(call has, SYSTEM) , 1)
124122DEV_OUT := $(OUT ) /devices
125123endif
@@ -411,12 +409,13 @@ endif
411409
412410clean :
413411 $(RM ) $(BIN ) $(OBJS ) $(DEV_OBJS ) $(BUILD_DTB ) $(BUILD_DTB2C ) $(HIST_BIN ) $(HIST_OBJS ) $(deps ) $(WEB_FILES ) $(CACHE_OUT ) src/rv32_jit.c
412+ -$(RM ) $(SOFTFLOAT_LIB )
414413distclean : clean
415414 $(RM ) -r $(OUT ) /id1
416415 $(RM ) -r $(DEMO_DIR )
417416 $(RM ) * .zip
418417 $(RM ) -r $(OUT ) /mini-gdbstub
419418 -$(RM ) $(OUT ) /.config
420- -$(RM ) -r $(OUT ) /softfloat
419+ -$(RM ) -r $(SOFTFLOAT_DUMMY_PLAT ) $( OUT ) /softfloat
421420
422421-include $(deps )
You can’t perform that action at this time.
0 commit comments