From 3640cab439a1872dd5e9691f3b4d92a9a0d52ad6 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sebastien@milkymist.org>
Date: Sun, 24 Mar 2013 16:11:53 +0100
Subject: [PATCH] software/common.mak: add C++ definitions

---
 software/common.mak | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/software/common.mak b/software/common.mak
index 47bb54eaf..2989b5154 100644
--- a/software/common.mak
+++ b/software/common.mak
@@ -1,6 +1,7 @@
 TARGET_PREFIX=lm32-elf-
 
 CC_normal := $(TARGET_PREFIX)gcc
+CX_normal := $(TARGET_PREFIX)g++
 AS_normal := $(TARGET_PREFIX)as
 AR_normal := $(TARGET_PREFIX)ar
 LD_normal := $(TARGET_PREFIX)ld
@@ -8,6 +9,7 @@ OBJCOPY_normal := $(TARGET_PREFIX)objcopy
 RANLIB_normal := $(TARGET_PREFIX)ranlib
 
 CC_quiet = @echo " CC " $@ && $(TARGET_PREFIX)gcc
+CX_quiet = @echo " CX " $@ && $(TARGET_PREFIX)g++
 AS_quiet = @echo " AS " $@ && $(TARGET_PREFIX)as
 AR_quiet = @echo " AR " $@ && $(TARGET_PREFIX)ar
 LD_quiet = @echo " LD " $@ && $(TARGET_PREFIX)ld
@@ -16,6 +18,7 @@ RANLIB_quiet = @echo " RANLIB  " $@ && $(TARGET_PREFIX)ranlib
 
 ifeq ($(V),1)
 	CC = $(CC_normal)
+	CX = $(CX_normal)
 	AS = $(AS_normal)
 	AR = $(AR_normal)
 	LD = $(LD_normal)
@@ -23,6 +26,7 @@ ifeq ($(V),1)
 	RANLIB = $(RANLIB_normal)
 else
 	CC = $(CC_quiet)
+	CX = $(CX_quiet)
 	AS = $(AS_quiet)
 	AR = $(AR_quiet)
 	LD = $(LD_quiet)
@@ -33,14 +37,25 @@ endif
 # Toolchain options
 #
 INCLUDES = -I$(M2DIR)/software/include/base -I$(M2DIR)/software/include -I$(M2DIR)/common
-CFLAGS = -O3 -mbarrel-shift-enabled -mmultiply-enabled -mdivide-enabled -msign-extend-enabled \
-	-Wall -Wstrict-prototypes -Wold-style-definition -Wshadow \
-	-Wmissing-prototypes -fno-builtin -nostdinc $(INCLUDES)
+COMMONFLAGS = -O3 -mbarrel-shift-enabled -mmultiply-enabled -mdivide-enabled -msign-extend-enabled \
+	-Wall -fno-builtin -nostdinc $(INCLUDES)
+CFLAGS = $(COMMONFLAGS) -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes
+CXXFLAGS = $(COMMONFLAGS) -fno-exceptions -ffreestanding
 LDFLAGS = -nostdlib -nodefaultlibs
 
 # compile and generate dependencies, based on
 # http://scottmcpeak.com/autodepend/autodepend.html
 
+define compilexx-dep
+$(CX) -c $(CXXFLAGS) $< -o $*.o
+@$(CX_normal) -MM $(CXXFLAGS) $< > $*.d
+@mv -f $*.d $*.d.tmp
+@sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d
+@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | \
+	sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
+@rm -f $*.d.tmp
+endef
+
 define compile-dep
 $(CC) -c $(CFLAGS) $< -o $*.o
 @$(CC_normal) -MM $(CFLAGS) $< > $*.d