diff --git a/config/CONFIG.Linux b/config/CONFIG.Linux
index de31825f1..c52698cb0 100644
--- a/config/CONFIG.Linux
+++ b/config/CONFIG.Linux
@@ -93,27 +93,24 @@ UNIX_LDFLAGS = -L$(EPICS_BASE_LIB)
 UNIX_LDLIBS = -lm 
  
 ARCH_DEP_CFLAGS = -D_X86_ -Dlinux
-ARCH_DEP_CCFLAGS = $(ARCH_DEP_CFLAGS)
+ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS)
 
 UNIX_CFLAGS = $(UNIX_SFLAGS) $(USR_INCLUDES) $(UNIX_INCLUDES) $(OP_SYS_FLAGS)
  
-UNIX_CCFLAGS = $(UNIX_CFLAGS)
+UNIX_CXXFLAGS = $(UNIX_CFLAGS)
  
 # Target specific flags
 TARGET_CFLAGS = $($(basename $@)_CFLAGS)
-TARGET_CCFLAGS = $($(basename $@)_CCFLAGS)
+TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS)
 TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS)
 TARGET_LDFLAGS = $($(basename $@)_LDFLAGS)
 TARGET_LDLIBS = $($(basename $@)_LDLIBS)
 TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS)
 
 CFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(UNIX_CFLAGS)
-CCFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CCFLAGS) $(USR_CCFLAGS) $(ARCH_DEP_CCFLAGS) $(UNIX_CCFLAGS)
+CXXFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(UNIX_CXXFLAGS)
 CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
 
-# GNU make likes CXX instead of CCC
-CXXFLAGS = $(CCFLAGS)
-
 LDFLAGS = $(SPECIAL_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(UNIX_LDFLAGS)
 LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS) $(UNIX_LDLIBS)
  
@@ -121,7 +118,7 @@ LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS) $(UNIX_LDLIBS)
 COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
 COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
 LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
-LINK.cc = $(CXX) $(CCFLAGS) $(CPPFLAGS) $(LDFLAGS)
+LINK.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
 
 DEPENDS_RULE.c = -$(COMPILE.c) -M $(SRCS.c) > .DEPENDS
 DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.Unix.Linux
diff --git a/config/CONFIG.alpha b/config/CONFIG.alpha
index 31b9f1062..fcfb67ff7 100644
--- a/config/CONFIG.alpha
+++ b/config/CONFIG.alpha
@@ -88,23 +88,22 @@ UNIX_LDFLAGS = -L$(EPICS_BASE_LIB)
 UNIX_LDLIBS = -lm
  
 ARCH_DEP_CFLAGS = -D_OSF_SOURCE -DLITTLE_ENDIAN
-ARCH_DEP_CCFLAGS = $(ARCH_DEP_CFLAGS)
+ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS)
 UNIX_CFLAGS = $(UNIX_SFLAGS) $(USR_INCLUDES) $(UNIX_INCLUDES) $(OP_SYS_FLAGS)
  
-UNIX_CCFLAGS = $(UNIX_CFLAGS)
+UNIX_CXXFLAGS = $(UNIX_CFLAGS)
  
 # Target specific flags
 TARGET_CFLAGS = $($(basename $@)_CFLAGS)
-TARGET_CCFLAGS = $($(basename $@)_CCFLAGS)
+TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS)
 TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS)
 TARGET_LDFLAGS = $($(basename $@)_LDFLAGS)
 TARGET_LDLIBS = $($(basename $@)_LDLIBS)
 TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS)
 
 CFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(UNIX_CFLAGS)
-CCFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CCFLAGS) $(USR_CCFLAGS) $(ARCH_DEP_CCFLAGS) $(UNIX_CCFLAGS)
+CXXFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(UNIX_CXXFLAGS)
 CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
-CXXFLAGS = $(CCFLAGS)
 
 LDFLAGS = $(SPECIAL_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(UNIX_LDFLAGS)
 LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS) $(UNIX_LDLIBS)
@@ -113,7 +112,7 @@ LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS) $(UNIX_LDLIBS)
 COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
 COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
 LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
-LINK.cc = $(CXX) $(CCFLAGS) $(CPPFLAGS) $(LDFLAGS)
+LINK.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
 
 DEPEND_RULE.c = @echo echo no DEPENDS_RULE.c defined in CONFIG.Unix.alpha
 DEPEND_RULE.cc = @echo echo no DEPENDS_RULE.cc defined in CONFIG.Unix.alpha
diff --git a/config/CONFIG.hp700 b/config/CONFIG.hp700
index db2f27915..37b24c2b1 100644
--- a/config/CONFIG.hp700
+++ b/config/CONFIG.hp700
@@ -96,23 +96,22 @@ UNIX_LDFLAGS = -L$(EPICS_BASE_LIB)
 UNIX_LDLIBS = -lm
  
 ARCH_DEP_CFLAGS = -D_HPUX_SOURCE -DHP_UX
-ARCH_DEP_CCFLAGS = $(ARCH_DEP_CFLAGS)
+ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS)
 
 UNIX_CFLAGS = $(UNIX_SFLAGS) $(USR_INCLUDES) $(UNIX_INCLUDES) $(OP_SYS_FLAGS)
-UNIX_CCFLAGS = $(UNIX_CFLAGS)
+UNIX_CXXFLAGS = $(UNIX_CFLAGS)
  
 # Target specific flags
 TARGET_CFLAGS = $($(basename $@)_CFLAGS)
-TARGET_CCFLAGS = $($(basename $@)_CCFLAGS)
+TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS)
 TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS)
 TARGET_LDFLAGS = $($(basename $@)_LDFLAGS)
 TARGET_LDLIBS = $($(basename $@)_LDLIBS)
 TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS)
 
 CFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(UNIX_CFLAGS)
-CCFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CCFLAGS) $(USR_CCFLAGS) $(ARCH_DEP_CCFLAGS) $(UNIX_CCFLAGS)
+CXXFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(UNIX_CXXFLAGS)
 CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
-CXXFLAGS = $(CCFLAGS)
 
 ARFLAGS = rv
 
@@ -123,7 +122,7 @@ LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS) $(UNIX_LDLIBS)
 COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
 COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
 LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
-LINK.cc = $(CXX) $(CCFLAGS) $(CPPFLAGS) $(LDFLAGS)
+LINK.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
 DEPEND_RULE.c = @echo echo no DEPENDS_RULE.c defined in CONFIG.Unix.hp700
 DEPEND_RULE.cc = @echo echo no DEPENDS_RULE.cc defined in CONFIG.Unix.hp700
 
diff --git a/config/CONFIG.sgi b/config/CONFIG.sgi
index ea183cd06..596b86877 100644
--- a/config/CONFIG.sgi
+++ b/config/CONFIG.sgi
@@ -93,26 +93,23 @@ UNIX_LDFLAGS = -L$(EPICS_BASE_LIB)
 UNIX_LDLIBS = -lm
  
 ARCH_DEP_CFLAGS = -DSGI
-ARCH_DEP_CCFLAGS = $(ARCH_DEP_CFLAGS)
+ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS)
 UNIX_CFLAGS = $(UNIX_SFLAGS) $(USR_INCLUDES) $(UNIX_INCLUDES) $(OP_SYS_FLAGS)
  
-UNIX_CCFLAGS = $(UNIX_CFLAGS)
+UNIX_CXXFLAGS = $(UNIX_CFLAGS)
  
 # Target specific flags
 TARGET_CFLAGS = $($(basename $@)_CFLAGS)
-TARGET_CCFLAGS = $($(basename $@)_CCFLAGS)
+TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS)
 TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS)
 TARGET_LDFLAGS = $($(basename $@)_LDFLAGS)
 TARGET_LDLIBS = $($(basename $@)_LDLIBS)
 TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS)
 
 CFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(UNIX_CFLAGS)
-CCFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CCFLAGS) $(USR_CCFLAGS) $(ARCH_DEP_CCFLAGS) $(UNIX_CCFLAGS)
+CXXFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(UNIX_CXXFLAGS)
 CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
 
-# GNU make likes CXX instead of CCC
-CXXFLAGS = $(CCFLAGS)
-
 LDFLAGS = $(SPECIAL_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(UNIX_LDFLAGS)
 LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS) $(UNIX_LDLIBS)
  
@@ -120,7 +117,7 @@ LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS) $(UNIX_LDLIBS)
 COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
 COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
 LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
-LINK.cc = $(CXX) $(CCFLAGS) $(CPPFLAGS) $(LDFLAGS)
+LINK.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
 LOAD.c = ld -shared $(LDFLAGS)
 
 DEPENDS_RULE.c = -$(COMPILE.c) -M $(SRCS.c) > .DEPENDS
diff --git a/config/CONFIG.solaris b/config/CONFIG.solaris
index 91f4b1b75..7d1c3bebc 100644
--- a/config/CONFIG.solaris
+++ b/config/CONFIG.solaris
@@ -4,13 +4,15 @@
 #  This file is maintained by the EPICS community.
 
 # BUILD_TYPE
-#   Currently either Vx or Unix
-BUILD_TYPE = Unix
+#   Currently either Vx or Host
+BUILD_TYPE = Host
+
+ARCH_CLASS = solaris
  
 # Compiler and utility invocation (supply path to compiler here)
 #   (with warning flags built in)
 #  Paths to compilers
-GCC = /opt/gnu/bin/gcc
+GCC = /opt/gnu/bin/gcc 
 ACC = $(SPARCWORKS)/bin/cc
 # SUNCC doesn't exist under Solaris
 
@@ -28,9 +30,17 @@ YACC = $(EYACC)
 LEX = $(ELEX)
 G++ = /opt/gnu/bin/g++
 CCC = /opt/SUNWspro/bin/CC
-MV = mv
+
 RMDIR = rm -rf
 MKDIR = mkdir
+CP=cp
+MV=mv
+RM=rm -f
+MKDIR=mkdir
+RMDIR=rm -rf
+EXE=
+OBJ=.o
+
 
 ACC_ANSI_INVOKE_W_NO = $(ACC) -Xa -w
 ACC_ANSI_INVOKE_W_YES = $(ACC) -Xa
@@ -118,38 +128,36 @@ UNIX_LDLIBS = $(UNIX_SLIBS) -lm $(CCOMPILER_LDLIBS)
  
 # Architecture specific build flags
 ARCH_DEP_CFLAGS = -DSOLARIS 
-ARCH_DEP_CCFLAGS = $(ARCH_DEP_CFLAGS)
+ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS)
 ARCH_DEP_LDLIBS = -lsocket -lnsl
 # -lsocket     needed by libca.a
 # -lnsl        needed by libca.a 
  
 UNIX_CFLAGS = $(UNIX_SFLAGS) $(UNIX_INCLUDES) $(USR_INCLUDES) $(OP_SYS_FLAGS)
  
-UNIX_CCFLAGS = $(UNIX_CFLAGS)
+UNIX_CXXFLAGS = $(UNIX_CFLAGS)
  
 # Target specific flags
 TARGET_CFLAGS = $($(basename $@)_CFLAGS)
-TARGET_CCFLAGS = $($(basename $@)_CCFLAGS)
+TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS)
 TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS)
 TARGET_LDFLAGS = $($(basename $@)_LDFLAGS)
 TARGET_LDLIBS = $($(basename $@)_LDLIBS)
 TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS)
 
 CFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(UNIX_CFLAGS)
-CCFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CCFLAGS) $(USR_CCFLAGS) $(ARCH_DEP_CCFLAGS) $(UNIX_CCFLAGS)
+CXXFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(UNIX_CXXFLAGS)
 CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
 
-# GNU make likes CXX instead of CCC
-CXXFLAGS = $(CCFLAGS)
-
 LDFLAGS = $(SPECIAL_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(UNIX_LDFLAGS)
 LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS) $(UNIX_LDLIBS)
  
 # Override SUN defaults
 COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
 COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
-LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
-LINK.cc = $(CXX) $(CCFLAGS) $(CPPFLAGS) $(LDFLAGS)
+# Unlike the 'Unix' makesystem, output flags -o .. are now part of LINK.c[c]
+LINK.c = $(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+LINK.cc = $(CXX) -o $@ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
 
 DEPENDS_RULE.c = -$(COMPILE.c) -xM $(SRCS.c) > .DEPENDS
 DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.Unix.solaris
diff --git a/config/CONFIG.sun4 b/config/CONFIG.sun4
index fa8d87e59..49a1579f5 100644
--- a/config/CONFIG.sun4
+++ b/config/CONFIG.sun4
@@ -4,8 +4,11 @@
 #  This file is maintained by the EPICS community.
 
 # BUILD_TYPE
-#   Currently either Vx or Unix
-BUILD_TYPE = Unix
+#   Currently either Vx or Host
+
+BUILD_TYPE = Host
+
+ARCH_CLASS=sun4
  
 # Compiler and utility invocation (supply path to compiler here)
 #   (with warning flags built in)
@@ -19,9 +22,14 @@ YACC = $(EYACC)
 LEX = $(ELEX)
 G++ = g++
 CCC = /usr/lang/CC
-MV = mv
+
 RMDIR = rm -rf
 MKDIR = mkdir
+CP=cp
+MV=mv
+RM=rm -f
+EXE=
+OBJ=.o
 
 #
 # original before use of sun C++
@@ -119,34 +127,34 @@ UNIX_LDFLAGS = -L$(EPICS_BASE_LIB) $(CCOMPILER_LDFLAGS)
 UNIX_LDLIBS = -lm $(CCOMPILER_LDLIBS)
 
 ARCH_DEP_CFLAGS = -DSUNOS4
-ARCH_DEP_CCFLAGS = $(ARCH_DEP_CFLAGS)
+ARCH_DEP_CXXFLAGS = $(ARCH_DEP_CFLAGS)
 UNIX_CFLAGS = $(UNIX_SFLAGS) $(USR_INCLUDES) $(UNIX_INCLUDES) $(OP_SYS_FLAGS)
  
-UNIX_CCFLAGS = $(UNIX_CFLAGS)
+UNIX_CXXFLAGS = $(UNIX_CFLAGS)
  
 # Target specific flags
 TARGET_CFLAGS = $($(basename $@)_CFLAGS)
-TARGET_CCFLAGS = $($(basename $@)_CCFLAGS)
+TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS)
 TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS)
 TARGET_LDFLAGS = $($(basename $@)_LDFLAGS)
 TARGET_LDLIBS = $($(basename $@)_LDLIBS)
 TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS)
 
 CFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(UNIX_CFLAGS)
-CCFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CCFLAGS) $(USR_CCFLAGS) $(ARCH_DEP_CCFLAGS) $(UNIX_CCFLAGS)
+CXXFLAGS = $(UNIX_OPT_FLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(UNIX_CXXFLAGS)
 CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS)
 
-# GNU make likes CXX instead of CCC
-CXXFLAGS = $(CCFLAGS)
-
 LDFLAGS = $(SPECIAL_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(UNIX_LDFLAGS)
 LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS) $(UNIX_LDLIBS)
  
 # Override SUN defaults
 COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
 COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
-LINK.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
-LINK.cc = $(CXX) $(CCFLAGS) $(CPPFLAGS) $(LDFLAGS)
+
+# changed from 'Unix' makesystem:
+# link command now contains the output flag '-o $@'
+LINK.c = $(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+LINK.cc = $(CXX) -o $@ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
 
 DEPENDS_RULE.c = -$(COMPILE.c) -M $(SRCS.c) > .DEPENDS
 DEPENDS_RULE.cc = @echo no DEPENDS_RULE.cc defined in CONFIG.Unix.sun4