From a23b0be5a592fcba4e477cf73851798a5d39d1a9 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Wed, 5 Feb 1997 22:07:57 +0000
Subject: [PATCH] Added c++ support for Vx builds.

---
 config/CONFIG.Vx.68k | 56 ++++++++++++++++++++++++++++++++++++++++----
 config/CONFIG_SITE   |  5 ++++
 2 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/config/CONFIG.Vx.68k b/config/CONFIG.Vx.68k
index 6ece9ff43..5afe3fcb0 100644
--- a/config/CONFIG.Vx.68k
+++ b/config/CONFIG.Vx.68k
@@ -19,6 +19,51 @@ RM=rm -f
 MKDIR = mkdir
 RMDIR=rm -rf
 
+#----------------------------
+# Only G++ currently supported
+CPLUSPLUS = G++
+CXXCMPLR = NORMAL
+VX_OPT = YES
+BOARD = $(subst mv,MV,$(T_A))
+CPU = 68000
+OS = VXWORKS
+#----------------------------
+
+CCC = $(VX_GNU_BIN)/cc68k -B$(VX_GNU_LIB)/gcc-lib/ -nostdinc
+AR_CCC = $(VX_GNU_BIN)/ar68k
+CPP_CCC = $(VX_GNU_BIN)/cpp68k -nostdinc
+RANLIB_CCC = $(VX_GNU_BIN)/ranlib68k
+LD_CCC = $(VX_GNU_BIN)/ld68k
+CCC_CCFLAGS =
+CCC_ARCH_DEP_CCFLAGS =
+CCC_ARCH_DEP_LDFLAGS =
+
+G++ = $(GNU_BIN)/sun3-g++ -B$(GNU_LIB)/gcc-lib/ -nostdinc
+AR_G++ = $(GNU_BIN)/sun3-ar
+CPP_G++ = $(GNU_BIN)/sun3-cpp
+RANLIB_G++ = $(GNU_BIN)/sun3-ranlib
+LD_G++ = $(GNU_BIN)/sun3-ld
+G++_ARCH_DEP_CCFLAGS = --no-builtin -Wa,"-m68040" -DOS_EQ_$(OS) \
+	-DBOARD_EQ_$(BOARD) -DCPU_EQ_$(CPU) -DBOARD=$(BOARD)
+G++_ARCH_DEP_LDFLAGS = -Ur -N
+
+CCC_NORMAL = $(CCC)
+CCC_STRICT = $(CCC) -ansi -pedantic -Wtraditional \
+      -Wmissing-prototypes -Woverloaded-virtual \
+      -Wwrite-strings -Wconversion -Wstrict-prototypes\
+      -Wpointer-arith -Winline
+G++_NORMAL = $(G++) 
+G++_STRICT = $(G++) -ansi -pedantic -Wtraditional
+
+CXX = $($(CPLUSPLUS)_$(CXXCMPLR))
+AR_CXX = $(AR_$(CPLUSPLUS))
+CPP_CXX = $(CPP_$(CPLUSPLUS))
+RANLIB_CXX = $(RANLIB_$(CPLUSPLUS))
+LD_CXX = $(LD_$(CPLUSPLUS))
+
+ARCH_DEP_CCFLAGS += $($(CPLUSPLUS)_ARCH_DEP_CCFLAGS)
+CXX_ARCH_DEP_LDFLAGS =  $($(CPLUSPLUS)_ARCH_DEP_LDFLAGS)
+
 # special c library requirements
 SPECIAL_LANG =
 
@@ -35,7 +80,7 @@ VX_INCLUDES = -I. -I.. $(USR_INCLUDES) -I$(INSTALL_INCLUDE) -I$(EPICS_BASE_INCLU
 #    Warnings
 #At some time we should turn on pedantic
 #VX_WARN_YES = -Wall -pedantic
-VX_WARN_YES = -W
+VX_WARN_YES = -Wall
 VX_WARN_NO =
 VX_WARN_FLAGS = $(VX_WARN_$(VX_WARN))
  
@@ -47,22 +92,23 @@ VX_CFLAGS = $(VX_OPT_FLAGS) $(VX_WARN_FLAGS) \
         $(VX_INCLUDES) $(VX_OP_SYS_FLAGS)
  
 #VX_LDFLAGS = -T$(EPICS_BASE)/src/libvxWorks/vxldscript.MRI -o
-VX_LDFLAGS = -o
- 
+VX_LDFLAGS =  -o
+  
 TARGET_CFLAGS = $($(basename $@)_CFLAGS)
 TARGET_LDFLAGS = $($(basename $@)_LDFLAGS)
 TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS)
 TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS)
 
 CFLAGS = $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(VX_CFLAGS)
-CXXFLAGS = $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(VX_CFLAGS)
+CXXFLAGS = $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)  $(ARCH_DEP_CCFLAGS) $(VX_CFLAGS)
 LDFLAGS = $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(VX_LDFLAGS)
+CXXLDFLAGS = $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(CXX_ARCH_DEP_LDFLAGS) $(VX_LDFLAGS)
 CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
 # Build compile line here
 COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
 LINK.c = $(LD) $(LDFLAGS)
 COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
-LINK.cc = $(LD) $(LDFLAGS) 
+LINK.cc = $(LD_CXX) $(CXXLDFLAGS)
 
 CPPSNCFLAGS = $(VX_INCLUDES)
 
diff --git a/config/CONFIG_SITE b/config/CONFIG_SITE
index 63da77a44..05693406a 100644
--- a/config/CONFIG_SITE
+++ b/config/CONFIG_SITE
@@ -52,9 +52,14 @@ CROSS_COMPILER_TARGET_ARCHS=mv167 mv162
 #VX_DIR=/usr/local/vw/vxV52/vw
 VX_DIR=/usr/local/vw/vxV52p1/vw
 
+#  Gnu directory for gcc
 #VX_GNU = $(VX_DIR)
 VX_GNU = $(VX_DIR)/../vxgccV2.2.3.1
 
+#  Gnu directory for g++
+GNU_DIR = /usr/local/hideos/gnu_install-2.7.2
+GNU_BIN = $(GNU_DIR)/bin
+GNU_LIB = $(GNU_DIR)/lib
 
 #  Client ANSI Compiler
 #   GCC     (gcc -ansi)