From 2afd4595e4a29f7a16143da73b7917adb1634eeb Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 26 Nov 2015 06:59:35 -0600
Subject: [PATCH] Re-think how __KERNEL__ option is set in architecture
 Makefiles.  Should be passed in EXTRADEFINES

---
 arch/arm/src/Makefile  |  5 +++--
 arch/avr/src/Makefile  | 11 ++++-------
 arch/hc/src/Makefile   |  5 +++--
 arch/mips/src/Makefile |  5 +++--
 arch/rgmp/src/Makefile |  4 +++-
 arch/sh/src/Makefile   |  5 +++--
 arch/sim/src/Makefile  |  4 +++-
 arch/x86/src/Makefile  |  5 +++--
 arch/z16/src/Makefile  |  5 +----
 9 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile
index 9b17c47e92..f36e19f571 100644
--- a/arch/arm/src/Makefile
+++ b/arch/arm/src/Makefile
@@ -52,8 +52,9 @@ else                                    # ARM9, ARM7TDMI
 ARCH_SUBDIR = arm
 endif
 
-KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
-CFLAGS += $(KDEFINE)
+CPPFLAGS += $(EXTRADEFINES)
+CFLAGS += $(EXTRADEFINES)
+CXXFLAGS += $(EXTRADEFINES)
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCH_SRCDIR = $(TOPDIR)\arch\$(CONFIG_ARCH)\src
diff --git a/arch/avr/src/Makefile b/arch/avr/src/Makefile
index c18262032f..cba310af9b 100644
--- a/arch/avr/src/Makefile
+++ b/arch/avr/src/Makefile
@@ -66,13 +66,10 @@ else
 endif
 endif
 
-CPPFLAGS += $(INCLUDES)
-CFLAGS += $(INCLUDES)
-CXXFLAGS += $(INCLUDES)
-AFLAGS += $(INCLUDES)
-
-KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
-CFLAGS += $(KDEFINE)
+CPPFLAGS += $(INCLUDES) $(EXTRADEFINES)
+CFLAGS += $(INCLUDES) $(EXTRADEFINES)
+CXXFLAGS += $(INCLUDES) $(EXTRADEFINES)
+AFLAGS += $(INCLUDES) $(EXTRADEFINES)
 
 HEAD_OBJ = $(HEAD_ASRC:.S=$(OBJEXT))
 STARTUP_OBJS ?= $(HEAD_OBJ)
diff --git a/arch/hc/src/Makefile b/arch/hc/src/Makefile
index 07132303f2..fb165188fe 100644
--- a/arch/hc/src/Makefile
+++ b/arch/hc/src/Makefile
@@ -43,8 +43,9 @@ ifeq ($(CONFIG_ARCH_HCS12),y)
 ARCH_SUBDIR = hcs12
 endif
 
-KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
-CFLAGS += $(KDEFINE)
+CPPFLAGS += $(EXTRADEFINES)
+CFLAGS += $(EXTRADEFINES)
+CXXFLAGS += $(EXTRADEFINES)
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCH_SRCDIR = $(TOPDIR)\arch\$(CONFIG_ARCH)\src
diff --git a/arch/mips/src/Makefile b/arch/mips/src/Makefile
index 0af6d9002a..a746fd2230 100644
--- a/arch/mips/src/Makefile
+++ b/arch/mips/src/Makefile
@@ -40,8 +40,9 @@ ifeq ($(CONFIG_ARCH_MIPS),y)
 ARCH_SUBDIR = mips32
 endif
 
-KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
-CFLAGS += $(KDEFINE)
+CPPFLAGS += $(EXTRADEFINES)
+CFLAGS += $(EXTRADEFINES)
+CXXFLAGS += $(EXTRADEFINES)
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCH_SRCDIR = $(TOPDIR)\arch\$(CONFIG_ARCH)\src
diff --git a/arch/rgmp/src/Makefile b/arch/rgmp/src/Makefile
index 09fb372f44..1fb3618d96 100644
--- a/arch/rgmp/src/Makefile
+++ b/arch/rgmp/src/Makefile
@@ -39,7 +39,9 @@ include $(CONFIG_RGMP_SUBARCH)/Make.defs
 RGMP_ARCH_ASRCS := $(addprefix $(CONFIG_RGMP_SUBARCH)/,$(RGMP_ARCH_ASRCS))
 RGMP_ARCH_CSRCS := $(addprefix $(CONFIG_RGMP_SUBARCH)/,$(RGMP_ARCH_CSRCS))
 
-CFLAGS		+= -I$(TOPDIR)/sched -I$(TOPDIR)/fs
+CPPFLAGS	+= -I$(TOPDIR)/sched -I$(TOPDIR)/fs $(EXTRADEFINES)
+CFLAGS		+= -I$(TOPDIR)/sched -I$(TOPDIR)/fs $(EXTRADEFINES)
+CXXFLAGS	+= -I$(TOPDIR)/sched -I$(TOPDIR)/fs $(EXTRADEFINES)
 
 ASRCS		= $(RGMP_ARCH_ASRCS)
 CSRCS		= nuttx.c cxx.c $(RGMP_ARCH_CSRCS)
diff --git a/arch/sh/src/Makefile b/arch/sh/src/Makefile
index 767d2d24e1..967818df2a 100644
--- a/arch/sh/src/Makefile
+++ b/arch/sh/src/Makefile
@@ -36,8 +36,9 @@
 -include $(TOPDIR)/Make.defs
 -include chip/Make.defs
 
-KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
-CFLAGS += $(KDEFINE)
+CPPFLAGS += $(EXTRADEFINES)
+CFLAGS += $(EXTRADEFINES)
+CXXFLAGS += $(EXTRADEFINES)
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCH_SRCDIR = $(TOPDIR)\arch\$(CONFIG_ARCH)\src
diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index 6651e97a7a..b813e883fc 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -35,7 +35,9 @@
 
 -include $(TOPDIR)/Make.defs
 
-CFLAGS += -I$(TOPDIR)/sched -D__KERNEL__
+CPPFLAGS += -I$(TOPDIR)/sched $(EXTRADEFINES)
+CFLAGS += -I$(TOPDIR)/sched $(EXTRADEFINES)
+CXXFLAGS += -I$(TOPDIR)/sched $(EXTRADEFINES)
 
 ASRCS =
 
diff --git a/arch/x86/src/Makefile b/arch/x86/src/Makefile
index e58f592a4c..f38bcee148 100644
--- a/arch/x86/src/Makefile
+++ b/arch/x86/src/Makefile
@@ -40,8 +40,9 @@ ifeq ($(CONFIG_ARCH_I486),y)
 ARCH_SUBDIR = i486
 endif
 
-KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
-CFLAGS += $(KDEFINE)
+CPPFLAGS += $(EXTRADEFINES)
+CFLAGS += $(EXTRADEFINES)
+CXXFLAGS += $(EXTRADEFINES)
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCH_SRCDIR = $(TOPDIR)\arch\$(CONFIG_ARCH)\src
diff --git a/arch/z16/src/Makefile b/arch/z16/src/Makefile
index 74e91dc75c..f9bcc15fb8 100644
--- a/arch/z16/src/Makefile
+++ b/arch/z16/src/Makefile
@@ -53,10 +53,7 @@ endif
 
 INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
 CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-CPPFLAGS += -I$(ARCHSRCDIR)
-
-KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}
-CFLAGS += $(KDEFINE)
+CPPFLAGS += -I$(ARCHSRCDIR) $(EXTRADEFINES)
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   LDFLAGS += @"$(ARCHSRCDIR)/nuttx.linkcmd"