git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@786 35acf78f-673a-0410-8e92-d51de3d6d3f4

4 files changed, 219 insertions, 492 deletions

diff --git a/demos/ARM7-LPC214x-G++/Makefile b/demos/ARM7-LPC214x-G++/Makefile
index 56506f8f5..34c365e86 100644
--- a/demos/ARM7-LPC214x-G++/Makefile
+++ b/demos/ARM7-LPC214x-G++/Makefile
@@ -1,21 +1,105 @@
+##############################################################################

+# Build global options

+# NOTE: Can be overridden externally.

 #

-#       !!!! Do NOT edit this makefile with an editor which replace tabs by spaces !!!!

-#

-##############################################################################################

-#

-# On command line:

-#

-# make all = Create project

+

+# Compiler options here.

+ifeq ($(USE_OPT),)

+  USE_OPT = -O2 -ggdb -fomit-frame-pointer -mabi=apcs-gnu -falign-functions=16

+endif

+

+# C++ specific options here (added to USE_OPT).

+ifeq ($(USE_CPPOPT),)

+  USE_CPPOPT = -fno-rtti

+endif

+

+# Enable this if you want the linker to remove unused code and data

+ifeq ($(USE_LINK_GC),)

+  USE_LINK_GC = yes

+endif

+

+# If enabled, this option allows to compile the application in THUMB mode.

+ifeq ($(USE_THUMB),)

+  USE_THUMB = no

+endif

+

+# Enable register caching optimization (read documentation).

+ifeq ($(USE_CURRP_CACHING),)

+  USE_CURRP_CACHING = no

+endif

+

 #

-# make clean = Clean project files.

+# Build global options

+##############################################################################

+

+##############################################################################

+# Project, sources and paths

 #

-# To rebuild project do "make clean" and "make all".

+

+# Define project name here

+PROJECT = ch

+

+# Define linker script file here

+LDSCRIPT= ch.ld

+

+# Imported source files

+include ../../src/kernel.mk

+include ../../test/test.mk

+

+# C sources that can be compiled in ARM or THUMB mode depending on the global

+# setting.

+CSRC = ../../ports/ARM7/chcore.c \

+       ../../ports/ARM7-LPC214x/vic.c  \

+       ../../ports/ARM7-LPC214x/lpc214x_serial.c  \

+       ${KERNSRC} \

+       ${TESTSRC} \

+       ../../src/lib/evtimer.c \

+       board.c

+

+# C++ sources that can be compiled in ARM or THUMB mode depending on the global

+# setting.

+CPPSRC = ../../src/lib/ch.cpp main.cpp

+

+# C sources to be compiled in ARM mode regardless of the global setting.

+# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

+#       option that results in lower performance and larger code size.

+ACSRC =

+

+# C++ sources to be compiled in ARM mode regardless of the global setting.

+# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

+#       option that results in lower performance and larger code size.

+ACPPSRC =

+

+# C sources to be compiled in THUMB mode regardless of the global setting.

+# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

+#       option that results in lower performance and larger code size.

+TCSRC =

+

+# C sources to be compiled in THUMB mode regardless of the global setting.

+# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

+#       option that results in lower performance and larger code size.

+TCPPSRC =

+

+# List ASM source files here

+ASMSRC = ../../ports/ARM7/crt0.s \

+         ../../ports/ARM7-LPC214x/vectors.s \

+         ../../ports/ARM7/chcoreasm.s

+

+INCDIR = $(KERNINC) $(TESTINC) \

+         ../../src/lib \

+         ../../ports/ARM7 \

+         ../../ports/ARM7-LPC214x

+

 #

+# Project, sources and paths

+##############################################################################

 

-##############################################################################################

-# Start of default section

+##############################################################################

+# Compiler settings

 #

 

+MCU  = arm7tdmi

+

 TRGT = arm-elf-

 CC   = $(TRGT)gcc

 CPPC = $(TRGT)g++

@@ -30,10 +114,25 @@ OD   = $(TRGT)objdump
 HEX  = $(CP) -O ihex

 BIN  = $(CP) -O binary

 

-MCU  = arm7tdmi

+# ARM-specific options here

+AOPT =

 

-# Enable this if you want the linker to remove unused code and data

-LINK_GC = yes

+# THUMB-specific options here

+TOPT = -mthumb -DTHUMB

+

+# Define C warning options here

+CWARN = -Wall -Wstrict-prototypes

+

+# Define C++ warning options here

+CPPWARN = -Wall

+

+#

+# Compiler settings

+##############################################################################

+

+##############################################################################

+# Start of default section

+#

 

 # List all default C defines here, like -D_DEBUG=1

 DDEFS =

@@ -52,53 +151,20 @@ DLIBS =
 

 #

 # End of default section

-##############################################################################################

+##############################################################################

 

-##############################################################################################

+##############################################################################

 # Start of user section

 #

 

-# Define project name here

-PROJECT = ch

-

-# Define linker script file here

-LDSCRIPT= ch.ld

-

 # List all user C define here, like -D_DEBUG=1

 UDEFS =

 

 # Define ASM defines here

 UADEFS =

 

-# Imported source files

-include ../../src/kernel.mk

-include ../../test/test.mk

-

-# List ARM-mode C source files here

-ACSRC = ../../ports/ARM7/chcore.c \

-        ../../ports/ARM7-LPC214x/vic.c  \

-        ../../ports/ARM7-LPC214x/lpc214x_serial.c  \

-       ${KERNSRC} \

-       ${TESTSRC} \

-        ../../src/lib/evtimer.c \

-        board.c

-

-# List ARM-mode C++ source files here

-ACPPSRC = ../../src/lib/ch.cpp main.cpp

-

-# List THUMB-mode C sources here

-TCSRC =

-

-# List THUMB-mode C++ source files here

-TCPPSRC =

-

-# List ASM source files here

-ASMSRC = ../../ports/ARM7/crt0.s ../../ports/ARM7/chcoreasm.s \

-         ../../ports/ARM7-LPC214x/vectors.s

-

 # List all user directories here

-UINCDIR = ../../src/include ../../src/lib ../../test \

-          ../../ports/ARM7 ../../ports/ARM7-LPC214x

+UINCDIR =

 

 # List the user directory to look for the libraries here

 ULIBDIR =

@@ -106,151 +172,8 @@ ULIBDIR =
 # List all user libraries here

 ULIBS =

 

-# ARM-specific options here

-AOPT =

-

-# THUMB-specific options here

-TOPT = -mthumb -D THUMB

-

-# Common options here

-# NOTE: -ffixed-r7 is only needed if you enabled CH_CURRP_REGISTER_CACHE in

-#       chconf.h.

-# NOTE: -falign-functions=16 may improve the performance, not always, but

-#       increases the code size.

-OPT = -O2 -ggdb -fomit-frame-pointer -mabi=apcs-gnu

-#OPT += -ffixed-r7

-OPT += -falign-functions=16

-

-# C++ specific options here

-# NOTE: -fno-rtti saves a LOT of code space, remove it only if you really need

-#       RTTI.

-CPPOPT = -fno-rtti

-

-# Define warning options here

-WARN = -Wall

-

 #

 # End of user defines

-##############################################################################################

-

-ifeq ($(LINK_GC),yes)

-  OPT += -ffunction-sections -fdata-sections

-endif

-

-INCDIR   = $(patsubst %,-I%,$(DINCDIR) $(UINCDIR))

-LIBDIR   = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR))

-DEFS     = $(DDEFS) $(UDEFS)

-ADEFS    = $(DADEFS) $(UADEFS)

-ASRC	 = $(ACSRC)$(ACPPSRC)

-TSRC	 = $(TCSRC)$(TCPPSRC)

-SRC	 = $(ASRC)$(TSRC)

-ACOBJS   = $(ACSRC:.c=.o)

-ACPPOBJS = $(ACPPSRC:.cpp=.o)

-TCOBJS   = $(TCSRC:.c=.o)

-TCPPOBJS = $(TCPPSRC:.cpp=.o)

-ASMOBJS  = $(ASMSRC:.s=.o)

-OBJS	 = $(ASMOBJS) $(ACOBJS) $(TCOBJS) $(ACPPOBJS) $(TCPPOBJS)

-LIBS     = $(DLIBS) $(ULIBS)

-MCFLAGS  = -mcpu=$(MCU)

-

-ODFLAGS  = -x --syms

-ASFLAGS  = $(MCFLAGS) -Wa,-amhls=$(<:.s=.lst) $(ADEFS)

-CFLAGS   = $(MCFLAGS) $(OPT) $(WARN) -Wa,-alms=$(<:.c=.lst) $(DEFS)

-CPPFLAGS = $(MCFLAGS) $(OPT) $(CPPOPT) $(WARN) -Wa,-alms=$(<:.cpp=.lst) $(DEFS)

-ifeq ($(LINK_GC),yes)

-  LDFLAGS = $(MCFLAGS) -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(PROJECT).map,--cref,--no-warn-mismatch,--gc-sections $(LIBDIR)

-else

-  LDFLAGS = $(MCFLAGS) -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(PROJECT).map,--cref,--no-warn-mismatch $(LIBDIR)

-endif

-

-# Thumb interwork enabled only if needed because it kills performance.

-ifneq ($(TSRC),)

-  CFLAGS += -D THUMB_PRESENT

-  CPPFLAGS += -D THUMB_PRESENT

-  ASFLAGS += -D THUMB_PRESENT

-  ifneq ($(ASRC),)

-    # Mixed ARM and THUMB case.

-    CFLAGS += -mthumb-interwork

-    CPPFLAGS += -mthumb-interwork

-    LDFLAGS += -mthumb-interwork

-  else

-    # Pure THUMB case, THUMB C code cannot be called by ARM asm code directly.

-    CFLAGS += -mno-thumb-interwork -D THUMB_NO_INTERWORKING

-    CPPFLAGS += -mno-thumb-interwork -D THUMB_NO_INTERWORKING

-    LDFLAGS += -mno-thumb-interwork -mthumb

-    ASFLAGS += -D THUMB_NO_INTERWORKING

-  endif

-else

-  CPFLAGS += -mno-thumb-interwork

-  CPPFLAGS += -mno-thumb-interwork

-  LDFLAGS += -mno-thumb-interwork

-endif

-

-# Generate dependency information

-CFLAGS += -MD -MP -MF .dep/$(@F).d

-CPPFLAGS += -MD -MP -MF .dep/$(@F).d

-

-#

-# Makefile rules

-#

-

-all: $(OBJS) $(PROJECT).elf $(PROJECT).hex $(PROJECT).bin $(PROJECT).dmp

-

-$(ACPPOBJS) : %.o : %.cpp

-	@echo

-	$(CPPC) -c $(CPPFLAGS) $(AOPT) -I . $(INCDIR) $< -o $@

-

-$(TCPPOBJS) : %.o : %.cpp

-	@echo

-	$(CPPC) -c $(CPPFLAGS) $(TOPT) -I . $(INCDIR) $< -o $@

-

-$(ACOBJS) : %.o : %.c

-	@echo

-	$(CC) -c $(CFLAGS) $(AOPT) -I . $(INCDIR) $< -o $@

-

-$(TCOBJS) : %.o : %.c

-	@echo

-	$(CC) -c $(CFLAGS) $(TOPT) -I . $(INCDIR) $< -o $@

-

-$(ASMOBJS) : %.o : %.s

-	@echo

-	$(AS) -c $(ASFLAGS) -I . $(INCDIR) $< -o $@

-

-%elf: $(OBJS)

-	@echo

-	$(LD) $(ASMOBJS) $(ACOBJS) $(TCOBJS) $(ACPPOBJS) $(TCPPOBJS) $(LDFLAGS) $(LIBS) -o $@

-

-%hex: %elf

-	$(HEX) $< $@

-

-%bin: %elf

-	$(BIN) $< $@

-

-%dmp: %elf

-	$(OD) $(ODFLAGS) $< > $@

-

-clean:

-	-rm -f $(OBJS)

-	-rm -f $(PROJECT).elf

-	-rm -f $(PROJECT).dmp

-	-rm -f $(PROJECT).map

-	-rm -f $(PROJECT).hex

-	-rm -f $(PROJECT).bin

-	-rm -f $(ACSRC:.c=.c.bak)

-	-rm -f $(ACSRC:.c=.lst)

-	-rm -f $(TCSRC:.c=.c.bak)

-	-rm -f $(TCSRC:.c=.lst)

-	-rm -f $(ACPPSRC:.cpp=.c.bak)

-	-rm -f $(ACPPSRC:.cpp=.lst)

-	-rm -f $(TCPPSRC:.cpp=.c.bak)

-	-rm -f $(TCPPSRC:.cpp=.lst)

-	-rm -f $(ASMSRC:.s=.s.bak)

-	-rm -f $(ASMSRC:.s=.lst)

-	-rm -fR .dep

-

-#

-# Include the dependency files, should be the last of the makefile

-#

--include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)

+##############################################################################

 

-# *** EOF ***

+include ../../ports/ARM7/rules.mk

diff --git a/demos/ARM7-LPC214x-G++/Makefile.thumb b/demos/ARM7-LPC214x-G++/Makefile.thumb
deleted file mode 100644
index 6a5bdbaf2..000000000
--- a/demos/ARM7-LPC214x-G++/Makefile.thumb
+++ /dev/null
@@ -1,256 +0,0 @@
-#

-#       !!!! Do NOT edit this makefile with an editor which replace tabs by spaces !!!!

-#

-##############################################################################################

-#

-# On command line:

-#

-# make all = Create project

-#

-# make clean = Clean project files.

-#

-# To rebuild project do "make clean" and "make all".

-#

-

-##############################################################################################

-# Start of default section

-#

-

-TRGT = arm-elf-

-CC   = $(TRGT)gcc

-CPPC = $(TRGT)g++

-# Enable loading with g++ only if you need C++ runtime support.

-# NOTE: You can use C++ even without C++ support if you are careful. C++

-#       runtime support makes code size explode.

-LD   = $(TRGT)gcc

-#LD   = $(TRGT)g++

-CP   = $(TRGT)objcopy

-AS   = $(TRGT)gcc -x assembler-with-cpp

-OD   = $(TRGT)objdump

-HEX  = $(CP) -O ihex

-BIN  = $(CP) -O binary

-

-MCU  = arm7tdmi

-

-# Enable this if you want the linker to remove unused code and data

-LINK_GC = yes

-

-# List all default C defines here, like -D_DEBUG=1

-DDEFS =

-

-# List all default ASM defines here, like -D_DEBUG=1

-DADEFS =

-

-# List all default directories to look for include files here

-DINCDIR =

-

-# List the default directory to look for the libraries here

-DLIBDIR =

-

-# List all default libraries here

-DLIBS =

-

-#

-# End of default section

-##############################################################################################

-

-##############################################################################################

-# Start of user section

-#

-

-# Define project name here

-PROJECT = ch

-

-# Define linker script file here

-LDSCRIPT= ch.ld

-

-# List all user C define here, like -D_DEBUG=1

-UDEFS =

-

-# Define ASM defines here

-UADEFS =

-

-# Imported source files

-include ../../src/kernel.mk

-include ../../test/test.mk

-

-# List ARM-mode C source files here

-ACSRC =

-

-# List ARM-mode C++ source files here

-ACPPSRC =

-

-# List THUMB-mode C sources here

-TCSRC = ../../ports/ARM7/chcore.c \

-        ../../ports/ARM7-LPC214x/vic.c  \

-        ../../ports/ARM7-LPC214x/lpc214x_serial.c  \

-       ${KERNSRC} \

-       ${TESTSRC} \

-        ../../src/lib/evtimer.c \

-        board.c

-

-# List THUMB-mode C++ source files here

-TCPPSRC = ../../src/lib/ch.cpp main.cpp

-

-# List ASM source files here

-ASMSRC = ../../ports/ARM7/crt0.s ../../ports/ARM7/chcoreasm.s \

-         ../../ports/ARM7-LPC214x/vectors.s

-

-# List all user directories here

-UINCDIR = ../../src/include ../../src/lib ../../test \

-          ../../ports/ARM7 ../../ports/ARM7-LPC214x

-

-# List the user directory to look for the libraries here

-ULIBDIR =

-

-# List all user libraries here

-ULIBS =

-

-# ARM-specific options here

-AOPT =

-

-# THUMB-specific options here

-TOPT = -mthumb -D THUMB

-

-# Common options here

-# NOTE: -ffixed-r7 is only needed if you enabled CH_CURRP_REGISTER_CACHE in

-#       chconf.h.

-# NOTE: -falign-functions=16 may improve the performance, not always, but

-#       increases the code size.

-OPT = -O2 -ggdb -fomit-frame-pointer -mabi=apcs-gnu

-#OPT += -ffixed-r7

-OPT += -falign-functions=16

-

-# C++ specific options here

-# NOTE: -fno-rtti saves a LOT of code space, remove it only if you really need

-#       RTTI.

-CPPOPT = -fno-rtti

-

-# Define warning options here

-WARN = -Wall

-

-#

-# End of user defines

-##############################################################################################

-

-ifeq ($(LINK_GC),yes)

-  OPT += -ffunction-sections -fdata-sections

-endif

-

-INCDIR   = $(patsubst %,-I%,$(DINCDIR) $(UINCDIR))

-LIBDIR   = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR))

-DEFS     = $(DDEFS) $(UDEFS)

-ADEFS    = $(DADEFS) $(UADEFS)

-ASRC	 = $(ACSRC)$(ACPPSRC)

-TSRC	 = $(TCSRC)$(TCPPSRC)

-SRC	 = $(ASRC)$(TSRC)

-ACOBJS   = $(ACSRC:.c=.o)

-ACPPOBJS = $(ACPPSRC:.cpp=.o)

-TCOBJS   = $(TCSRC:.c=.o)

-TCPPOBJS = $(TCPPSRC:.cpp=.o)

-ASMOBJS  = $(ASMSRC:.s=.o)

-OBJS	 = $(ASMOBJS) $(ACOBJS) $(TCOBJS) $(ACPPOBJS) $(TCPPOBJS)

-LIBS     = $(DLIBS) $(ULIBS)

-MCFLAGS  = -mcpu=$(MCU)

-

-ODFLAGS  = -x --syms

-ASFLAGS  = $(MCFLAGS) -Wa,-amhls=$(<:.s=.lst) $(ADEFS)

-CFLAGS   = $(MCFLAGS) $(OPT) $(WARN) -Wa,-alms=$(<:.c=.lst) $(DEFS)

-CPPFLAGS = $(MCFLAGS) $(OPT) $(CPPOPT) $(WARN) -Wa,-alms=$(<:.cpp=.lst) $(DEFS)

-ifeq ($(LINK_GC),yes)

-  LDFLAGS = $(MCFLAGS) -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(PROJECT).map,--cref,--no-warn-mismatch,--gc-sections $(LIBDIR)

-else

-  LDFLAGS = $(MCFLAGS) -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(PROJECT).map,--cref,--no-warn-mismatch $(LIBDIR)

-endif

-

-# Thumb interwork enabled only if needed because it kills performance.

-ifneq ($(TSRC),)

-  CFLAGS += -D THUMB_PRESENT

-  CPPFLAGS += -D THUMB_PRESENT

-  ASFLAGS += -D THUMB_PRESENT

-  ifneq ($(ASRC),)

-    # Mixed ARM and THUMB case.

-    CFLAGS += -mthumb-interwork

-    CPPFLAGS += -mthumb-interwork

-    LDFLAGS += -mthumb-interwork

-  else

-    # Pure THUMB case, THUMB C code cannot be called by ARM asm code directly.

-    CFLAGS += -mno-thumb-interwork -D THUMB_NO_INTERWORKING

-    CPPFLAGS += -mno-thumb-interwork -D THUMB_NO_INTERWORKING

-    LDFLAGS += -mno-thumb-interwork -mthumb

-    ASFLAGS += -D THUMB_NO_INTERWORKING

-  endif

-else

-  CPFLAGS += -mno-thumb-interwork

-  CPPFLAGS += -mno-thumb-interwork

-  LDFLAGS += -mno-thumb-interwork

-endif

-

-# Generate dependency information

-CFLAGS += -MD -MP -MF .dep/$(@F).d

-CPPFLAGS += -MD -MP -MF .dep/$(@F).d

-

-#

-# Makefile rules

-#

-

-all: $(OBJS) $(PROJECT).elf $(PROJECT).hex $(PROJECT).bin $(PROJECT).dmp

-

-$(ACPPOBJS) : %.o : %.cpp

-	@echo

-	$(CPPC) -c $(CPPFLAGS) $(AOPT) -I . $(INCDIR) $< -o $@

-

-$(TCPPOBJS) : %.o : %.cpp

-	@echo

-	$(CPPC) -c $(CPPFLAGS) $(TOPT) -I . $(INCDIR) $< -o $@

-

-$(ACOBJS) : %.o : %.c

-	@echo

-	$(CC) -c $(CFLAGS) $(AOPT) -I . $(INCDIR) $< -o $@

-

-$(TCOBJS) : %.o : %.c

-	@echo

-	$(CC) -c $(CFLAGS) $(TOPT) -I . $(INCDIR) $< -o $@

-

-$(ASMOBJS) : %.o : %.s

-	@echo

-	$(AS) -c $(ASFLAGS) -I . $(INCDIR) $< -o $@

-

-%elf: $(OBJS)

-	@echo

-	$(LD) $(ASMOBJS) $(ACOBJS) $(TCOBJS) $(ACPPOBJS) $(TCPPOBJS) $(LDFLAGS) $(LIBS) -o $@

-

-%hex: %elf

-	$(HEX) $< $@

-

-%bin: %elf

-	$(BIN) $< $@

-

-%dmp: %elf

-	$(OD) $(ODFLAGS) $< > $@

-

-clean:

-	-rm -f $(OBJS)

-	-rm -f $(PROJECT).elf

-	-rm -f $(PROJECT).dmp

-	-rm -f $(PROJECT).map

-	-rm -f $(PROJECT).hex

-	-rm -f $(PROJECT).bin

-	-rm -f $(ACSRC:.c=.c.bak)

-	-rm -f $(ACSRC:.c=.lst)

-	-rm -f $(TCSRC:.c=.c.bak)

-	-rm -f $(TCSRC:.c=.lst)

-	-rm -f $(ACPPSRC:.cpp=.c.bak)

-	-rm -f $(ACPPSRC:.cpp=.lst)

-	-rm -f $(TCPPSRC:.cpp=.c.bak)

-	-rm -f $(TCPPSRC:.cpp=.lst)

-	-rm -f $(ASMSRC:.s=.s.bak)

-	-rm -f $(ASMSRC:.s=.lst)

-	-rm -fR .dep

-

-#

-# Include the dependency files, should be the last of the makefile

-#

--include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)

-

-# *** EOF ***

diff --git a/demos/ARM7-LPC214x-GCC/Makefile b/demos/ARM7-LPC214x-GCC/Makefile
index ff75442f2..fc417a0cd 100644
--- a/demos/ARM7-LPC214x-GCC/Makefile
+++ b/demos/ARM7-LPC214x-GCC/Makefile
@@ -8,6 +8,11 @@ ifeq ($(USE_OPT),)
   USE_OPT = -O2 -ggdb -fomit-frame-pointer -mabi=apcs-gnu -falign-functions=16

 endif

 

+# C++ specific options here (added to USE_OPT).

+ifeq ($(USE_CPPOPT),)

+  USE_CPPOPT = -fno-rtti

+endif

+

 # Enable this if you want the linker to remove unused code and data

 ifeq ($(USE_LINK_GC),)

   USE_LINK_GC = yes

@@ -41,26 +46,40 @@ LDSCRIPT= ch.ld
 include ../../src/kernel.mk

 include ../../test/test.mk

 

-# Sources that can be compiled in ARM or THUMB mode depending on the global

+# C sources that can be compiled in ARM or THUMB mode depending on the global

+# setting.

+CSRC = ../../ports/ARM7/chcore.c \

+       ../../ports/ARM7-LPC214x/vic.c  \

+       ../../ports/ARM7-LPC214x/lpc214x_serial.c  \

+       ../../ports/ARM7-LPC214x/lpc214x_ssp.c  \

+       ${KERNSRC} \

+       ${TESTSRC} \

+       ../../src/lib/evtimer.c \

+       board.c buzzer.c mmcsd.c main.c

+

+# C++ sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

-SRC = ../../ports/ARM7/chcore.c \

-      ../../ports/ARM7-LPC214x/vic.c  \

-      ../../ports/ARM7-LPC214x/lpc214x_serial.c  \

-      ../../ports/ARM7-LPC214x/lpc214x_ssp.c  \

-      ${KERNSRC} \

-      ${TESTSRC} \

-      ../../src/lib/evtimer.c \

-      board.c buzzer.c mmcsd.c main.c

-

-# Sources to be compiled in ARM mode regardless of the global setting.

+CPPSRC =

+

+# C sources to be compiled in ARM mode regardless of the global setting.

 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

 #       option that results in lower performance and larger code size.

-ASRC =

+ACSRC =

 

-# Sources to be compiled in THUMB mode regardless of the global setting.

+# C++ sources to be compiled in ARM mode regardless of the global setting.

 # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

 #       option that results in lower performance and larger code size.

-TSRC =

+ACPPSRC =

+

+# C sources to be compiled in THUMB mode regardless of the global setting.

+# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

+#       option that results in lower performance and larger code size.

+TCSRC =

+

+# C sources to be compiled in THUMB mode regardless of the global setting.

+# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler

+#       option that results in lower performance and larger code size.

+TCPPSRC =

 

 # List ASM source files here

 ASMSRC = ../../ports/ARM7/crt0.s \

@@ -84,6 +103,12 @@ MCU  = arm7tdmi
 

 TRGT = arm-elf-

 CC   = $(TRGT)gcc

+CPPC = $(TRGT)g++

+# Enable loading with g++ only if you need C++ runtime support.

+# NOTE: You can use C++ even without C++ support if you are careful. C++

+#       runtime support makes code size explode.

+LD   = $(TRGT)gcc

+#LD   = $(TRGT)g++

 CP   = $(TRGT)objcopy

 AS   = $(TRGT)gcc -x assembler-with-cpp

 OD   = $(TRGT)objdump

@@ -96,8 +121,11 @@ AOPT =
 # THUMB-specific options here

 TOPT = -mthumb -DTHUMB

 

-# Define warning options here

-WARN = -Wall -Wstrict-prototypes

+# Define C warning options here

+CWARN = -Wall -Wstrict-prototypes

+

+# Define C++ warning options here

+CPPWARN = -Wall

 

 #

 # Compiler settings

diff --git a/ports/ARM7/rules.mk b/ports/ARM7/rules.mk
index 884fc50e9..5748b3e21 100644
--- a/ports/ARM7/rules.mk
+++ b/ports/ARM7/rules.mk
@@ -1,35 +1,50 @@
-# ARM7 common makefile rules.

+# ARM7 common makefile scripts and rules.

 

+# Automatic compiler options

 OPT = $(USE_OPT)

-

+CPPOPT = $(USE_CPPOPT)

 ifeq ($(USE_CURRP_CACHING),yes)

   OPT += -ffixed-r7 -DCH_CURRP_REGISTER_CACHE='"r7"'

 endif

-

 ifeq ($(USE_LINK_GC),yes)

   OPT += -ffunction-sections -fdata-sections

 endif

 

+# Source files groups

 ifeq ($(USE_THUMB),yes)

-  TSRC += $(SRC)

+  TCSRC += $(CSRC)

+  TCPPSRC += $(CPPSRC)

 else

-  ASRC += $(SRC)

+  ACSRC += $(CSRC)

+  ACPPSRC += $(CPPSRC)

 endif

-

+ASRC	 = $(ACSRC)$(ACPPSRC)

+TSRC	 = $(TCSRC)$(TCPPSRC)

+SRC	     = $(ASRC)$(TSRC)

+

+# Object files groups

+ACOBJS   = $(ACSRC:.c=.o)

+ACPPOBJS = $(ACPPSRC:.cpp=.o)

+TCOBJS   = $(TCSRC:.c=.o)

+TCPPOBJS = $(TCPPSRC:.cpp=.o)

+ASMOBJS  = $(ASMSRC:.s=.o)

+OBJS	 = $(ASMOBJS) $(ACOBJS) $(TCOBJS) $(ACPPOBJS) $(TCPPOBJS)

+

+# Paths

 IINCDIR = $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR))

 LLIBDIR = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR))

+

+# Macros

 DEFS    = $(DDEFS) $(UDEFS)

 ADEFS   = $(DADEFS) $(UADEFS)

-AOBJS   = $(ASRC:.c=.o)

-TOBJS   = $(TSRC:.c=.o)

-OBJS	= $(ASMOBJS) $(AOBJS) $(TOBJS)

-ASMOBJS = $(ASMSRC:.s=.o)

 LIBS    = $(DLIBS) $(ULIBS)

-MCFLAGS = -mcpu=$(MCU)

 

+# Various settings

+MCFLAGS = -mcpu=$(MCU)

 ODFLAGS	= -x --syms

 ASFLAGS = $(MCFLAGS) -Wa,-amhls=$(<:.s=.lst) $(ADEFS)

-CPFLAGS = $(MCFLAGS) $(OPT) $(WARN) -Wa,-alms=$(<:.c=.lst) $(DEFS)

+CFLAGS   = $(MCFLAGS) $(OPT) $(CWARN) -Wa,-alms=$(<:.c=.lst) $(DEFS)

+CPPFLAGS = $(MCFLAGS) $(OPT) $(CPPOPT) $(CPPWARN) -Wa,-alms=$(<:.cpp=.lst) $(DEFS)

 ifeq ($(LINK_GC),yes)

   LDFLAGS = $(MCFLAGS) -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(PROJECT).map,--cref,--no-warn-mismatch,--gc-sections $(LLIBDIR)

 else

@@ -38,25 +53,30 @@ endif
 

 # Thumb interwork enabled only if needed because it kills performance.

 ifneq ($(TSRC),)

-  CPFLAGS += -DTHUMB_PRESENT

+  CFLAGS += -DTHUMB_PRESENT

+  CPPFLAGS += -DTHUMB_PRESENT

   ASFLAGS += -DTHUMB_PRESENT

   ifneq ($(ASRC),)

     # Mixed ARM and THUMB case.

-    CPFLAGS += -mthumb-interwork

+    CFLAGS += -mthumb-interwork

+    CPPFLAGS += -mthumb-interwork

     LDFLAGS += -mthumb-interwork

   else

     # Pure THUMB case, THUMB C code cannot be called by ARM asm code directly.

-    CPFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING

+    CFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING

+    CPPFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING

     LDFLAGS += -mno-thumb-interwork -mthumb

     ASFLAGS += -DTHUMB_NO_INTERWORKING

   endif

 else

   CPFLAGS += -mno-thumb-interwork

+  CPPFLAGS += -mno-thumb-interwork

   LDFLAGS += -mno-thumb-interwork

 endif

 

 # Generate dependency information

-CPFLAGS += -MD -MP -MF .dep/$(@F).d

+CFLAGS += -MD -MP -MF .dep/$(@F).d

+CPPFLAGS += -MD -MP -MF .dep/$(@F).d

 

 #

 # Makefile rules

@@ -64,13 +84,21 @@ CPFLAGS += -MD -MP -MF .dep/$(@F).d
 

 all: $(OBJS) $(PROJECT).elf $(PROJECT).hex $(PROJECT).bin $(PROJECT).dmp

 

-$(AOBJS) : %.o : %.c

+$(ACPPOBJS) : %.o : %.cpp

+	@echo

+	$(CPPC) -c $(CPPFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@

+

+$(TCPPOBJS) : %.o : %.cpp

+	@echo

+	$(CPPC) -c $(CPPFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@

+

+$(ACOBJS) : %.o : %.c

 	@echo

-	$(CC) -c $(CPFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@

+	$(CC) -c $(CFLAGS) $(AOPT) -I . $(IINCDIR) $< -o $@

 

-$(TOBJS) : %.o : %.c

+$(TCOBJS) : %.o : %.c

 	@echo

-	$(CC) -c $(CPFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@

+	$(CC) -c $(CFLAGS) $(TOPT) -I . $(IINCDIR) $< -o $@

 

 $(ASMOBJS) : %.o : %.s

 	@echo

@@ -78,7 +106,7 @@ $(ASMOBJS) : %.o : %.s
 

 %elf: $(OBJS)

 	@echo

-	$(CC) $(ASMOBJS) $(AOBJS) $(TOBJS) $(LDFLAGS) $(LIBS) -o $@

+	$(LD) $(ASMOBJS) $(ACOBJS) $(TCOBJS) $(ACPPOBJS) $(TCPPOBJS) $(LDFLAGS) $(LIBS) -o $@

 

 %hex: %elf

 	$(HEX) $< $@

@@ -96,10 +124,14 @@ clean:
 	-rm -f $(PROJECT).map

 	-rm -f $(PROJECT).hex

 	-rm -f $(PROJECT).bin

-	-rm -f $(ASRC:.c=.c.bak)

-	-rm -f $(ASRC:.c=.lst)

-	-rm -f $(TSRC:.c=.c.bak)

-	-rm -f $(TSRC:.c=.lst)

+	-rm -f $(ACSRC:.c=.c.bak)

+	-rm -f $(ACSRC:.c=.lst)

+	-rm -f $(TCSRC:.c=.c.bak)

+	-rm -f $(TCSRC:.c=.lst)

+	-rm -f $(ACPPSRC:.cpp=.c.bak)

+	-rm -f $(ACPPSRC:.cpp=.lst)

+	-rm -f $(TCPPSRC:.cpp=.c.bak)

+	-rm -f $(TCPPSRC:.cpp=.lst)

 	-rm -f $(ASMSRC:.s=.s.bak)

 	-rm -f $(ASMSRC:.s=.lst)

 	-rm -fR .dep