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

1 files changed, 48 insertions, 21 deletions

diff --git a/demos/ARM7-AT91SAM7X-WEB-GCC/Makefile b/demos/ARM7-AT91SAM7X-WEB-GCC/Makefile
index 20d44a9d5..c9a08306a 100644
--- a/demos/ARM7-AT91SAM7X-WEB-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-WEB-GCC/Makefile
@@ -5,7 +5,12 @@
 

 # Compiler options here.

 ifeq ($(USE_OPT),)

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

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

+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

@@ -50,29 +55,42 @@ USRC = ../../ext/uip-1.0/uip/uip_arp.c \
        ../../ext/uip-1.0/apps/webserver/httpd-fs.c \

        ../../ext/uip-1.0/apps/webserver/httpd-cgi.c

 

-# 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-AT91SAM7X/sam7x_serial.c \

+       ../../ports/ARM7-AT91SAM7X/sam7x_emac.c \

+       ${KERNSRC} \

+       ${TESTSRC} \

+       ${USRC} \

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

+       at91lib/aic.c \

+       web/webthread.c \

+       board.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-AT91SAM7X/sam7x_serial.c \

-      ../../ports/ARM7-AT91SAM7X/sam7x_emac.c \

-      ${KERNSRC} \

-      ${TESTSRC} \

-      ${USRC} \

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

-      at91lib/aic.c \

-      web/webthread.c \

-      board.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 \

@@ -97,6 +115,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

@@ -109,8 +133,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

@@ -162,4 +189,4 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-include ../../ports/ARM7/rules.mk

+include ../../ports/ARM/rules.mk