aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Ulianko <michal.ulianko@gmail.com>2015-03-21 00:31:52 +0100
committerMichal Ulianko <michal.ulianko@gmail.com>2015-03-21 00:31:52 +0100
commit631e518c45b054441cbe9eba5167d3075d5d2a9d (patch)
tree800910c1a14e9a5f626b51eec8e0ccacb92d2252
parent354809bff4da0ce2a74ca6a750fa15a3ff441847 (diff)
downloadpx4-firmware-631e518c45b054441cbe9eba5167d3075d5d2a9d.tar.gz
px4-firmware-631e518c45b054441cbe9eba5167d3075d5d2a9d.tar.bz2
px4-firmware-631e518c45b054441cbe9eba5167d3075d5d2a9d.zip
BIN_TO_OBJ: Change NM radix back to hex so multiple leading zeros in NM output won't generate octal constant in C.
-rw-r--r--makefiles/toolchain_gnu-arm-eabi.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk
index 033d6e1fe..3b9fefb3e 100644
--- a/makefiles/toolchain_gnu-arm-eabi.mk
+++ b/makefiles/toolchain_gnu-arm-eabi.mk
@@ -324,7 +324,7 @@ define BIN_TO_OBJ
$(Q) $(ECHO) > $2.c
$(call COMPILE,$2.c,$2.c.o)
$(Q) $(LD) -r -o $2.bin.o $2.c.o -b binary $1
- $(Q) $(ECHO) "const unsigned int $3_len = `$(NM) -p --radix=d $2.bin.o | $(GREP) $(call BIN_SYM_PREFIX,$1)_size$$ | $(GREP) -o ^[0-9]*`;" > $2.c
+ $(Q) $(ECHO) "const unsigned int $3_len = 0x`$(NM) -p --radix=x $2.bin.o | $(GREP) $(call BIN_SYM_PREFIX,$1)_size$$ | $(GREP) -o ^[0-9a-fA-F]*`;" > $2.c
$(call COMPILE,$2.c,$2.c.o)
$(Q) $(LD) -r -o $2 $2.c.o $2.bin.o
$(Q) $(OBJCOPY) $2 \