summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-01-14 23:48:11 +0000
committerDamien George <damien.p.george@gmail.com>2014-01-14 23:48:11 +0000
commit0367ad6214b0923d9e01ec758e1e10bc1a482f4f (patch)
tree51ce8583ac77ac8966212a7d49847bc3f1b02756
parent36b35c041b3e594a70faa44431aa34713f2ebb4e (diff)
downloadmicropython-0367ad6214b0923d9e01ec758e1e10bc1a482f4f.tar.gz
micropython-0367ad6214b0923d9e01ec758e1e10bc1a482f4f.zip
stm: Include libgcc for __aeabi_d2f and __aeabi_f2d functions.
Thanks to Dave Hylands for this.
-rw-r--r--stm/Makefile3
-rw-r--r--stm/main.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/stm/Makefile b/stm/Makefile
index 03e0e261bc..d4dbd960a6 100644
--- a/stm/Makefile
+++ b/stm/Makefile
@@ -33,6 +33,7 @@ CFLAGS += -Os -DNDEBUG
endif
LDFLAGS = --nostdlib -T stm32f405.ld
+LIBS = $(shell $(CC) -print-libgcc-file-name)
SRC_C = \
main.c \
@@ -145,7 +146,7 @@ $(BUILD)/flash1.bin: $(BUILD)/flash.elf
$(BUILD)/flash.elf: $(OBJ)
$(ECHO) "LINK $@"
- $(Q)$(LD) $(LDFLAGS) -o $@ $(OBJ)
+ $(Q)$(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
$(Q)$(SIZE) $@
$(BUILD)/%.o: %.s
diff --git a/stm/main.c b/stm/main.c
index c5e9d76d4d..ab8cced6a9 100644
--- a/stm/main.c
+++ b/stm/main.c
@@ -1180,6 +1180,7 @@ soft_reset:
goto soft_reset;
}
+/* now supplied by libgcc library
double __aeabi_f2d(float x) {
// TODO
return 0.0;
@@ -1189,6 +1190,7 @@ float __aeabi_d2f(double x) {
// TODO
return 0.0;
}
+*/
double sqrt(double x) {
// TODO