From fd797ae3b441afd39d02b62ad51a0d7804f5222c Mon Sep 17 00:00:00 2001
From: David Sidrane <david_s5@nscdg.com>
Date: Tue, 1 Nov 2016 09:58:50 -1000
Subject: [PATCH] Using build system warnings.

 Aligned Make.Defs to use the build system's defined warnigns.
---
 nuttx-configs/crazyflie/nsh/Make.defs | 37 ++++++++-------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/nuttx-configs/crazyflie/nsh/Make.defs b/nuttx-configs/crazyflie/nsh/Make.defs
index be0222effb..1b74eab0c2 100644
--- a/nuttx-configs/crazyflie/nsh/Make.defs
+++ b/nuttx-configs/crazyflie/nsh/Make.defs
@@ -36,6 +36,8 @@
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 
+include $(TOPDIR)/PX4_Warnings.mk
+
 #
 # We only support building with the ARM bare-metal toolchain from
 # https://launchpad.net/gcc-arm-embedded on Windows, Linux or Mac OS.
@@ -91,7 +93,7 @@ else
     ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
     ARCHSCRIPT		 = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
   else
-    # Linux/Cygwin-native toolchain 
+    # Linux/Cygwin-native toolchain
     MKDEP		 = $(TOPDIR)/tools/mkdeps.sh
     ARCHINCLUDES	 = -I. -isystem $(TOPDIR)/include
     ARCHXXINCLUDES	 = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -108,10 +110,10 @@ ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
 			   -fno-strict-aliasing \
 			   -fno-strength-reduce \
 			   -fomit-frame-pointer \
-   			   -funsafe-math-optimizations \
-   			   -fno-builtin-printf \
-   			   -ffunction-sections \
-   			   -fdata-sections
+			   -funsafe-math-optimizations \
+			   -fno-builtin-printf \
+			   -ffunction-sections \
+			   -fdata-sections
 
 ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
 ARCHOPTIMIZATION	+= -g
@@ -119,28 +121,9 @@ endif
 
 ARCHCFLAGS		 = -std=gnu99
 ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=gnu++0x
-ARCHWARNINGS		 = -Wall \
-			   -Wno-sign-compare \
-			   -Wextra \
-			   -Wdouble-promotion \
-			   -Wshadow \
-			   -Wframe-larger-than=1024 \
-			   -Wpointer-arith \
-			   -Wlogical-op \
-			   -Wpacked \
-			   -Wno-unused-parameter
-#   -Wcast-qual  - generates spurious noreturn attribute warnings, try again later
-#   -Wconversion - would be nice, but too many "risky-but-safe" conversions in the code
-#   -Wcast-align - would help catch bad casts in some cases, but generates too many false positives
-
-ARCHCWARNINGS		 = $(ARCHWARNINGS) \
-			   -Wbad-function-cast \
-			   -Wstrict-prototypes \
-			   -Wold-style-declaration \
-			   -Wmissing-parameter-type \
-			   -Wnested-externs
-ARCHWARNINGSXX		 = $(ARCHWARNINGS) \
-			   -Wno-psabi
+ARCHWARNINGS		 = $(PX4_ARCHWARNINGS)
+ARCHCWARNINGS		 = $(PX4_ARCHWARNINGS) $(PX4_ARCHCWARNINGS)
+ARCHWARNINGSXX		 = $(ARCHWARNINGS) $(PX4_ARCHWARNINGSXX)
 ARCHDEFINES		 =
 ARCHPICFLAGS		 = -fpic -msingle-pic-base -mpic-register=r10