Add i368-elf-gcc v5.4 crosscompiler

2026-02-23 19:58:18 +01:00
parent 25cb90296f
commit 6ab17c98e9
6 changed files with 212 additions and 74 deletions
--- a/examples/arch/bochs.mk
+++ b/examples/arch/bochs.mk
@ -1,33 +1,51 @@
 # C -> WASM
-WASI_ROOT     := /opt/wasi-sdk
-WASI_CC       := ${WASI_ROOT}/bin/clang
-WASI_CFLAGS   := --target=wasm32 \
-				 --sysroot=${WASI_ROOT}/share/wasi-sysroot \
-				 -z stack-size=4096 \
-				 -O0 -nostdlib \
-				 -Wl,--no-entry \
-				 -Wl,--initial-memory=65536 \
-				 -Wl,--export-all \
-				 -Wl,--export=__heap_base \
-				 -Wl,--export=__data_end
+WASI_ROOT := /opt/wasi-sdk
+WASI_CC := ${WASI_ROOT}/bin/clang
+WASI_CFLAGS := \
+	--target=wasm32 \
+	--sysroot=${WASI_ROOT}/share/wasi-sysroot \
+	-z stack-size=4096 \
+	-O0 \
+	-nostdlib \
+	-Wl,--no-entry \
+	-Wl,--export-all \
+	-Wl,--no-gc-sections \
+	-Wl,--initial-memory=65536 \
+	-Wl,--export=__heap_base \
+	-Wl,--export=__data_end

 # WASM -> Baremetal
-WAMR          := /opt/wamr
-IWASM_LIB     := /opt/wamr-libiwasm
-CC            := gcc
+WAMR := /opt/wamr
+IWASM_LIB := /opt/wamr-libiwasm
+CC := /opt/crosscompiler/bin/i686-elf-gcc
 # NOTE: When compiling I get "error: bp cannot be used in ‘asm’ here"
 #       I could remove "ebp" from the clobber list (ARCH_ASM_CLOBBER_ALL) or
 #       use the -fomit-frame-pointer flag to tell gcc it shouldn't rely on ebp for enter/leave...
-CFLAGS        := -I. -O0 -m32 -ffunction-sections -std=c11 -fomit-frame-pointer
-LDFLAGS        = -Wl,-T linker.ld $^ -Wl,--build-id=none -static -nostdlib -m32 \
-		 -Wl,-rpath,${IWASM_LIB} -L${IWASM_LIB} -liwasm -lgcc
-INCL          := -I${WAMR}/core/iwasm/include \
-		 -I${WAMR}/core/shared/utils \
-		 -I${WAMR}/core/shared/platform/baremetal
-WAMRC         := /opt/wamr-wamrc/wamrc
-WAMRCFLAGS    := --target=i386 --format=object
-XXD           := busybox xxd
-
+CFLAGS := \
+	-I. \
+	-O0 \
+	-m32 \
+	-ffunction-sections \
+	-fomit-frame-pointer
+LDFLAGS = \
+	-Wl,-T linker.ld \
+	$^ \
+	-Wl,--build-id=none \
+	-static \
+	-nostdlib \
+	-m32 \
+	-Wl,-rpath,${IWASM_LIB} \
+	-L${IWASM_LIB} \
+	-liwasm \
+	-lc \
+	-lgcc
+INCL := \
+	-I${WAMR}/core/iwasm/include \
+	-I${WAMR}/core/shared/utils \
+	-I${WAMR}/core/shared/platform/baremetal \
+	-I/opt/crosscompiler/i686-elf/include
+WAMRC := /opt/wamr-wamrc/wamrc
+XXD := busybox xxd

 ################################################################
 # C -> WASM
@ -35,11 +53,10 @@ ${BUILD_DIR}/%/module.wasm: %.c
 	mkdir -p $(shell dirname $@)
 	${WASI_CC} ${WASI_CFLAGS} $< -o $@

-
 ################################################################
 # WASM -> Native Object File
 # ${BUILD_DIR}/%/system.o: ${BUILD_DIR}/%/module.wasm
-# 	${WAMRC} ${WAMRCFLAGS} -o ${BUILD_DIR}/$*/system.o ${BUILD_DIR}/$*/module.wasm
+# 	${WAMRC} --target=i386 --format=object -o ${BUILD_DIR}/$*/system.o ${BUILD_DIR}/$*/module.wasm
 #
 # ${BUILD_DIR}/startup.o: arch/bochs/startup.s
 # 	${CC} $< ${CFLAGS} -c -o $@
@ -47,7 +64,6 @@ ${BUILD_DIR}/%/module.wasm: %.c
 # ${BUILD_DIR}/%/system.elf: ${BUILD_DIR}/%/system.o ${BUILD_DIR}/startup.o
 # 	${CC} ${LDFLAGS} -o $@

-
 ################################################################
 # WASM -> AOT -> Loaded by Runtime
 ${BUILD_DIR}/%/module.aot: ${BUILD_DIR}/%/module.wasm
@ -62,13 +78,16 @@ ${BUILD_DIR}/%/system.o: ${BUILD_DIR}/%/module_wasm.c
 	    -e "s/__WASM_ARRAY_FILE__/module_wasm.c/g" \
 	    -e "s/__WASM_ARRAY__/build_bochs_$*_module_aot/g" \
 	    -e "s/__WASM_ARRAY_LEN__/build_bochs_$*_module_aot_len/g" \
-        ${BUILD_DIR}/$*/module_host.c
+	    ${BUILD_DIR}/$*/module_host.c
 	${CC} ${CFLAGS} ${INCL} -c ${BUILD_DIR}/$*/module_host.c -o $@

 ${BUILD_DIR}/startup.o: arch/bochs/startup.s
 	${CC} $< ${CFLAGS} -c -o $@

-${BUILD_DIR}/%/system.elf: ${BUILD_DIR}/%/system.o ${BUILD_DIR}/startup.o
+${BUILD_DIR}/syscalls.o: syscalls.c
+	${CC} $< ${CFLAGS} -c -o $@
+
+${BUILD_DIR}/%/system.elf: ${BUILD_DIR}/%/system.o ${BUILD_DIR}/syscalls.o ${BUILD_DIR}/startup.o
 	${CC} ${LDFLAGS} -o $@

 ################################################################
@ -80,51 +99,50 @@ ${BUILD_DIR}/%/system.iso: ${BUILD_DIR}/%/system.elf
 	cp $< $(shell dirname $<)/grub/boot/system.elf
 	grub-mkrescue -o $@ $(shell dirname $<)/grub

-
 BOCHS_RUNNER_ARGS = \
-	-V arch/bochs/vgabios.bin                      \
-	-b arch/bochs/BIOS-bochs-latest                \
+	-V arch/bochs/vgabios.bin \
+	-b arch/bochs/BIOS-bochs-latest \

+# Don't depend on system.iso so we can run the trace target from the fail docker image that does not have any wamr/wasi stuff
 # ${BUILD_DIR}/%/trace.pb: ${BUILD_DIR}/%/system.iso
 ${BUILD_DIR}/%/trace.pb:
-	${BOCHS_RUNNER} ${BOCHS_RUNNER_ARGS} -1        \
-	-f ${FAIL_TRACE}                               \
-	-e $(shell dirname $<)/$*/system.elf              \
-	-i $(shell dirname $<)/$*/system.iso              \
+	${BOCHS_RUNNER} ${BOCHS_RUNNER_ARGS} -1 \
+	-f ${FAIL_TRACE} \
+	-e ${BUILD_DIR}/$*/system.elf \
+	-i ${BUILD_DIR}/$*/system.iso \
 	-- \
-	-Wf,--state-file=$(shell dirname $<)/state     \
-	-Wf,--trace-file=$(shell dirname $<)/trace.pb  \
-	-Wf,--start-symbol=start_trace                 \
-	-Wf,--end-symbol=stop_trace                    \
+	-Wf,--state-file=${BUILD_DIR}/state \
+	-Wf,--trace-file=${BUILD_DIR}/trace.pb \
+	-Wf,--start-symbol=start_trace \
+	-Wf,--end-symbol=stop_trace \
 	-Wf,--check-bounds

-
 client-%:
-	${BOCHS_RUNNER} ${BOCHS_RUNNER_ARGS}            \
-	-f ${FAIL_INJECT}                               \
+	${BOCHS_RUNNER} ${BOCHS_RUNNER_ARGS} \
+	-f ${FAIL_INJECT} \
 	-e ${BUILD_DIR}/$(subst client-,,$@)/system.elf \
 	-i ${BUILD_DIR}/$(subst client-,,$@)/system.iso \
 	-j $(shell getconf _NPROCESSORS_ONLN) \
 	-- \
 	-Wf,--state-dir=${BUILD_DIR}/$(subst client-,,$@)/state \
-	-Wf,--trap                    \
-	-Wf,--timeout=10              \
-	-Wf,--ok-marker=ok_marker     \
+	-Wf,--trap \
+	-Wf,--timeout=10 \
+	-Wf,--ok-marker=ok_marker \
 	-Wf,--fail-marker=fail_marker \
 	-Wf,--catch-write-textsegment \
-	-Wf,--catch-outerspace        \
+	-Wf,--catch-outerspace \
 	2>/dev/null | grep -B 2 -A 8 'INJECT'

 inject-%:
-	${BOCHS_RUNNER} ${BOCHS_RUNNER_ARGS} -1         \
-	-f ${FAIL_INJECT}                               \
+	${BOCHS_RUNNER} ${BOCHS_RUNNER_ARGS} -1 \
+	-f ${FAIL_INJECT} \
 	-e ${BUILD_DIR}/$(subst inject-,,$@)/system.elf \
 	-i ${BUILD_DIR}/$(subst inject-,,$@)/system.iso \
 	-j 1 -- \
 	-Wf,--state-dir=${BUILD_DIR}/$(subst inject-,,$@)/state \
-	-Wf,--trap                    \
-	-Wf,--timeout=10              \
-	-Wf,--ok-marker=ok_marker     \
+	-Wf,--trap \
+	-Wf,--timeout=10 \
+	-Wf,--ok-marker=ok_marker \
 	-Wf,--fail-marker=fail_marker \
 	-Wf,--catch-write-textsegment \
 	-Wf,--catch-outerspace
@ -142,11 +160,13 @@ import-arch-%: ${BUILD_DIR}/%/trace.pb ${HOME}/.my.cnf
 	${FAIL_IMPORT} -v ${ARCH}/$(patsubst import-arch-%,%,$@) -b ip   -t $< -e $(shell dirname $<)/system.elf -i RegisterImporter --no-gp --ip
 	${FAIL_PRUNE}  -v ${ARCH}/$(patsubst import-arch-%,%,$@) -b %% --overwrite

-
 define arch-make-targets

 build-$1: ${BUILD_DIR}/$1/system.iso

 trace-$1: ${BUILD_DIR}/$1/trace.pb

+objdump-$1:
+	objdump --disassemble --disassembler-options intel --disassembler-color=on --source ${BUILD_DIR}/$1/system.elf
+
 endef
--- a/examples/arch/linux.mk
+++ b/examples/arch/linux.mk
@ -1,7 +1,7 @@
 # C -> WASM
-WASI_ROOT     := /opt/wasi-sdk
-WASI_CC       := ${WASI_ROOT}/bin/clang
-WASI_CFLAGS   := --target=wasm64 \
+WASI_ROOT := /opt/wasi-sdk
+WASI_CC := ${WASI_ROOT}/bin/clang
+WASI_CFLAGS := --target=wasm64 \
 				 --sysroot=${WASI_ROOT}/share/wasi-sysroot \
 				 -z stack-size=4096 \
 				 -O0 -g -nostdlib \
@ -12,22 +12,21 @@ WASI_CFLAGS   := --target=wasm64 \
 				 -Wl,--export=__data_end

 # WASM -> Baremetal
-WAMR          := /opt/wamr
-IWASM_LIB     := /opt/wamr-libiwasm-64
-CC            := gcc
+WAMR := /opt/wamr
+IWASM_LIB := /opt/wamr-libiwasm-64
+CC := gcc
 # NOTE: When compiling I get "error: bp cannot be used in ‘asm’ here"
 #       I could remove "ebp" from the clobber list (ARCH_ASM_CLOBBER_ALL) or
 #       use the -fomit-frame-pointer flag to tell gcc it shouldn't rely on ebp for enter/leave...
-CFLAGS        := -I. -O0 -g -ffunction-sections -std=c11 -fomit-frame-pointer
-LDFLAGS        = $^ -Wl,--build-id=none -static -nostdlib \
+CFLAGS := -I. -O0 -g -ffunction-sections -std=c11 -fomit-frame-pointer
+LDFLAGS = $^ -Wl,--build-id=none -static -nostdlib \
 		 -Wl,-rpath,${IWASM_LIB} -L${IWASM_LIB} -liwasm -lgcc
-INCL          := -I${WAMR}/core/iwasm/include \
+INCL := -I${WAMR}/core/iwasm/include \
 		 -I${WAMR}/core/shared/utils \
 		 -I${WAMR}/core/shared/platform/baremetal
-WAMRC         := /opt/wamr-wamrc/wamrc
-WAMRCFLAGS    := --target=i386 --format=object
-XXD           := busybox xxd
-
+WAMRC := /opt/wamr-wamrc/wamrc
+WAMRCFLAGS := --target=i386 --format=object
+XXD := busybox xxd

 ################################################################
 # C -> WASM
@ -35,7 +34,6 @@ ${BUILD_DIR}/%/module.wasm: %.c
 	mkdir -p $(shell dirname $@)
 	${WASI_CC} ${WASI_CFLAGS} $< -o $@

-
 ################################################################
 # WASM -> Native Object File
 # ${BUILD_DIR}/%/system.o: ${BUILD_DIR}/%/module.wasm
@ -47,7 +45,6 @@ ${BUILD_DIR}/%/module.wasm: %.c
 # ${BUILD_DIR}/%/system.elf: ${BUILD_DIR}/%/system.o ${BUILD_DIR}/startup.o
 # 	${CC} ${LDFLAGS} -o $@

-
 ################################################################
 # WASM -> AOT -> Loaded by Runtime
 ${BUILD_DIR}/%/module.aot: ${BUILD_DIR}/%/module.wasm
@ -62,7 +59,7 @@ ${BUILD_DIR}/%/system.o: ${BUILD_DIR}/%/module_wasm.c
 	    -e "s/__WASM_ARRAY_FILE__/module_wasm.c/g" \
 	    -e "s/__WASM_ARRAY__/build_linux_$*_module_aot/g" \
 	    -e "s/__WASM_ARRAY_LEN__/build_linux_$*_module_aot_len/g" \
-        ${BUILD_DIR}/$*/module_host.c
+	    ${BUILD_DIR}/$*/module_host.c
 	${CC} ${CFLAGS} ${INCL} -c ${BUILD_DIR}/$*/module_host.c -o $@

 ${BUILD_DIR}/startup.o: arch/bochs/startup.s
@ -71,7 +68,6 @@ ${BUILD_DIR}/startup.o: arch/bochs/startup.s
 ${BUILD_DIR}/%/system.elf: ${BUILD_DIR}/%/system.o ${BUILD_DIR}/startup.o
 	${CC} ${LDFLAGS} -o $@

-
 define arch-make-targets

 build-$1: ${BUILD_DIR}/$1/system.elf