File tree Expand file tree Collapse file tree 9 files changed +361
-15
lines changed Expand file tree Collapse file tree 9 files changed +361
-15
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
@@ -262,14 +262,15 @@ jobs:
262262 uses : allinurl/run-on-arch-action@master
263263 # FIXME: gcc build fails on Aarch64/Linux hosts
264264 env :
265- CC : clang
265+ CC : clang-18
266266 with :
267267 arch : aarch64
268268 distro : ubuntu24.04
269+ githubToken : ${{ github.token }}
269270 # No 'sudo' is available
270271 install : |
271272 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
273+ apt-get install -q=2 make git clang python3 python3-pip libsdl2-dev libsdl2-mixer-dev lsb-release wget software-properties-common gnupg bc
273274 git config --global --add safe.directory ${{ github.workspace }}
274275 git config --global --add safe.directory ${{ github.workspace }}/src/softfloat
275276 git config --global --add safe.directory ${{ github.workspace }}/src/mini-gdbstub
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
@@ -415,12 +413,13 @@ endif
415413
416414clean :
417415 $(RM ) $(BIN ) $(OBJS ) $(DEV_OBJS ) $(BUILD_DTB ) $(BUILD_DTB2C ) $(HIST_BIN ) $(HIST_OBJS ) $(deps ) $(WEB_FILES ) $(CACHE_OUT ) src/rv32_jit.c
416+ -$(RM ) $(SOFTFLOAT_LIB )
418417distclean : clean
419418 $(RM ) -r $(OUT ) /id1
420419 $(RM ) -r $(DEMO_DIR )
421420 $(RM ) * .zip
422421 $(RM ) -r $(OUT ) /mini-gdbstub
423422 -$(RM ) $(OUT ) /.config
424- -$(RM ) -r $(OUT ) /softfloat
423+ -$(RM ) -r $(SOFTFLOAT_DUMMY_PLAT ) $( OUT ) /softfloat
425424
426425-include $(deps )
You can’t perform that action at this time.
0 commit comments