From f176147d2af34d83d2e0c27cae8b98dfe995d812 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Wed, 21 Jan 2015 11:04:56 +0100 Subject: [PATCH 1/6] Allow GCC 4.9.3 --- makefiles/toolchain_gnu-arm-eabi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk index ef70d51f20..3969804535 100644 --- a/makefiles/toolchain_gnu-arm-eabi.mk +++ b/makefiles/toolchain_gnu-arm-eabi.mk @@ -50,7 +50,7 @@ OBJDUMP = $(CROSSDEV)objdump # Check if the right version of the toolchain is available # -CROSSDEV_VER_SUPPORTED = 4.7.4 4.7.5 4.7.6 4.8.4 +CROSSDEV_VER_SUPPORTED = 4.7.4 4.7.5 4.7.6 4.8.4 4.9.3 CROSSDEV_VER_FOUND = $(shell $(CC) -dumpversion) ifeq (,$(findstring $(CROSSDEV_VER_FOUND), $(CROSSDEV_VER_SUPPORTED))) From 6574692bd7a4101113cf6a80bcfae968d5a6e4f1 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Wed, 21 Jan 2015 11:01:25 +0100 Subject: [PATCH 2/6] uORB: Remove unused function --- src/modules/uORB/uORB.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/modules/uORB/uORB.cpp b/src/modules/uORB/uORB.cpp index 149b8f6d24..2fbb05fee7 100644 --- a/src/modules/uORB/uORB.cpp +++ b/src/modules/uORB/uORB.cpp @@ -817,18 +817,6 @@ uorb_main(int argc, char *argv[]) namespace { -void debug(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - fprintf(stderr, "\n"); - fflush(stderr); - usleep(100000); -} - /** * Advertise a node; don't consider it an error if the node has * already been advertised. From fd275147e4ae2efe2803e0bdc8f2c2929db70b5d Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Wed, 21 Jan 2015 13:39:13 +0100 Subject: [PATCH 3/6] Add hackery on NuttX header, to be removed during rebase -i --- NuttX | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NuttX b/NuttX index dbcccb2455..3d8171f6ea 160000 --- a/NuttX +++ b/NuttX @@ -1 +1 @@ -Subproject commit dbcccb2455d759b789d549d25e1fbf489b2d3c83 +Subproject commit 3d8171f6ea88297d8595525c8222d61e9cf20fd0 From 85b6907e1db1a6af88fe469e8e08dbd0a9d7a2a7 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Wed, 21 Jan 2015 13:39:36 +0100 Subject: [PATCH 4/6] Fixes to make GCC 4.9 link --- makefiles/toolchain_gnu-arm-eabi.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk index 3969804535..a8b4f18110 100644 --- a/makefiles/toolchain_gnu-arm-eabi.mk +++ b/makefiles/toolchain_gnu-arm-eabi.mk @@ -110,9 +110,7 @@ ARCHOPTIMIZATION = $(MAXOPTIMIZATION) \ -fno-strength-reduce \ -fomit-frame-pointer \ -funsafe-math-optimizations \ - -fno-builtin-printf \ - -ffunction-sections \ - -fdata-sections + -fno-builtin-printf # enable precise stack overflow tracking # note - requires corresponding support in NuttX @@ -166,7 +164,8 @@ ARCHWARNINGSXX = $(ARCHWARNINGS) \ # pull in *just* libm from the toolchain ... this is grody LIBM := $(shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a) -EXTRA_LIBS += $(LIBM) +LIBC := $(shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libc.a) +EXTRA_LIBS += $(LIBM) $(LIBC) # Flags we pass to the C compiler # From d1eac3510bdee3aa133a9eea248f882758dd29d0 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Wed, 21 Jan 2015 13:40:10 +0100 Subject: [PATCH 5/6] DELETE DURING REBASE: Remove some apps to make space --- makefiles/config_px4fmu-v2_default.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index a5f996bb35..2ba07821fa 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -31,7 +31,7 @@ MODULES += drivers/mb12xx MODULES += drivers/ll40ls # MODULES += drivers/trone MODULES += drivers/gps -MODULES += drivers/hil +# MODULES += drivers/hil # MODULES += drivers/hott # MODULES += drivers/hott/hott_telemetry # MODULES += drivers/hott/hott_sensors @@ -76,7 +76,7 @@ MODULES += modules/uavcan # Estimation modules (EKF/ SO3 / other filters) # MODULES += modules/attitude_estimator_ekf -MODULES += modules/ekf_att_pos_estimator +# MODULES += modules/ekf_att_pos_estimator MODULES += modules/position_estimator_inav # From 1628999361f5bd939ffd6312cae1d9e67698f3d4 Mon Sep 17 00:00:00 2001 From: Thomas Gubler Date: Wed, 21 Jan 2015 15:44:15 +0100 Subject: [PATCH 6/6] Revert "Fixes to make GCC 4.9 link" This reverts commit 85b6907e1db1a6af88fe469e8e08dbd0a9d7a2a7. --- makefiles/toolchain_gnu-arm-eabi.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk index a8b4f18110..3969804535 100644 --- a/makefiles/toolchain_gnu-arm-eabi.mk +++ b/makefiles/toolchain_gnu-arm-eabi.mk @@ -110,7 +110,9 @@ ARCHOPTIMIZATION = $(MAXOPTIMIZATION) \ -fno-strength-reduce \ -fomit-frame-pointer \ -funsafe-math-optimizations \ - -fno-builtin-printf + -fno-builtin-printf \ + -ffunction-sections \ + -fdata-sections # enable precise stack overflow tracking # note - requires corresponding support in NuttX @@ -164,8 +166,7 @@ ARCHWARNINGSXX = $(ARCHWARNINGS) \ # pull in *just* libm from the toolchain ... this is grody LIBM := $(shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libm.a) -LIBC := $(shell $(CC) $(ARCHCPUFLAGS) -print-file-name=libc.a) -EXTRA_LIBS += $(LIBM) $(LIBC) +EXTRA_LIBS += $(LIBM) # Flags we pass to the C compiler #