Skip to content

[arm64-linux] Add target and fix Virgil test build #662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
titzer merged 1 commit into from
Jul 21, 2026
Merged

[arm64-linux] Add target and fix Virgil test build #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ clean:

x86-linux: bin/wizeng.x86-linux bin/unittest.x86-linux

arm64-linux: bin/wizeng.arm64-linux bin/unittest.arm64-linux

x86-64-linux: bin/wizeng.x86-64-linux bin/unittest.x86-64-linux

jvm: bin/wizeng.jvm bin/unittest.jvm
Expand Down Expand Up @@ -64,6 +66,16 @@ bin/wizeng.x86-linux: $(WIZENG) $(MONITORS) build.sh
bin/objdump.x86-linux: $(OBJDUMP) build.sh
./build.sh objdump x86-linux

# arm64-linux targets
bin/unittest.arm64-linux: $(UNITTEST) build.sh
./build.sh unittest arm64-linux

bin/wizeng.arm64-linux: $(WIZENG) $(MONITORS) build.sh
./build.sh ${WIZENG_BUILD_SH_ARGS} wizeng arm64-linux

bin/objdump.arm64-linux: $(OBJDUMP) build.sh
./build.sh objdump arm64-linux

# x86-64-linux targets
bin/unittest.x86-64-linux: $(UNITTEST) $(UNITTEST_X86_64_LINUX) $(X86_64) $(JIT) build.sh
./build.sh unittest x86-64-linux
Expand Down
2 changes: 2 additions & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@ if [[ "$TARGET" = "x86-linux" || "$TARGET" = "x86_linux" ]]; then
exec v3c-x86-linux -symbols -heap-size=512m -stack-size=1m $LANG_OPTS $V3C_OPTS -program-name=${PROGRAM}.x86-linux -output=bin/ $SOURCES $BUILD_FILE $TARGET_SRC
elif [[ "$TARGET" = "x86-64-darwin" || "$TARGET" = "x86_64_darwin" ]]; then
exec v3c-x86-64-darwin -symbols -heap-size=700m -stack-size=1m $LANG_OPTS $V3C_OPTS -program-name=${PROGRAM}.x86-64-darwin -output=bin/ $SOURCES $BUILD_FILE $TARGET_V3
elif [[ "$TARGET" = "arm64-linux" || "$TARGET" = "arm64_linux" ]]; then
exec v3c-arm64-linux -symbols -heap-size=700m -stack-size=1m $LANG_OPTS $V3C_OPTS -program-name=${PROGRAM}.arm64-linux -output=bin/ $SOURCES $BUILD_FILE $TARGET_V3
elif [[ "$TARGET" = "x86-64-linux" || "$TARGET" = "x86_64_linux" ]]; then
TARGET_SRC=$TARGET_X86_64
if "$CBD"; then TARGET_SRC="$TARGET_CBD_FAST $TARGET_X86_64"; fi
Expand Down
4 changes: 2 additions & 2 deletions test/virgil/bin/cast05.bin.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(module binary
"\00\61\73\6D\01\00\00\00\01\84\80\80\80\00\01\60\00\00\03\82\80\80\80\00\01\00\05\84\80\80\80\00"
"\01\01\03\03\07\91\80\80\80\00\02\04\6D\61\69\6E\00\00\06\6D\65\6D\6F\72\79\02\00\0A\89\80\80\80"
"\00\01\83\80\80\80\00\00\00\0B\0B\8C\80\80\80\00\01\00\41\80\80\04\0B\80\80\80\80\00"
"\01\01\01\01\07\91\80\80\80\00\02\04\6D\61\69\6E\00\00\06\6D\65\6D\6F\72\79\02\00\0A\89\80\80\80"
"\00\01\83\80\80\80\00\00\00\0B"

)
(assert_trap (invoke "main" )
Expand Down
2 changes: 1 addition & 1 deletion test/virgil/gen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ for D in $TEST_DIRS; do
cp $VIRGIL_LOC/test/$D/*.v3 src/
done

CMD="v3c -target=wasm-spec-test -output=bin/ -multiple src/*.v3"
CMD="v3c -target=wasm-test -output=bin/ -multiple src/*.v3"

printf "Compiling ${CYAN}virgil${NORM} tests: "

Expand Down
Loading