--- a/Makefile	Thu Mar 10 15:47:37 2011 -0500
+++ b/Makefile	Sun Mar 13 21:10:35 2011 -0400
@@ -1,11 +1,13 @@
 CROSS_COMPILE=s390x-linux-
 AS=$(CROSS_COMPILE)as
 CC=$(CROSS_COMPILE)gcc
+CXX=$(CROSS_COMPILE)g++
 LD=$(CROSS_COMPILE)ld
 OBJCOPY=$(CROSS_COMPILE)objcopy
 
 MAKEFLAGS += -rR --no-print-directory
 CFLAGS=-g -fno-strict-aliasing -fno-builtin -nostdinc -nostdlib -Wall -m64 -I include/ -O2
+CXXFLAGS=$(CFLAGS)
 LDFLAGS=-m elf64_s390
 
 BINS=sarpn
@@ -35,6 +37,9 @@
 %.o: %.c
 	$(CC) $(CFLAGS) -include include/system.h -c -o $@ $<
 
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -include include/system.h -c -o $@ $<
+
 #
 # IPL specific bits
 #