File tree Expand file tree Collapse file tree 3 files changed +10
-7
lines changed Expand file tree Collapse file tree 3 files changed +10
-7
lines changed Original file line number Diff line number Diff line change @@ -14,4 +14,9 @@ ifeq ($(ARCH),xtensa)
14
14
MPY_EXTERN_SYM_FILE =$(MPY_DIR ) /ports/esp8266/boards/eagle.rom.addr.v6.ld
15
15
endif
16
16
17
+ ifeq ($(ARCH ) ,$(filter $(ARCH ) ,armv6m armv7m) )
18
+ # Link with libm.a for soft-float helper functions
19
+ LINK_RUNTIME = 1
20
+ endif
21
+
17
22
include $(MPY_DIR ) /py/dynruntime.mk
Original file line number Diff line number Diff line change @@ -63,14 +63,14 @@ else ifeq ($(ARCH),armv6m)
63
63
# thumb
64
64
CROSS = arm-none-eabi-
65
65
CFLAGS_ARCH += -mthumb -mcpu=cortex-m0
66
- MICROPY_FLOAT_IMPL ?= none
66
+ MICROPY_FLOAT_IMPL ?= float
67
67
68
68
else ifeq ($(ARCH),armv7m)
69
69
70
70
# thumb
71
71
CROSS = arm-none-eabi-
72
72
CFLAGS_ARCH += -mthumb -mcpu=cortex-m3
73
- MICROPY_FLOAT_IMPL ?= none
73
+ MICROPY_FLOAT_IMPL ?= float
74
74
75
75
else ifeq ($(ARCH),armv7emsp)
76
76
Original file line number Diff line number Diff line change @@ -561,13 +561,11 @@ function ci_native_mpy_modules_build {
561
561
make -C examples/natmod/$natmod ARCH=$arch
562
562
done
563
563
564
- # features2 requires soft-float on armv7m, rv32imc, and xtensa. On armv6m
565
- # the compiler generates absolute relocations in the object file
566
- # referencing soft-float functions, which is not supported at the moment.
564
+ # features2 requires soft-float on rv32imc and xtensa.
567
565
make -C examples/natmod/features2 ARCH=$arch clean
568
- if [ $arch = " rv32imc" ] || [ $arch = " armv7m " ] || [ $arch = " xtensa" ]; then
566
+ if [ $arch = " rv32imc" ] || [ $arch = " xtensa" ]; then
569
567
make -C examples/natmod/features2 ARCH=$arch MICROPY_FLOAT_IMPL=float
570
- elif [ $arch != " armv6m " ] ; then
568
+ else
571
569
make -C examples/natmod/features2 ARCH=$arch
572
570
fi
573
571
You can’t perform that action at this time.
0 commit comments