Switch to automatic linking

vshymanskyy · Sep 12, 2024 · 633387d · 633387d
1 parent f83a2b4
commit 633387d
Show file tree

Hide file tree

Showing 152 changed files with 3 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
         echo "Installing WABT"
         wget -qO- https://github.com/WebAssembly/wabt/releases/download/1.0.36/wabt-1.0.36-ubuntu-20.04.tar.gz | tar xz -C ./tools
         echo "Installing MicroPython"
-        wget -qO- https://github.com/micropython/micropython/archive/refs/heads/master.tar.gz | tar xz -C ./tools
+        wget -qO- https://github.com/vshymanskyy/micropython/archive/refs/heads/mpy-ld-link-archives.tar.gz | tar xz -C ./tools
 
         pip3 install -U pyelftools tabulate
 
@@ -40,6 +40,6 @@ jobs:
         export PATH=$PWD/tools/xtensa-lx106-elf/bin:$PATH
         export PATH=$PWD/tools/xtensa-esp32-elf/bin:$PATH
         export PATH=$PWD/tools/wabt-1.0.36/bin:$PATH
-        export MPY_DIR=$PWD/tools/micropython-master
+        export MPY_DIR=$PWD/tools/micropython-mpy-ld-link-archives
 
         python3 buildall.py
diff --git a/Makefile b/Makefile
@@ -22,8 +22,6 @@ ifeq ($(ARCH),xtensa)
   SRC += runtime/esp8266-rom.S
 endif
 
-SRC_O = $(wildcard runtime/libgcc-$(ARCH)/*.o)
-
 # Wasm module to build
 WASM ?= test/$(APP).wasm
 
@@ -33,11 +31,7 @@ include $(MPY_DIR)/py/dynruntime.mk
 CFLAGS += -Os -Iruntime -I$(BUILD) -Wno-unused-value -Wno-unused-function \
           -Wno-unused-variable -Wno-unused-but-set-variable
 
-LIBGCC = $(realpath $(shell $(CROSS)gcc $(CFLAGS) --print-libgcc-file-name))
-LIBM = $(realpath $(shell $(CROSS)gcc $(CFLAGS) --print-file-name=libm.a))
-
-$(info libgcc: $(LIBGCC))
-$(info libm:   $(LIBM))
+#MPY_LD_FLAGS += -v
 
 #CLEAN_EXTRA += $(BUILD)
 

diff --git a/runtime/libgcc-armv6m/_aeabi_ldivmod.o b/runtime/libgcc-armv6m/_aeabi_ldivmod.o
diff --git a/runtime/libgcc-armv6m/_aeabi_uldivmod.o b/runtime/libgcc-armv6m/_aeabi_uldivmod.o
diff --git a/runtime/libgcc-armv6m/_arm_cmpdf2.o b/runtime/libgcc-armv6m/_arm_cmpdf2.o
diff --git a/runtime/libgcc-armv6m/_arm_cmpsf2.o b/runtime/libgcc-armv6m/_arm_cmpsf2.o
diff --git a/runtime/libgcc-armv6m/_arm_fixdfsi.o b/runtime/libgcc-armv6m/_arm_fixdfsi.o
diff --git a/runtime/libgcc-armv6m/_arm_fixsfsi.o b/runtime/libgcc-armv6m/_arm_fixsfsi.o
diff --git a/runtime/libgcc-armv6m/_arm_fixunsdfsi.o b/runtime/libgcc-armv6m/_arm_fixunsdfsi.o
diff --git a/runtime/libgcc-armv6m/_arm_fixunssfsi.o b/runtime/libgcc-armv6m/_arm_fixunssfsi.o
diff --git a/runtime/libgcc-armv6m/_arm_floatdidf.o b/runtime/libgcc-armv6m/_arm_floatdidf.o
diff --git a/runtime/libgcc-armv6m/_arm_floatdisf.o b/runtime/libgcc-armv6m/_arm_floatdisf.o
diff --git a/runtime/libgcc-armv6m/_arm_floatundidf.o b/runtime/libgcc-armv6m/_arm_floatundidf.o
diff --git a/runtime/libgcc-armv6m/_arm_floatundisf.o b/runtime/libgcc-armv6m/_arm_floatundisf.o
diff --git a/runtime/libgcc-armv6m/_arm_muldivdf3.o b/runtime/libgcc-armv6m/_arm_muldivdf3.o
diff --git a/runtime/libgcc-armv6m/_arm_muldivsf3.o b/runtime/libgcc-armv6m/_arm_muldivsf3.o
diff --git a/runtime/libgcc-armv6m/_arm_negdf2.o b/runtime/libgcc-armv6m/_arm_negdf2.o
diff --git a/runtime/libgcc-armv6m/_arm_negsf2.o b/runtime/libgcc-armv6m/_arm_negsf2.o
diff --git a/runtime/libgcc-armv6m/_arm_truncdfsf2.o b/runtime/libgcc-armv6m/_arm_truncdfsf2.o
diff --git a/runtime/libgcc-armv6m/_arm_unorddf2.o b/runtime/libgcc-armv6m/_arm_unorddf2.o
diff --git a/runtime/libgcc-armv6m/_arm_unordsf2.o b/runtime/libgcc-armv6m/_arm_unordsf2.o
diff --git a/runtime/libgcc-armv6m/_ashldi3.o b/runtime/libgcc-armv6m/_ashldi3.o
diff --git a/runtime/libgcc-armv6m/_ashrdi3.o b/runtime/libgcc-armv6m/_ashrdi3.o
diff --git a/runtime/libgcc-armv6m/_clzdi2.o b/runtime/libgcc-armv6m/_clzdi2.o
diff --git a/runtime/libgcc-armv6m/_clzsi2.o b/runtime/libgcc-armv6m/_clzsi2.o
diff --git a/runtime/libgcc-armv6m/_ctzsi2.o b/runtime/libgcc-armv6m/_ctzsi2.o
diff --git a/runtime/libgcc-armv6m/_divdi3.o b/runtime/libgcc-armv6m/_divdi3.o
diff --git a/runtime/libgcc-armv6m/_divsi3.o b/runtime/libgcc-armv6m/_divsi3.o
diff --git a/runtime/libgcc-armv6m/_fixunsdfdi.o b/runtime/libgcc-armv6m/_fixunsdfdi.o
diff --git a/runtime/libgcc-armv6m/_fixunsdfsi.o b/runtime/libgcc-armv6m/_fixunsdfsi.o
diff --git a/runtime/libgcc-armv6m/_muldi3.o b/runtime/libgcc-armv6m/_muldi3.o
diff --git a/runtime/libgcc-armv6m/_thumb1_case_uhi.o b/runtime/libgcc-armv6m/_thumb1_case_uhi.o
diff --git a/runtime/libgcc-armv6m/_thumb1_case_uqi.o b/runtime/libgcc-armv6m/_thumb1_case_uqi.o
diff --git a/runtime/libgcc-armv6m/_udivmoddi4.o b/runtime/libgcc-armv6m/_udivmoddi4.o
diff --git a/runtime/libgcc-armv6m/_udivsi3.o b/runtime/libgcc-armv6m/_udivsi3.o
diff --git a/runtime/libgcc-armv6m/adddf3.o b/runtime/libgcc-armv6m/adddf3.o
diff --git a/runtime/libgcc-armv6m/addsf3.o b/runtime/libgcc-armv6m/addsf3.o
diff --git a/runtime/libgcc-armv6m/bpabi.o b/runtime/libgcc-armv6m/bpabi.o
diff --git a/runtime/libgcc-armv6m/divdf3.o b/runtime/libgcc-armv6m/divdf3.o
diff --git a/runtime/libgcc-armv6m/eqdf2.o b/runtime/libgcc-armv6m/eqdf2.o
diff --git a/runtime/libgcc-armv6m/eqsf2.o b/runtime/libgcc-armv6m/eqsf2.o
diff --git a/runtime/libgcc-armv6m/extendsfdf2.o b/runtime/libgcc-armv6m/extendsfdf2.o
diff --git a/runtime/libgcc-armv6m/fixdfsi.o b/runtime/libgcc-armv6m/fixdfsi.o
diff --git a/runtime/libgcc-armv6m/fixsfsi.o b/runtime/libgcc-armv6m/fixsfsi.o
diff --git a/runtime/libgcc-armv6m/floatsidf.o b/runtime/libgcc-armv6m/floatsidf.o
diff --git a/runtime/libgcc-armv6m/floatsisf.o b/runtime/libgcc-armv6m/floatsisf.o
diff --git a/runtime/libgcc-armv6m/floatunsidf.o b/runtime/libgcc-armv6m/floatunsidf.o
diff --git a/runtime/libgcc-armv6m/gedf2.o b/runtime/libgcc-armv6m/gedf2.o
diff --git a/runtime/libgcc-armv6m/gesf2.o b/runtime/libgcc-armv6m/gesf2.o
diff --git a/runtime/libgcc-armv6m/ledf2.o b/runtime/libgcc-armv6m/ledf2.o
diff --git a/runtime/libgcc-armv6m/lesf2.o b/runtime/libgcc-armv6m/lesf2.o
diff --git a/runtime/libgcc-armv6m/muldf3.o b/runtime/libgcc-armv6m/muldf3.o
diff --git a/runtime/libgcc-armv6m/mulsf3.o b/runtime/libgcc-armv6m/mulsf3.o
diff --git a/runtime/libgcc-armv6m/subdf3.o b/runtime/libgcc-armv6m/subdf3.o
diff --git a/runtime/libgcc-armv6m/subsf3.o b/runtime/libgcc-armv6m/subsf3.o
diff --git a/runtime/libgcc-armv6m/truncdfsf2.o b/runtime/libgcc-armv6m/truncdfsf2.o
diff --git a/runtime/libgcc-armv6m/unorddf2.o b/runtime/libgcc-armv6m/unorddf2.o
diff --git a/runtime/libgcc-armv6m/unordsf2.o b/runtime/libgcc-armv6m/unordsf2.o
diff --git a/runtime/libgcc-armv7emdp/_aeabi_ldivmod.o b/runtime/libgcc-armv7emdp/_aeabi_ldivmod.o
diff --git a/runtime/libgcc-armv7emdp/_aeabi_uldivmod.o b/runtime/libgcc-armv7emdp/_aeabi_uldivmod.o
diff --git a/runtime/libgcc-armv7emdp/_arm_addsubdf3.o b/runtime/libgcc-armv7emdp/_arm_addsubdf3.o
diff --git a/runtime/libgcc-armv7emdp/_arm_addsubsf3.o b/runtime/libgcc-armv7emdp/_arm_addsubsf3.o
diff --git a/runtime/libgcc-armv7emdp/_arm_cmpdf2.o b/runtime/libgcc-armv7emdp/_arm_cmpdf2.o
diff --git a/runtime/libgcc-armv7emdp/_arm_cmpsf2.o b/runtime/libgcc-armv7emdp/_arm_cmpsf2.o
diff --git a/runtime/libgcc-armv7emdp/_arm_fixdfsi.o b/runtime/libgcc-armv7emdp/_arm_fixdfsi.o
diff --git a/runtime/libgcc-armv7emdp/_arm_fixsfsi.o b/runtime/libgcc-armv7emdp/_arm_fixsfsi.o
diff --git a/runtime/libgcc-armv7emdp/_arm_fixunsdfsi.o b/runtime/libgcc-armv7emdp/_arm_fixunsdfsi.o
diff --git a/runtime/libgcc-armv7emdp/_arm_fixunssfsi.o b/runtime/libgcc-armv7emdp/_arm_fixunssfsi.o
diff --git a/runtime/libgcc-armv7emdp/_arm_floatdidf.o b/runtime/libgcc-armv7emdp/_arm_floatdidf.o
diff --git a/runtime/libgcc-armv7emdp/_arm_floatdisf.o b/runtime/libgcc-armv7emdp/_arm_floatdisf.o
diff --git a/runtime/libgcc-armv7emdp/_arm_floatundidf.o b/runtime/libgcc-armv7emdp/_arm_floatundidf.o
diff --git a/runtime/libgcc-armv7emdp/_arm_floatundisf.o b/runtime/libgcc-armv7emdp/_arm_floatundisf.o
diff --git a/runtime/libgcc-armv7emdp/_arm_muldf3.o b/runtime/libgcc-armv7emdp/_arm_muldf3.o
diff --git a/runtime/libgcc-armv7emdp/_arm_muldivdf3.o b/runtime/libgcc-armv7emdp/_arm_muldivdf3.o
diff --git a/runtime/libgcc-armv7emdp/_arm_muldivsf3.o b/runtime/libgcc-armv7emdp/_arm_muldivsf3.o
diff --git a/runtime/libgcc-armv7emdp/_arm_mulsf3.o b/runtime/libgcc-armv7emdp/_arm_mulsf3.o
diff --git a/runtime/libgcc-armv7emdp/_arm_negdf2.o b/runtime/libgcc-armv7emdp/_arm_negdf2.o
diff --git a/runtime/libgcc-armv7emdp/_arm_negsf2.o b/runtime/libgcc-armv7emdp/_arm_negsf2.o
diff --git a/runtime/libgcc-armv7emdp/_arm_truncdfsf2.o b/runtime/libgcc-armv7emdp/_arm_truncdfsf2.o
diff --git a/runtime/libgcc-armv7emdp/_arm_unorddf2.o b/runtime/libgcc-armv7emdp/_arm_unorddf2.o
diff --git a/runtime/libgcc-armv7emdp/_arm_unordsf2.o b/runtime/libgcc-armv7emdp/_arm_unordsf2.o
diff --git a/runtime/libgcc-armv7emdp/_udivmoddi4.o b/runtime/libgcc-armv7emdp/_udivmoddi4.o
diff --git a/runtime/libgcc-armv7emsp/_aeabi_ldivmod.o b/runtime/libgcc-armv7emsp/_aeabi_ldivmod.o
diff --git a/runtime/libgcc-armv7emsp/_aeabi_uldivmod.o b/runtime/libgcc-armv7emsp/_aeabi_uldivmod.o
diff --git a/runtime/libgcc-armv7emsp/_arm_addsubdf3.o b/runtime/libgcc-armv7emsp/_arm_addsubdf3.o
diff --git a/runtime/libgcc-armv7emsp/_arm_addsubsf3.o b/runtime/libgcc-armv7emsp/_arm_addsubsf3.o
diff --git a/runtime/libgcc-armv7emsp/_arm_cmpdf2.o b/runtime/libgcc-armv7emsp/_arm_cmpdf2.o
diff --git a/runtime/libgcc-armv7emsp/_arm_cmpsf2.o b/runtime/libgcc-armv7emsp/_arm_cmpsf2.o
diff --git a/runtime/libgcc-armv7emsp/_arm_fixdfsi.o b/runtime/libgcc-armv7emsp/_arm_fixdfsi.o
diff --git a/runtime/libgcc-armv7emsp/_arm_fixsfsi.o b/runtime/libgcc-armv7emsp/_arm_fixsfsi.o
diff --git a/runtime/libgcc-armv7emsp/_arm_fixunsdfsi.o b/runtime/libgcc-armv7emsp/_arm_fixunsdfsi.o
diff --git a/runtime/libgcc-armv7emsp/_arm_fixunssfsi.o b/runtime/libgcc-armv7emsp/_arm_fixunssfsi.o
diff --git a/runtime/libgcc-armv7emsp/_arm_floatdidf.o b/runtime/libgcc-armv7emsp/_arm_floatdidf.o
diff --git a/runtime/libgcc-armv7emsp/_arm_floatdisf.o b/runtime/libgcc-armv7emsp/_arm_floatdisf.o
diff --git a/runtime/libgcc-armv7emsp/_arm_floatundidf.o b/runtime/libgcc-armv7emsp/_arm_floatundidf.o
diff --git a/runtime/libgcc-armv7emsp/_arm_floatundisf.o b/runtime/libgcc-armv7emsp/_arm_floatundisf.o
diff --git a/runtime/libgcc-armv7emsp/_arm_muldf3.o b/runtime/libgcc-armv7emsp/_arm_muldf3.o
diff --git a/runtime/libgcc-armv7emsp/_arm_muldivdf3.o b/runtime/libgcc-armv7emsp/_arm_muldivdf3.o
diff --git a/runtime/libgcc-armv7emsp/_arm_muldivsf3.o b/runtime/libgcc-armv7emsp/_arm_muldivsf3.o
diff --git a/runtime/libgcc-armv7emsp/_arm_mulsf3.o b/runtime/libgcc-armv7emsp/_arm_mulsf3.o
diff --git a/runtime/libgcc-armv7emsp/_arm_negdf2.o b/runtime/libgcc-armv7emsp/_arm_negdf2.o
diff --git a/runtime/libgcc-armv7emsp/_arm_negsf2.o b/runtime/libgcc-armv7emsp/_arm_negsf2.o
diff --git a/runtime/libgcc-armv7emsp/_arm_truncdfsf2.o b/runtime/libgcc-armv7emsp/_arm_truncdfsf2.o
diff --git a/runtime/libgcc-armv7emsp/_arm_unorddf2.o b/runtime/libgcc-armv7emsp/_arm_unorddf2.o
diff --git a/runtime/libgcc-armv7emsp/_arm_unordsf2.o b/runtime/libgcc-armv7emsp/_arm_unordsf2.o
diff --git a/runtime/libgcc-armv7emsp/_udivmoddi4.o b/runtime/libgcc-armv7emsp/_udivmoddi4.o
diff --git a/runtime/libgcc-armv7m/_aeabi_ldivmod.o b/runtime/libgcc-armv7m/_aeabi_ldivmod.o
diff --git a/runtime/libgcc-armv7m/_aeabi_uldivmod.o b/runtime/libgcc-armv7m/_aeabi_uldivmod.o
diff --git a/runtime/libgcc-armv7m/_arm_addsubdf3.o b/runtime/libgcc-armv7m/_arm_addsubdf3.o
diff --git a/runtime/libgcc-armv7m/_arm_addsubsf3.o b/runtime/libgcc-armv7m/_arm_addsubsf3.o
diff --git a/runtime/libgcc-armv7m/_arm_cmpdf2.o b/runtime/libgcc-armv7m/_arm_cmpdf2.o
diff --git a/runtime/libgcc-armv7m/_arm_cmpsf2.o b/runtime/libgcc-armv7m/_arm_cmpsf2.o
diff --git a/runtime/libgcc-armv7m/_arm_fixdfsi.o b/runtime/libgcc-armv7m/_arm_fixdfsi.o
diff --git a/runtime/libgcc-armv7m/_arm_fixsfsi.o b/runtime/libgcc-armv7m/_arm_fixsfsi.o
diff --git a/runtime/libgcc-armv7m/_arm_fixunsdfsi.o b/runtime/libgcc-armv7m/_arm_fixunsdfsi.o
diff --git a/runtime/libgcc-armv7m/_arm_fixunssfsi.o b/runtime/libgcc-armv7m/_arm_fixunssfsi.o
diff --git a/runtime/libgcc-armv7m/_arm_floatdidf.o b/runtime/libgcc-armv7m/_arm_floatdidf.o
diff --git a/runtime/libgcc-armv7m/_arm_floatdisf.o b/runtime/libgcc-armv7m/_arm_floatdisf.o
diff --git a/runtime/libgcc-armv7m/_arm_floatundidf.o b/runtime/libgcc-armv7m/_arm_floatundidf.o
diff --git a/runtime/libgcc-armv7m/_arm_floatundisf.o b/runtime/libgcc-armv7m/_arm_floatundisf.o
diff --git a/runtime/libgcc-armv7m/_arm_muldf3.o b/runtime/libgcc-armv7m/_arm_muldf3.o
diff --git a/runtime/libgcc-armv7m/_arm_muldivdf3.o b/runtime/libgcc-armv7m/_arm_muldivdf3.o
diff --git a/runtime/libgcc-armv7m/_arm_muldivsf3.o b/runtime/libgcc-armv7m/_arm_muldivsf3.o
diff --git a/runtime/libgcc-armv7m/_arm_mulsf3.o b/runtime/libgcc-armv7m/_arm_mulsf3.o
diff --git a/runtime/libgcc-armv7m/_arm_negdf2.o b/runtime/libgcc-armv7m/_arm_negdf2.o
diff --git a/runtime/libgcc-armv7m/_arm_negsf2.o b/runtime/libgcc-armv7m/_arm_negsf2.o
diff --git a/runtime/libgcc-armv7m/_arm_truncdfsf2.o b/runtime/libgcc-armv7m/_arm_truncdfsf2.o
diff --git a/runtime/libgcc-armv7m/_arm_unorddf2.o b/runtime/libgcc-armv7m/_arm_unorddf2.o
diff --git a/runtime/libgcc-armv7m/_arm_unordsf2.o b/runtime/libgcc-armv7m/_arm_unordsf2.o
diff --git a/runtime/libgcc-armv7m/_udivmoddi4.o b/runtime/libgcc-armv7m/_udivmoddi4.o
diff --git a/runtime/libgcc-x86/_divdi3.o b/runtime/libgcc-x86/_divdi3.o
diff --git a/runtime/libgcc-x86/_udivdi3.o b/runtime/libgcc-x86/_udivdi3.o
diff --git a/runtime/libgcc-xtensa/_ashldi3.o b/runtime/libgcc-xtensa/_ashldi3.o
diff --git a/runtime/libgcc-xtensa/_ashrdi3.o b/runtime/libgcc-xtensa/_ashrdi3.o
diff --git a/runtime/libgcc-xtensa/_cmpdf2.o b/runtime/libgcc-xtensa/_cmpdf2.o
diff --git a/runtime/libgcc-xtensa/_cmpsf2.o b/runtime/libgcc-xtensa/_cmpsf2.o
diff --git a/runtime/libgcc-xtensa/_modsi3.o b/runtime/libgcc-xtensa/_modsi3.o
diff --git a/runtime/libgcc-xtensawin/_addsubdf3.o b/runtime/libgcc-xtensawin/_addsubdf3.o
diff --git a/runtime/libgcc-xtensawin/_ashldi3.o b/runtime/libgcc-xtensawin/_ashldi3.o
diff --git a/runtime/libgcc-xtensawin/_ashrdi3.o b/runtime/libgcc-xtensawin/_ashrdi3.o
diff --git a/runtime/libgcc-xtensawin/_cmpdf2.o b/runtime/libgcc-xtensawin/_cmpdf2.o
diff --git a/runtime/libgcc-xtensawin/_divdf3.o b/runtime/libgcc-xtensawin/_divdf3.o
diff --git a/runtime/libgcc-xtensawin/_extendsfdf2.o b/runtime/libgcc-xtensawin/_extendsfdf2.o
diff --git a/runtime/libgcc-xtensawin/_fixdfsi.o b/runtime/libgcc-xtensawin/_fixdfsi.o
diff --git a/runtime/libgcc-xtensawin/_fixunsdfsi.o b/runtime/libgcc-xtensawin/_fixunsdfsi.o
diff --git a/runtime/libgcc-xtensawin/_floatsidf.o b/runtime/libgcc-xtensawin/_floatsidf.o
diff --git a/runtime/libgcc-xtensawin/_floatunsidf.o b/runtime/libgcc-xtensawin/_floatunsidf.o
diff --git a/runtime/libgcc-xtensawin/_muldf3.o b/runtime/libgcc-xtensawin/_muldf3.o
diff --git a/runtime/libgcc-xtensawin/_truncdfsf2.o b/runtime/libgcc-xtensawin/_truncdfsf2.o
diff --git a/runtime/libgcc-xtensawin/_udivdi3.o b/runtime/libgcc-xtensawin/_udivdi3.o
diff --git a/runtime/libgcc-xtensawin/lib_a-s_fpclassify.o b/runtime/libgcc-xtensawin/lib_a-s_fpclassify.o
diff --git a/runtime/libgcc-xtensawin/lib_a-sf_fpclassify.o b/runtime/libgcc-xtensawin/lib_a-sf_fpclassify.o