diff --git a/configure/CONFIG.CrossCommon b/configure/CONFIG.CrossCommon
index 89bf15b28..a60a8abd5 100644
--- a/configure/CONFIG.CrossCommon
+++ b/configure/CONFIG.CrossCommon
@@ -1,10 +1,22 @@
 # Cross compiler default definitions
 
+# Build class: either HOST or CROSS
+# Used to determine OPT and WARN compiler flags
 BUILD_CLASS = CROSS
 
-ANSI = GCC
-CPLUSPLUS = G++
+# Cross build: either defined or not
+# Used in os/CONFIG.Common.<arch> files
+#   ifdef CROSS    looks better than  ifeq ($(BUILD_CLASS),CROSS)
+CROSS = YES
 
-CROSS_INCLUDES = $(addprefix -I,$(GNU_INCLUDE_DIR))
-CROSS_LDFLAGS = $(addprefix -L,$(GNU_LIB_DIR))
+GNU_TARGET_INCLUDE_DIR = $(GNU_DIR)/$(GNU_TARGET)/include
+GNU_TARGET_LIB_DIR = $(GNU_DIR)/$(GNU_TARGET)/lib
 
+CROSS_CPPFLAGS = -nostdinc
+CROSS_CFLAGS = -B$(GNU_LIB)/gcc-lib/
+CROSS_INCLUDES = $(addprefix -I,$(GNU_TARGET_INCLUDE_DIR))
+CROSS_LDFLAGS = $(addprefix -L,$(GNU_TARGET_LIB_DIR))
+
+
+# All cross builds use the gnu compiler
+include $(CONFIG)/CONFIG.gnuCommon
diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index 1f12b218e..e8d42fce8 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -5,7 +5,7 @@
 #
 #  This file is to be maintained by the community.
 #
-# Common Configuration Information 
+# Common Configuration Information
 
 #-------------------------------------------------------
 # Build architectures
@@ -14,13 +14,13 @@
 CROSS1 = $(CROSS_COMPILER_TARGET_ARCHS$(word 1,$(CROSS_COMPILER_HOST_ARCHS)))
 
 # CROSS2 will be defined only when CROSS_COMPILER_HOST_ARCHS is defined
-# and EPICS_HOST_ARCH is one of it's words  
+# and EPICS_HOST_ARCH is one of it's words
 CROSS2 = $(CROSS_COMPILER_TARGET_ARCHS$(filter-out 1,$(words $(filter $(EPICS_HOST_ARCH),$(CROSS_COMPILER_HOST_ARCHS)))))
 
 BUILD_ARCHS = $(EPICS_HOST_ARCH) $(CROSS1) $(CROSS2)
 
 #-------------------------------------------------------
-# Build class default, HOST or CROSS, CONFIG will override 
+# Cross compile default, HOST or CROSS, CONFIG.crossCommon will override
 BUILD_CLASS = HOST
 
 #-------------------------------------------------------
@@ -71,64 +71,20 @@ INSTALL_SHRLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_TCLLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_BIN                 = $(INSTALL_LOCATION_BIN)/$(T_A)
 
+#--------------------------------------------------
 # vpath directories
 GENERIC_SRC_DIRS = .. $(SRC_DIRS)
 OS_SRC_DIRS += . $(foreach dir, $(SRC_DIRS) .., \
             $(dir)/os/$(OS_CLASS) $(dir)/os/posix $(dir)/os/default )
 ALL_SRC_DIRS = $(OS_SRC_DIRS) $(GENERIC_SRC_DIRS)
 
+#--------------------------------------------------
 # compile line include directories
 INSTALL_INCLUDES += \
        -I$(INSTALL_INCLUDE)/os/$(OS_CLASS) \
-       -I$(INSTALL_INCLUDE) 
+       -I$(INSTALL_INCLUDE)
 GENERIC_SRC_INCLUDES = $(addprefix -I, $(GENERIC_SRC_DIRS))
 
-#--------------------------------------------------
-# GNU compiler defaults
-
-GNU_BIN = $(GNU_DIR)/bin
-GNU_LIB = $(GNU_DIR)/lib
-export GCC_EXEC_PREFIX = $(GNU_LIB)/gcc-lib/
-
-GCC_AR = $(GNU_BIN)/$(CMPLR_PREFIX)ar$(CMPLR_SUFFIX) -rc
-GCC_CPP = $(GCC) -x c -E
-GCC_RANLIB = $(GNU_BIN)/$(CMPLR_PREFIX)ranlib$(CMPLR_SUFFIX) 
-
-GCC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
-
-GCC_CONFORM_CFLAGS_ANSI = -ansi 
-GCC_CONFORM_CFLAGS_STRICT = -ansi -pedantic
-GCC_CONFORM_CFLAGS_TRAD = -traditional
-GCC_WARN_YES = -Wall
-GCC_WARN_NO = -w
-GCC_OPT_YES = -g -O3
-GCC_OPT_NO = -g
-GCC_STATIC_LDFLAGS_YES = -static
-GCC_STATIC_LDFLAGS_NO =
-GCC_BUILD_CFLAGS_CROSS = -B$(GNU_LIB)/gcc-lib/ -nostdinc
-GCC_BUILD_CPPFLAGS_CROSS = -nostdinc
-GCC_SHRLIB_LDFLAGS_YES =  -shared
-GCC_CODE_CPPFLAGS = -D_REENTRANT
-GCC_POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS
-
-G++ = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
-
-G++_CONFORM_CFLAGS_NORMAL = -ansi -pedantic
-G++_CONFORM_CFLAGS_STRICT = -ansi -pedantic
-#G++_WARN_YES = -Wall -Weffc++
-G++_WARN_YES = -Wall 
-G++_WARN_NO = -w
-G++_OPT_YES = -g -O3
-G++_OPT_NO = -g
-G++_STATIC_LDFLAGS_YES = -static
-G++_STATIC_LDFLAGS_NO =
-G++_SHRLIB_LDFLAGS_YES =  -shared
-G++_CODE_CPPFLAGS = -D_REENTRANT
-G++_POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS
-
-G++_TEMPL_INST_FLAG = -DEXPL_TEMPL
-G++_DEPENDS_FLAG = -MM
-
 #--------------------------------------------------
 # Target filename definitions
 OBJSNAME = $(addsuffix $(OBJ),$(OBJS))
@@ -147,7 +103,7 @@ LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(LIBSRCS)))
 LIBRARY_LD_OBJS = $(TARGET_OBJS) $(LIBRARY_OBJS)
 
 #--------------------------------------------------
-# resource(WIN32) files
+# WIN95/NT resource files
 
 TARGET_RESS = $(addsuffix $(RES),$(basename $($*_RCS)))
 
@@ -165,17 +121,6 @@ LIB_BAF=$(addsuffix $(BAF),$(basename $(LIBRARY)))
 #--------------------------------------------------
 # C preprocessor, compiler, and linker flag defaults
 
-# Build class (CROSS,HOST) flags
-BUILD_CLASS_CFLAGS = $($(ANSI)_BUILD_CFLAGS_$(BUILD_CLASS))
-BUILD_CLASS_CPPFLAGS = $($(ANSI)_BUILD_CPPFLAGS_$(BUILD_CLASS))
-
-# C++ template flag
-TEMPL_INST_CXXFLAG = $($(CPLUSPLUS)_TEMPL_INST_FLAG)
-
-# Code (position independant and  reentrant) flags
-CODE_CFLAGS = $($(ANSI)_CODE_CFLAGS)
-CODE_CXXFLAGS = $($(CPLUSPLUS)_CODE_CFLAGS)
-
 # Target architecture specific (solaris,sun4,mv167,...) flags
 ARCH_DEP_CPPFLAGS =
 ARCH_DEP_CFLAGS =
@@ -186,6 +131,7 @@ ARCH_DEP_LDLIBS =
 # Target operating system specific (Unix,Vx,WIN32...) flags
 OP_SYS_CPPFLAGS =
 OP_SYS_CFLAGS =
+OP_SYS_CXXFLAGS = $(OP_SYS_CFLAGS)
 OP_SYS_LDFLAGS =
 OP_SYS_INCLUDES =
 OP_SYS_LDLIBS =
@@ -213,87 +159,82 @@ TARGET_LDLIBS = $($(basename $@)_LDLIBS) $($(basename $@)_LDLIBS_$(OS_CLASS))
 TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS) $($(basename $@)_CPPFLAGS_$(OS_CLASS))
 TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS) $($(basename $@)_SNCFLAGS_$(OS_CLASS))
 
-# POSIX specific flags
-POSIX_CPPFLAGS = $($(ANSI)_POSIX_CPPFLAGS)
-
 # CMPLR level of ansi conformance flags
-CONFORM_CFLAGS = $($(ANSI)_CONFORM_CFLAGS_$(CMPLR))
-CONFORM_CXXFLAGS = $($(CPLUSPLUS)_CONFORM_CFLAGS_$(CMPLR))
+CONFORM_CFLAGS = $(CONFORM_CFLAGS_$(CMPLR))
+CONFORM_CXXFLAGS = $(CONFORM_CXXFLAGS_$(CMPLR))
 
 # Warnings flags
-WARN_CFLAGS = $($(ANSI)_WARN_$($(BUILD_CLASS)_WARN))
-WARN_CXXFLAGS = $($(CPLUSPLUS)_WARN_$($(BUILD_CLASS)_WARN))
+WARN_CFLAGS = $(WARN_CFLAGS_$($(BUILD_CLASS)_WARN))
+WARN_CXXFLAGS = $(WARN_CXXFLAGS_$($(BUILD_CLASS)_WARN))
 
 # Optimization flags
-OPT_CFLAGS = $($(ANSI)_OPT_$($(BUILD_CLASS)_OPT))
-OPT_CXXFLAGS = $($(CPLUSPLUS)_OPT_$($(BUILD_CLASS)_OPT))
-OPT_LDFLAGS =
+OPT_CFLAGS = $(OPT_CFLAGS_$($(BUILD_CLASS)_OPT))
+OPT_CXXFLAGS = $(OPT_CXXFLAGS_$($(BUILD_CLASS)_OPT))
+
+# Posix c preprocessor flags
+POSIX=YES
+POSIX_CPPFLAGS=$(POSIX_CPPFLAGS_$(POSIX))
+POSIX_LDLIBS=$(POSIX_LDLIBS_$(POSIX))
 
 # Static build flags
-STATIC_CFLAGS = $($(ANSI)_STATIC_CFLAGS_$(STATIC_BUILD))
-STATIC_CXXCFLAGS = $($(CPLUSPLUS)_STATIC_CFLAGS_$(STATIC_BUILD))
-STATIC_LDFLAGS = $($(ANSI)_STATIC_LDFLAGS_$(STATIC_BUILD))
-STATIC_LDLIBS = $($(ANSI)_STATIC_LDLIBS_$(STATIC_BUILD))
-
-# Depends flag
-DEPENDS_FLAG = $($(CPLUSPLUS)_DEPENDS_FLAG)
+STATIC_CFLAGS = $(STATIC_CFLAGS_$(STATIC_BUILD))
+STATIC_CXXCFLAGS = $(STATIC_CXXFLAGS_$(STATIC_BUILD))
+STATIC_LDFLAGS = $(STATIC_LDFLAGS_$(STATIC_BUILD))
+STATIC_LDLIBS = $(STATIC_LDLIBS_$(STATIC_BUILD))
 
 #--------------------------------------------------
 # Flags
 
-INCLUDES = -I. $(USR_INCLUDES) $(INSTALL_INCLUDES) \
-    $(TARGET_INCLUDES) $(GENERIC_SRC_INCLUDES) $(OP_SYS_INCLUDES) $(CROSS_INCLUDES)
+INCLUDES = -I. $(USR_INCLUDES) $(INSTALL_INCLUDES) $(TARGET_INCLUDES)\
+ $(GENERIC_SRC_INCLUDES) $(OP_SYS_INCLUDES) $(CROSS_INCLUDES)
 
-CFLAGS = $(CONFORM_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS) $(WARN_CFLAGS)\
- $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(CODE_CFLAGS)\
- $(STATIC_CFLAGS) $(OP_SYS_CFLAGS)
+CFLAGS = $(CONFORM_CFLAGS) $(CROSS_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
+ $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
+ $(CODE_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS)
 
-CXXFLAGS = $(CONFORM_CXXFLAGS) $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS)\
- $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS)\
- $(STATIC_CXXCFLAGS) $(OP_SYS_CFLAGS) $(TEMPL_INST_CXXFLAG)
+CXXFLAGS = $(CONFORM_CXXFLAGS) $(CROSS_CXXFLAGS) $(OPT_CXXFLAGS)\
+ $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS)\
+ $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS)\
+ $(TEMPL_INST_CXXFLAG) $(CROSS_CXXFLAGS)
 
 LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(DEPLIB_LDFLAGS)\
  $(ARCH_DEP_LDFLAGS) $(STATIC_LDFLAGS) $(OP_SYS_LDFLAGS) $(CROSS_LDFLAGS)
 
-LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(DEPLIB_LDLIBS) $(ARCH_DEP_LDLIBS)\
- $(STATIC_LDLIBS) $(OP_SYS_LDLIBS)
+LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(DEPLIB_LDLIBS) $(STATIC_LDLIBS)\
+ $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(OP_SYS_LDLIBS)
 
-CPPFLAGS += $(POSIX_CPPFLAGS) $(EPICS_BASE_CPPFLAGS)\
- $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)
+CPPFLAGS += $(CROSS_CPPFLAGS) $(POSIX_CPPFLAGS) $(EPICS_BASE_CPPFLAGS)\
+ $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
+ $(OP_SYS_CPPFLAGS) $(CODE_CPPFLAGS)
 
 CPPSNCFLAGS = $(CPPFLAGS) $(INCLUDES)
 
 #--------------------------------------------------
 # ar definition default
-AR = $($(ANSI)_AR)
 ARFLAGS =
 ARCMD = $(AR) $(ARFLAGS) $(USR_ARFLAGS) $@  $(LIBRARY_LD_OBJS)
 
 #--------------------------------------------------
-# C compiler
-CC = $($(ANSI)) $(BUILD_CLASS_CFLAGS)
-CPP =  $($(ANSI)_CPP) $(BUILD_CLASS_CPPFLAGS)
-RANLIB =  $($(ANSI)_RANLIB)
-
-#--------------------------------------------------
-# C++ compiler
-CXX = $($(CPLUSPLUS)) $(BUILD_CLASS_CFLAGS)
+# snc (state notation language) flags
+# Use C++ constructors to register commands/programs (snc +i option)
+CPPSNCFLAGS += -x c
+TARGET_SNCFLAGS += +i
 
 #--------------------------------------------------
 # Build compile line here
 
-COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c $(SOURCE_FLAG)
-COMPILE.cpp = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) -c $(SOURCE_CXXFLAG)
+COMPILE.c = $(CC) -c $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(SOURCE_FLAG)
+COMPILE.cpp = $(CCC) -c $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) $(SOURCE_CXXFLAG)
 
 #--------------------------------------------------
-# depends definition 
+# depends definition
 TARGET_SRCS = $(foreach name, $(TESTPROD) $(PROD) $(LIBRARY), $($(name)_SRCS))
 SRC_FILES = $(foreach src, $(LIBSRCS) $(SRCS) $(PROD_SRCS) $(TARGET_SRCS) , \
     $(firstword  $(wildcard $(addsuffix /$(src),$(ALL_SRC_DIRS))) $(src)))
 DEPENDS_RULE = -$(COMPILE.cpp) $(DEPENDS_FLAG) $(SRC_FILES) > DEPENDS
 
 #---------------------------------------------------------------
-# Names of installed items 
+# Names of installed items
 #
 #	each list starts with the destination directory name(s)
 #	to make sure it's there
@@ -319,11 +260,11 @@ INSTALL_CONFIGS = $(CONFIGS:%= $(INSTALL_CONFIG)/%)
 #
 # auto determine the directory paths that things are installed to
 # RULES:
-# 1) found in any one of several os specific area 
+# 1) found in any one of several os specific area
 #       => install to $(INSTALL_INCLUDE)/os/$(OS_CLASS)
-# 2) not foundin (1) and found in generic area 
+# 2) not foundin (1) and found in generic area
 #       => install to $(INSTALL_INCLUDE)
-# 3) not found in (1) or (2) then may be (not yet) computer generated 
+# 3) not found in (1) or (2) then may be (not yet) computer generated
 #       => install into $(INSTALL_INCLUDE)/os/$(OS_CLASS) and let
 #       build rules work on vpath
 #
diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index d15f65bea..f6fd6bf42 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -11,16 +11,20 @@
 
 #  The host architecture performing the build,
 #	i.e.: the arch running DCT/getrel/etc.
+#       <operating system>-<architecture>[-<alternate compiler>]
 #
 #  Currently Supporting:
-#	sun4
-#	hp700
-#	alpha
-#	solaris
-#	sgi
-#	Linux
-#	WIN32
-#	LynxOS
+#	hpux-parisc
+#	osf-alpha
+#	solaris-sparc          (sun compiler used for host builds)
+#	solaris-sparc-gnu      (GNU compiler used for host builds)
+#	solaris-x86            (sun compiler used for host builds)
+#	solaris-x86-gnu        (GNU compiler used for host builds)
+#	sun4-x86               (sun compiler used for host builds)
+#	linux-x86              (GNU compiler used for host builds)
+#	win32-x86              (MS Visual C++ compiler used for host builds)
+#	win32-x86-borland      (Borland C++ compiler used for host builds)
+#	lynxos-x86
 #
 #  EPICS_HOST_ARCH is an environment variable
 #  EPICS_HOST_ARCH=$(shell /usr/local/epics/startup/EpicsHostArch)
@@ -34,12 +38,18 @@
 #       vxWorks-68040lc
 #       vxWorks-68060
 #       vxWorks-pentium
-#       vxWorks-ppc604
 #       vxWorks-ppc603
+#       vxWorks-ppc604
 #       RTEMS-gen68360
 #       RTEMS-mvme167
+#       RTEMS-pc386
+#
+# Definitions of CROSS_COMPILER_TARGET_ARCHS in
+# configure/os/CONFIG_SITE.<host>.Common files will
+# override 
 #
 CROSS_COMPILER_TARGET_ARCHS=vxWorks-68040
+#CROSS_COMPILER_TARGET_ARCHS=
 
 
 #  If only a subset of the host architectures perform
@@ -48,16 +58,6 @@ CROSS_COMPILER_TARGET_ARCHS=vxWorks-68040
 #
 CROSS_COMPILER_HOST_ARCHS=
 
-#  Client ANSI C Compiler (for Host builds)
-#   GCC     GNU			(gcc -ansi)
-#   ACC     OS VENDOR		(sun4/solaris: acc ; hp700: cc -Aa)
-ANSI=ACC
-
-#  C++ Compiler (for Host builds)
-#   G++     GNU C++		(g++)
-#   CCC     OS VENDOR C++	(sun4/solaris: CC ; hp700: aCC)
-CPLUSPLUS=CCC
-
 # Default ANSI level, individual Makefiles will override
 #  if they cannot support ANSI compilation.
 #   STRICT -  ANSI C - force warning flags
diff --git a/configure/RULES_DIRS b/configure/RULES_DIRS
index e5edcc9fc..fa0f3ce6d 100644
--- a/configure/RULES_DIRS
+++ b/configure/RULES_DIRS
@@ -24,7 +24,7 @@ actionArchTargets = $(foreach action, $(ACTIONS),\
                     $(foreach arch, $(ARCHS), \
                     $(action)$(DIVIDER)$(arch)))
 
-all install : buildInstall
+all : buildInstall
 
 rebuild : clean all
 
diff --git a/configure/os/CONFIG.Common.RTEMS b/configure/os/CONFIG.Common.RTEMS
index 0e3d1ca99..df7d10559 100644
--- a/configure/os/CONFIG.Common.RTEMS
+++ b/configure/os/CONFIG.Common.RTEMS
@@ -12,6 +12,9 @@
 #
 -include $(CONFIG)/os/CONFIG.Common.UnixCommon 
 
+# Include common gnu compiler definitions
+-include $(CONFIG)/CONFIG.gnuCommon
+
 ###############################################################################
 #                                                                             #
 #           RTEMS-specific overrides of common UNIX definitions               #
@@ -42,19 +45,24 @@ CFLAGS_OPTIMIZE =
 # The RTEMS Makefiles redefine several macros, so we have to go
 # through the following contortions to get the EPICS flags back.
 #
-CFLAGS += $(CONFORM_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS) $(WARN_CFLAGS)\
- $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(CODE_CFLAGS)\
- $(STATIC_CFLAGS) $(OP_SYS_CFLAGS)
+CFLAGS = $(CONFORM_CFLAGS) $(CROSS_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
+ $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
+ $(CODE_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS)
 
-CXXFLAGS +=$(CONFORM_CXXFLAGS) $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS)\
- $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS)\
- $(STATIC_CXXCFLAGS) $(OP_SYS_CFLAGS) $(TEMPL_INST_CXXFLAG)
+CXXFLAGS = $(CONFORM_CXXFLAGS) $(CROSS_CXXFLAGS) $(OPT_CXXFLAGS)\
+ $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS)\
+ $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS)\
+ $(TEMPL_INST_CXXFLAG) $(CROSS_CXXFLAGS)
 
-LDFLAGS += $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(DEPLIB_LDFLAGS)\
- $(ARCH_DEP_LDFLAGS) $(STATIC_LDFLAGS) $(OP_SYS_LDFLAGS)
+LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(DEPLIB_LDFLAGS)\
+ $(ARCH_DEP_LDFLAGS) $(STATIC_LDFLAGS) $(OP_SYS_LDFLAGS) $(CROSS_LDFLAGS)
 
-CPPFLAGS += $(CONFORM_CFLAGS) $(POSIX_CPPFLAGS) $(EPICS_BASE_CPPFLAGS)\
- $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)
+LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(DEPLIB_LDLIBS) $(STATIC_LDLIBS)\
+ $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(OP_SYS_LDLIBS)
+
+CPPFLAGS += $(CROSS_CPPFLAGS) $(POSIX_CPPFLAGS) $(EPICS_BASE_CPPFLAGS)\
+ $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
+ $(OP_SYS_CPPFLAGS) $(CODE_CPPFLAGS)
 
 #--------------------------------------------------
 # operating system class (include/os/<os_class>)
@@ -83,20 +91,15 @@ OSITHREAD_USE_DEFAULT_STACK = NO
 # RTEMS has neither shared libraries nor dynamic loading
 STATIC_BUILD=YES
 SHARED_LIBRARIES=NO
-GCC_CODE_CFLAGS =
-G++_CODE_CFLAGS =
+CODE_CPPFLAGS =
 
 #--------------------------------------------------
 # RTEMS wants nothing to do with POSIX
-GCC_POSIX_CPPFLAGS = 
-G++_POSIX_CPPFLAGS = 
+POSIX_CPPFLAGS = 
+POSIX_LDLIBS = 
 
 #--------------------------------------------------
 # RTEMS is not that strict
-GCC_CONFORM_CFLAGS_STRICT =
-G++_CONFORM_CFLAGS_STRICT =
+CONFORM_CFLAGS_STRICT =
+CONFORM_CXXFLAGS_STRICT =
 
-#--------------------------------------------------
-# Use C++ constructors to register commands/programs (snc +i option)
-CPPSNCFLAGS += -x c
-TARGET_SNCFLAGS += +i
diff --git a/configure/os/CONFIG.Common.UnixCommon b/configure/os/CONFIG.Common.UnixCommon
index c6515db84..efa9626c9 100644
--- a/configure/os/CONFIG.Common.UnixCommon
+++ b/configure/os/CONFIG.Common.UnixCommon
@@ -38,7 +38,7 @@ SHRLIB_DEPLIBS = $(foreach lib,$(SHRLIB_LIBS),$(firstword $(wildcard  \
 $($(lib)_DIR)/$(LIB_PREFIX)$(lib).*)))
 
 # Shared library definitions
-SHRLIB_LDFLAGS = $($(ANSI)_SHRLIB_LDFLAGS_$(strip $(SHARED_LIBRARIES)))
+SHRLIB_LDFLAGS = $(SHRLIB_LDFLAGS_$(strip $(SHARED_LIBRARIES)))
 SHRLIB_LDLIBS = $($*_LIBS:%=-l%)
 
 SHRLIB_DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(SHRLIB_DEPLIBS))
@@ -57,11 +57,6 @@ DEPLIB_LDFLAGS += $(sort $(DEPLIB_DIRS:%=-L%))
 DEPLIB_LDLIBS = $($*_LIBS:%=-l%) $(PROD_LIBS:%=-l%) $(USR_LIBS:%=-l%)\
  $($*_SYS_LIBS:%=-l%) $(SYS_PROD_LIBS:%=-l%)
 
-#--------------------------------------------------
-#  Allow code to be used in a shared library
-GCC_CODE_CFLAGS += -fPIC
-G++_CODE_CFLAGS += -fPIC
-
 #--------------------------------------------------
 # Operating system definitions
 OP_SYS_INCLUDES =
@@ -71,8 +66,8 @@ OP_SYS_LDLIBS = -lm
 
 #--------------------------------------------------
 # Link definitions
-LINK.cpp = $(CXX) -o $@ $(LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(LDLIBS)
-LINK.shrlib = $(CXX) -o $@ $(SHRLIB_LDFLAGS) $(LDFLAGS) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
+LINK.cpp = $(CCC) -o $@ $(LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(LDLIBS)
+LINK.shrlib = $(CCC) -o $@ $(SHRLIB_LDFLAGS) $(LDFLAGS) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
 
 #--------------------------------------------------
 # Allow site overrides
diff --git a/configure/os/CONFIG.Common.solaris-sparc b/configure/os/CONFIG.Common.solaris-sparc
index 947e61944..c8a6d04d8 100644
--- a/configure/os/CONFIG.Common.solaris-sparc
+++ b/configure/os/CONFIG.Common.solaris-sparc
@@ -3,6 +3,7 @@
 # $Id$
 # This file is maintained by the build community.
 #
+# Definitions for solaris-sparc target archs
 # Sites may override these definitions in CONFIG_SITE.Common.solaris-sparc
 #-------------------------------------------------------
 
@@ -12,18 +13,30 @@ include $(CONFIG)/os/CONFIG.Common.UnixCommon
 OS_CLASS = solaris
 ARCH_CLASS = sparc
 
-GCC_POSIX_CPPFLAGS += -D__EXTENSIONS__
-G++_POSIX_CPPFLAGS += -D__EXTENSIONS__
+CODE_CPPFLAGS = -D__EXTENSIONS__
 
-GCC_STATIC_LDLIBS_YES= -lposix4 -lpthread -lthread
-GCC_STATIC_LDLIBS_NO= -lposix4 -lpthread -lthread
-G++_STATIC_LDLIBS_YES= -lposix4 -lpthread -lthread
-G++_STATIC_LDLIBS_NO= -lposix4 -lpthread -lthread
+# This is the only combination of posix threads flags that works with solaris 6
+POSIX_CPPFLAGS_YES = -D_REENTRANT -D_POSIX_C_SOURCE=199506L
+POSIX_LDLIBS_YES += -lposix4 -lpthread -lthread
+
+# This set of flags is recommended by sun for posix threads and works with solaris 8
+####POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L
+####POSIX_LDLIBS_YES += -lposix4 -lpthread
+
+POSIX_CPPFLAGS_NO =
+POSIX_LDLIBS_NO +=
 
 ARCH_DEP_CPPFLAGS = -DSOLARIS
 # socket and nsl needed by libca.a
-ARCH_DEP_LDLIBS +=  -lsocket -lnsl
+ARCH_DEP_LDLIBS += -lsocket -lnsl
 
-# use loader's -R option
-DEPLIB_LDFLAGS += $(sort $(DEPLIB_DIRS:%=-R%))
+####  -R does not work unless full path name are specified
+#### use loader's -R option
+####DEPLIB_LDFLAGS += $(sort $(DEPLIB_DIRS:%=-R%))
+
+ifdef CROSS
+   GNU_TARGET=sparc-sun-solaris2
+   CMPLR_SUFFIX=
+   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
+endif
 
diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon
index 54b894f02..a5cc6cbe8 100644
--- a/configure/os/CONFIG.Common.vxWorksCommon
+++ b/configure/os/CONFIG.Common.vxWorksCommon
@@ -1,14 +1,13 @@
 # CONFIG.Common.vxWorksCommon
 #
 # $Id$
+# This file is maintained by the build community.
 #
 # Definitions for vxWorks target archs
-#
-# This file is maintained by the build community.
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorksCommon
 # or CONFIG_SITE.<host>.vxWorksCommon
-
 #-------------------------------------------------------
+
 # Vx valid build types
 VALID_BUILDS = Ioc
 
@@ -37,17 +36,17 @@ INSTALL_LOCATION_LIB=$(INSTALL_LOCATION)/bin
 #--------------------------------------------------
 # vxWorks directory definitions
 # Tornado directory definitions
-VX_INCLUDE = $(VX_DIR)/target/h
+GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/target/h
 GNU_DIR = $(VX_DIR)/host/$(WIND_HOST_TYPE)
 
 #-------------------------------------------------------
 # Command definition overrides
-GCC_LD = $(GNU_BIN)/$(CMPLR_PREFIX)ld$(CMPLR_SUFFIX) -r
+LD = $(GNU_BIN)/$(CMPLR_PREFIX)ld$(CMPLR_SUFFIX) -r
 
 # use ld  partial linking not ar to create libraries)
-GCC_AR = $(GCC_LD)
+AR = $(LD)
 ARFLAGS = -o
-GCC_RANLIB =
+RANLIB =
 
 #--------------------------------------------------
 # C++ host processing
@@ -59,14 +58,8 @@ NM = $(GNU_BIN)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
 export WIND_BASE = $(VX_DIR)
 export WIND_HOST_TYPE
 
-#--------------------------------------------------
-# Posix flags override
-GCC_POSIX_CPPFLAGS = -D_POSIX_SOURCE
-G++_POSIX_CPPFLAGS = -D_POSIX_SOURCE
-
 #--------------------------------------------------
 # Operating system flags
-OP_SYS_INCLUDES = -I$(VX_INCLUDE)
 OP_SYS_CPPFLAGS = -DvxWorks
 OP_SYS_CFLAGS = -fno-builtin 
 OP_SYS_LDFLAGS =
@@ -74,14 +67,24 @@ OP_SYS_LDLIBS =
 
 # Fix for vxWorks headers using macros defined in
 # vxWorks.h but not including vxWorks.h 
-OP_SYS_CFLAGS += -include $(VX_INCLUDE)/vxWorks.h
+OP_SYS_CFLAGS += -include $(GNU_TARGET_INCLUDE_DIR)/vxWorks.h
+
+#--------------------------------------------------
+# code flags
+CODE_CFLAGS =
+CODE_CXXFLAGS =
+
+#--------------------------------------------------
+# posix c preprocessor flags
+POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE
+POSIX_CPPFLAGS_NO =
 
 #--------------------------------------------------
 # Optimization flag overrides
-GCC_OPT_YES = -O2
-GCC_OPT_NO =
-G++_OPT_YES = -O2
-G++_OPT_NO =
+OPT_CFLAGS_YES = -O2
+OPT_CFLAGS_NO =
+OPT_CXXFLAGS_YES = -O2
+OPT_CXXFLAGS_NO =
 
 #--------------------------------------------------
 # c++ exceptions,  YES or NO override
@@ -93,7 +96,7 @@ OSITHREAD_USE_DEFAULT_STACK = NO
 
 #--------------------------------------------------
 # Link definitions
-LINK.cpp = $(GCC_LD) -o $@ $(LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RES) $(LDLIBS)
+LINK.cpp = $(LD) -o $@ $(LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RES) $(LDLIBS)
 
 #--------------------------------------------------
 # Uncomment these lines to, use C to compile SNC output -- all other systems use C++
diff --git a/configure/os/CONFIG.hpux-parisc.hpux-parisc b/configure/os/CONFIG.hpux-parisc.hpux-parisc
index c8a86c876..3c69b8bc8 100644
--- a/configure/os/CONFIG.hpux-parisc.hpux-parisc
+++ b/configure/os/CONFIG.hpux-parisc.hpux-parisc
@@ -7,54 +7,44 @@
 # Sites may override these definitions in CONFIG_SITE.hpux-parisc.hpux-parisc
 #-------------------------------------------------------
 
-OS_CLASS = hpux
-ARCH_CLASS = parisc
-
-# Configure OS vendor C compiler
-ACC = cc
-ACC_CONFORM_CFLAGS_ANSI = -Aa
-ACC_CONFORM_CFLAGS_STRICT = -Aa
-ACC_CONFORM_CFLAGS_TRAD = -Ac
-ACC_WARN_YES = 
-ACC_WARN_NO = -w
-ACC_OPT_YES = -O
-ACC_OPT_NO = -g
-ACC_STATIC_CFLAGS_YES= -Wl,-a,archive
-ACC_STATIC_CFLAGS_NO =
-ACC_STATIC_LDLIBS_YES =
-ACC_STATIC_LDLIBS_NO =
-ACC_SHRLIB_LDFLAGS_YES = -b
-
-# Configure OS vendor C++ compiler
+CC = cc
 CCC = aCC
-# avoid treating "future errors" as actual errors
-CCC_CONFORM_CFLAGS_NORMAL = +W302 +W829 +W818 +W392 +W469 +W495 +W749 +W667 +W392 +W684
-CCC_CONFORM_CFLAGS_STRICT = +p
-CCC_TEMPL_INST_FLAG =
-CCC_WARN_YES = +w
-CCC_WARN_NO =
-CCC_OPT_YES = -O
-CCC_OPT_NO = -g
-CCC_STATIC_CFLAGS_YES= +A
-CCC_STATIC_CFLAGS_NO =
-CCC_STATIC_LDLIBS_YES =
-CCC_STATIC_LDLIBS_NO =
-# shared libs will be found by searching environment variable SHLIB_PATH,
-# then by searching the specified path (see below)
-CCC_SHRLIB_LDFLAGS_YES = -b
-CCC_DEPENDS_FLAG = +m
-
-# +DAportable causes portable object code to be created for execution
-# on different PA-Risc machines
-ARCH_DEP_CPPFLAGS = -D_HPUX_SOURCE -DHP_UX
-ARCH_DEP_CFLAGS = +DAportable +z
-ARCH_DEP_CXXFLAGS = +DAportable +z
-ARCH_DEP_LDLIBS =
-ARCH_DEP_LDFLAGS = -Wl,+b$(DEFAULT_SHRLIB_SEARCH_PATH),+s
-
+CPP = $(CCC) -E
+RANLIB =
 AR = ar -rc
 
-SHRLIB_SUFFIX = .sl
+# Configure OS vendor C compiler
+CONFORM_CFLAGS_ANSI = -Aa
+CONFORM_CFLAGS_STRICT = -Aa
+CONFORM_CFLAGS_TRAD = -Ac
+CODE_CFLAGS = 
+WARN_CFLAGS_YES =
+WARN_CFLAGS_NO = -w
+OPT_CFLAGS_YES = -O
+OPT_CFLAGS_NO = -g
 
 # HP's aCC will not compile things if run in STRICT mode
 CXXCMPLR=NORMAL
+
+# Configure OS vendor C++ compiler
+CONFORM_CXXFLAGS_NORMAL = +W302 +W829 +W818 +W392 +W469 +W495 +W749 +W667 +W392 +W684
+CONFORM_CXXFLAGS_STRICT = +p
+CODE_CXXFLAGS = 
+TEMPL_INST_CXXFLAG =
+WARN_CXXFLAGS_YES = +w
+WARN_CXXFLAGS_NO =
+OPT_CXXFLAGS_YES = -O
+OPT_CXXFLAGS_NO = -g
+
+STATIC_LDFLAGS_YES= -Wl,-a,archive +A
+# shared libs will be found by searching environment variable SHLIB_PATH,
+# then by searching the specified path (see below)
+STATIC_LDFLAGS_YES+= -b
+STATIC_LDFLAGS_NO = -Wl,+b$(DEFAULT_SHRLIB_SEARCH_PATH),+s
+STATIC_LDLIBS_YES=
+STATIC_LDLIBS_NO=
+
+SHRLIB_LDFLAGS_YES =  -G -h $@
+
+DEPENDS_FLAG = +m
+
diff --git a/configure/os/CONFIG.linux-x86.linux-x86 b/configure/os/CONFIG.linux-x86.linux-x86
index 50cb166fe..986681a3c 100644
--- a/configure/os/CONFIG.linux-x86.linux-x86
+++ b/configure/os/CONFIG.linux-x86.linux-x86
@@ -2,40 +2,14 @@
 #
 # $Id$
 #
-#  This file is maintained by the build community.
-#  Sites may override these definitions in CONFIG_SITE.linux-x86.linux-x86
+# Definitions for linux-x86 host - linux-x86 target builds
+# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-x86
 #-------------------------------------------------------
 
-# Include definitions common to all Unix target archs
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
-
- 
-OS_CLASS = Linux
-ARCH_CLASS = x86
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon
 
 GNU_DIR = /usr
 
-# Configure OS vendor C compiler
-# These are overrides of ANSI and CPLUSPLUS values in CONFIG_SITE
-# since OS vendor compilers is gnu compiler
-ANSI=GCC
-CPLUSPLUS=G++
-
-# Configure gnu C compiler
-GCC = gcc
-G++ = g++
-
-AR = ar -rc
-ARFLAGS =
-RANLIB = ranlib -t
-
-# -D_BSD_SOURCE for gethostname() in unistd.h as needed by cacChannelIO.cpp.
-ARCH_DEP_CPPFLAGS += -D_BSD_SOURCE
-ARCH_DEP_CPPFLAGS += -D_X86_ -Dlinux
-
-ARCH_DEP_LDFLAGS =
-ARCH_DEP_LDLIBS = -lpthread -lreadline -lcurses -lrt
-
-# Use C++ constructors to register commands/programs (snc +i option)
-CPPSNCFLAGS += -x c
-TARGET_SNCFLAGS += +i
+CC = $(GNU_BIN)/gcc
+CCC = $(GNU_BIN)/g++
diff --git a/configure/os/CONFIG.lynxos-x86.lynxos-x86 b/configure/os/CONFIG.lynxos-x86.lynxos-x86
index e1e0fecc2..52c9efb0d 100644
--- a/configure/os/CONFIG.lynxos-x86.lynxos-x86
+++ b/configure/os/CONFIG.lynxos-x86.lynxos-x86
@@ -6,26 +6,8 @@
 #  Sites may override these definitions in CONFIG_SITE.lynxos-x86.lynxos-x86
 #-------------------------------------------------------
  
-OS_CLASS = lynxos
-ARCH_CLASS = x86
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon
 
 GNU_DIR = /usr
 
-# Configure OS vendor C compiler
-# These are overrides of ANSI and CPLUSPLUS values in CONFIG_SITE
-# since OS vendor compilers is gnu compiler
-ANSI=GCC
-CPLUSPLUS=G++
-
-# Configure gnu C compiler
-GCC = gcc
-G++ = g++
-
-AR = ar -rc
-ARFLAGS =
-RANLIB = ranlib -t
-
-ARCH_DEP_CPPFLAGS += -D_X86_
-ARCH_DEP_LDFLAGS =
-ARCH_DEP_LDLIBS = -lposix4d9 -lpthread
-
diff --git a/configure/os/CONFIG.osf-alpha.osf-alpha b/configure/os/CONFIG.osf-alpha.osf-alpha
index cd96494e5..b99c12256 100644
--- a/configure/os/CONFIG.osf-alpha.osf-alpha
+++ b/configure/os/CONFIG.osf-alpha.osf-alpha
@@ -7,66 +7,44 @@
 # Sites may override these definitions in CONFIG_SITE.osf-alpha.osf-alpha
 #-------------------------------------------------------
 
-# Include definitions common to all Unix target archs
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
-
-OS_CLASS = osf
-ARCH_CLASS = alpha
-
-SPARCWORKS = /opt/SUNWspro
+CC = cc
+CCC = cxx 
+CPP = $(CCC) -E
+RANLIB =
+AR = ar
 
 # Configure OS vendor C compiler
-ACC = $(SPARCWORKS)/bin/cc
-ACC_CONFORM_CFLAGS_ANSI = -Xa
-ACC_CONFORM_CFLAGS_STRICT = -Xc -v
-ACC_CONFORM_CFLAGS_TRAD = -Xs
-ACC_CODE_CFLAGS = -KPIC -D_REENTRANT
-ACC_WARN_YES = 
-ACC_WARN_NO =  -w
-ACC_OPT_YES =  -xO4
-ACC_OPT_NO = -g
-ACC_STATIC_LDFLAGS_YES= -Bstatic
-ACC_STATIC_LDLIBS_YES= -lw -lintl -Bdynamic -ldl -lposix4 -lpthread -lthread -Bstatic -lXext -lX
-ACC_STATIC_LDLIBS_NO= -lposix4 -lpthread -lthread
-ACC_SHRLIB_LDFLAGS_YES =  -G -h $@
-ACC_POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+CONFORM_CFLAGS_ANSI = -std
+CONFORM_CFLAGS_STRICT = -std1
+CONFORM_CFLAGS_TRAD = -std0
+CODE_CFLAGS = 
+WARN_CFLAGS_YES =
+WARN_CFLAGS_NO = -w
+OPT_CFLAGS_YES = -O
+OPT_CFLAGS_NO = -g
 
 # Configure OS vendor C++ compiler
-CCC = $(SPARCWORKS)/bin/CC
-CCC_CONFORM_CFLAGS_NORMAL = +p
-CCC_CONFORM_CFLAGS_STRICT = +p
-CCC_CODE_CFLAGS = -KPIC -D_REENTRANT
-CCC_TEMPL_INST_FLAG =
-CCC_WARN_YES = +w
-CCC_WARN_NO = 
-CCC_OPT_YES =  -xO4
-CCC_OPT_NO = -g
-CCC_STATIC_LDFLAGS_YES= -Bstatic
-CCC_STATIC_LDLIBS_YES= -lw -lintl -Bdynamic -ldl -lposix4 -lpthread -lthread -Bstatic -lXext -lX
-CCC_STATIC_LDLIBS_NO=
-CCC_SHRLIB_LDFLAGS_YES =  -G -h $@
-CCC_DEPENDS_FLAG = -xM1
-CCC_POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+CONFORM_CXXFLAGS_NORMAL =
+CONFORM_CXXFLAGS_STRICT =
+PROF_CXXFLAGS_YES = +p
+PROF_CXXFLAGS_NO =
+CODE_CXXFLAGS =
+TEMPL_INST_CXXFLAG =
+WARN_CXXFLAGS_YES =
+WARN_CXXFLAGS_NO =
+OPT_CXXFLAGS_YES = -O
+OPT_CXXFLAGS_NO = -g
 
-ACC_CPP = cpp
+STATIC_LDFLAGS_YES= -Bstatic
+STATIC_LDFLAGS_NO=
+STATIC_LDLIBS_YES= -Bdynamic
+STATIC_LDLIBS_NO=
 
-#Configure gnu compiler
-GCC = gcc
-G++ = g++
-GCC_CPP = $(GCC) -x c -E
+SHRLIB_LDFLAGS_YES = -shared
 
-GCC_POSIX_CPPFLAGS += -D__EXTENSIONS__
-G++_POSIX_CPPFLAGS += -D__EXTENSIONS__
+DEPENDS_FLAG =
 
-RANLIB =
-# required by sun's C++ compiler
-AR = $(CCC) -xar -o
-
-ARCH_DEP_CPPFLAGS =
-ARCH_DEP_LDLIBS = -lposix4 -lpthread -lthread
-# socket and nsl needed by libca.a
-ARCH_DEP_LDLIBS += -lsocket -lnsl
-
-# use loader's -R option
-DEPLIB_LDFLAGS += $(sort $(DEPLIB_DIRS:%=-R%))
+#############  ???????????
+#####ACC_SFLAGS_YES= -non_shared
+#####ACC_SFLAGS_NO= -call_shared
 
diff --git a/configure/os/CONFIG.solaris-sparc.solaris-sparc b/configure/os/CONFIG.solaris-sparc.solaris-sparc
index 552f05606..2c0e220d0 100644
--- a/configure/os/CONFIG.solaris-sparc.solaris-sparc
+++ b/configure/os/CONFIG.solaris-sparc.solaris-sparc
@@ -3,66 +3,52 @@
 # $Id$
 # This file is maintained by the build community.
 #
-# Definitions for solaris-sparc host archs
+# Definitions for solaris-sparc host - solaris-sparc target build
 # Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc
 #-------------------------------------------------------
 
-# Include definitions common to all Unix target archs
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
-
 SPARCWORKS = /opt/SUNWspro
 
+CC = $(SPARCWORKS)/bin/cc
+CCC = $(SPARCWORKS)/bin/CC
+CPP = $(CCC) -E
+RANLIB =
+# required by sun's C++ compiler
+AR = $(CCC) -xar -o
+
 #Prepare the object code for profiling with prof. (YES or NO)
 PROFILE=YES
 
 # Configure OS vendor C compiler
-ACC = $(SPARCWORKS)/bin/cc
-ACC_CONFORM_CFLAGS_ANSI = -Xa -v
-ACC_CONFORM_CFLAGS_STRICT = -Xc -v
-ACC_CONFORM_CFLAGS_TRAD = -Xs
-ACC_PROF_CFLAGS_YES = +p
-ACC_PROF_CFLAGS_NO =
-ACC_CODE_CFLAGS = -KPIC -D_REENTRANT $(CCC_PROF_CFLAGS_$(PROFILE))
-ACC_WARN_YES =
-ACC_WARN_NO = -w
-ACC_OPT_YES = -xO4
-ACC_OPT_NO = -g
-ACC_STATIC_LDFLAGS_YES= -Bstatic
-ACC_STATIC_LDLIBS_YES= -lw -lintl -Bdynamic -ldl -lposix4 -lpthread -lthread -Bstatic -lXext -lX
-ACC_STATIC_LDLIBS_NO= -lposix4 -lpthread -lthread
-ACC_SHRLIB_LDFLAGS_YES =  -G -h $@
-ACC_POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+CONFORM_CFLAGS_ANSI = -Xa -v
+CONFORM_CFLAGS_STRICT = -Xc -v
+CONFORM_CFLAGS_TRAD = -Xs
+PROF_CFLAGS_YES = +p
+PROF_CFLAGS_NO =
+CODE_CFLAGS = -KPIC $(PROF_CFLAGS_$(PROFILE))
+WARN_CFLAGS_YES =
+WARN_CFLAGS_NO = -w
+OPT_CFLAGS_YES = -xO4
+OPT_CFLAGS_NO = -g
 
 # Configure OS vendor C++ compiler
-CCC = $(SPARCWORKS)/bin/CC
-CCC_CONFORM_CFLAGS_NORMAL =
-CCC_CONFORM_CFLAGS_STRICT =
-CCC_PROF_CFLAGS_YES = +p
-CCC_PROF_CFLAGS_NO =
-CCC_CODE_CFLAGS = -KPIC -D_REENTRANT $(CCC_PROF_CFLAGS_$(PROFILE))
-CCC_TEMPL_INST_FLAG =
-CCC_WARN_YES = +w
-CCC_WARN_NO =
-CCC_OPT_YES = -O
-CCC_OPT_NO = -g
-CCC_STATIC_LDFLAGS_YES= -Bstatic
-CCC_STATIC_LDLIBS_YES= -lw -lintl -Bdynamic -ldl -lposix4 -lpthread -lthread -Bstatic -lXext -lX
-CCC_STATIC_LDLIBS_NO= -lposix4 -lpthread -lthread
-CCC_SHRLIB_LDFLAGS_YES =  -G -h $@
-CCC_DEPENDS_FLAG = -xM1
-CCC_POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS_
+CONFORM_CXXFLAGS_NORMAL =
+CONFORM_CXXFLAGS_STRICT =
+PROF_CXXFLAGS_YES = +p
+PROF_CXXFLAGS_NO =
+CODE_CXXFLAGS = -KPIC $(PROF_CXXFLAGS_$(PROFILE))
+TEMPL_INST_CXXFLAG =
+WARN_CXXFLAGS_YES = +w
+WARN_CXXFLAGS_NO =
+OPT_CXXFLAGS_YES = -O
+OPT_CXXFLAGS_NO = -g
 
-ACC_CPP = cpp
+STATIC_LDFLAGS_YES= -Bstatic
+STATIC_LDFLAGS_NO=
+STATIC_LDLIBS_YES= -Bdynamic
+STATIC_LDLIBS_NO=
 
-#Configure gnu compiler
-GCC = gcc
-G++ = g++
+SHRLIB_LDFLAGS_YES =  -G -h $@
 
-RANLIB =
-# required by sun's C++ compiler
-AR = $(CCC) -xar -o
+DEPENDS_FLAG = -xM1
 
-#--------------------------------------------------
-# Use C++ constructors to register commands/programs (snc +i option)
-CPPSNCFLAGS += -x c
-TARGET_SNCFLAGS += +i
diff --git a/configure/os/CONFIG.solaris-x86.solaris-x86 b/configure/os/CONFIG.solaris-x86.solaris-x86
index c8abda420..819d5a13c 100644
--- a/configure/os/CONFIG.solaris-x86.solaris-x86
+++ b/configure/os/CONFIG.solaris-x86.solaris-x86
@@ -3,81 +3,55 @@
 # $Id$
 # This file is maintained by the build community.
 #
-# Definitions for linux-x86 host archs
+# Definitions for solaris-x86 host - solaris-x86 target builds
 # Sites may override these definitions in CONFIG_SITE.solaris-x86.solaris-x86
 #-------------------------------------------------------
 
 # Include definitions common to all Unix target archs
 include $(CONFIG)/os/CONFIG.Common.UnixCommon
 
-OS_CLASS = solaris
-ARCH_CLASS = x86
-
 SPARCWORKS = /opt/SUNWspro
 
+CC = $(SPARCWORKS)/bin/cc
+CCC = $(SPARCWORKS)/bin/CC
+CPP = $(CCC) -E
+RANLIB =
+# required by sun's C++ compiler
+AR = $(CCC) -xar -o
+
 #Prepare the object code for profiling with prof. (YES or NO)
 PROFILE=YES
 
 # Configure OS vendor C compiler
-ACC = $(SPARCWORKS)/bin/cc
-ACC_CONFORM_CFLAGS_ANSI = -Xa
-ACC_CONFORM_CFLAGS_STRICT = -Xc -v
-ACC_CONFORM_CFLAGS_TRAD = -Xs
-ACC_PROF_CFLAGS_YES = +p
-ACC_PROF_CFLAGS_NO =
-ACC_CODE_CFLAGS = -KPIC -D_REENTRANT $(CCC_PROF_CFLAGS_$(PROFILE))
-ACC_WARN_YES =
-ACC_WARN_NO = -w
-ACC_OPT_YES = -xO4
-ACC_OPT_NO = -g
-ACC_STATIC_LDFLAGS_YES= -Bstatic
-ACC_STATIC_LDLIBS_YES= -lw -lintl -Bdynamic -ldl -lposix4 -lpthread -lthread -lrt -Bstatic -lXext -lX
-ACC_STATIC_LDLIBS_NO= -lposix4 -lpthread -lthread -lrt
-ACC_SHRLIB_LDFLAGS_YES =  -G -h $@
-ACC_POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+CONFORM_CFLAGS_ANSI = -Xa -v
+CONFORM_CFLAGS_STRICT = -Xc -v
+CONFORM_CFLAGS_TRAD = -Xs
+PROF_CFLAGS_YES = +p
+PROF_CFLAGS_NO =
+CODE_CFLAGS = -KPIC $(PROF_CFLAGS_$(PROFILE))
+WARN_CFLAGS_YES =
+WARN_CFLAGS_NO = -w
+OPT_CFLAGS_YES = -xO4
+OPT_CFLAGS_NO = -g
 
 # Configure OS vendor C++ compiler
-CCC = $(SPARCWORKS)/bin/CC
-CCC_CONFORM_CFLAGS_NORMAL =
-CCC_CONFORM_CFLAGS_STRICT =
-CCC_PROF_CFLAGS_YES = +p
-CCC_PROF_CFLAGS_NO =
-CCC_CODE_CFLAGS = -KPIC -D_REENTRANT $(CCC_PROF_CFLAGS_$(PROFILE))
-CCC_TEMPL_INST_FLAG =
-CCC_WARN_YES = +w
-CCC_WARN_NO =
-CCC_OPT_YES = -O
-CCC_OPT_NO = -g
-CCC_STATIC_LDFLAGS_YES= -Bstatic
-CCC_STATIC_LDLIBS_YES= -lw -lintl -Bdynamic -ldl -lposix4 -lpthread -lthread -lrt -Bstatic -lXext -lX
-CCC_STATIC_LDLIBS_NO= -lposix4 -lpthread -lthread -lrt
-CCC_SHRLIB_LDFLAGS_YES =  -G -h $@
-CCC_DEPENDS_FLAG = -xM1
-CCC_POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS_
+CONFORM_CXXFLAGS_NORMAL =
+CONFORM_CXXFLAGS_STRICT =
+PROF_CXXFLAGS_YES = +p
+PROF_CXXFLAGS_NO =
+CODE_CXXFLAGS = -KPIC $(PROF_CXXFLAGS_$(PROFILE))
+TEMPL_INST_CXXFLAG =
+WARN_CXXFLAGS_YES = +w
+WARN_CXXFLAGS_NO =
+OPT_CXXFLAGS_YES = -O
+OPT_CXXFLAGS_NO = -g
 
-ACC_CPP = cpp
+STATIC_LDFLAGS_YES= -Bstatic
+STATIC_LDFLAGS_NO=
+STATIC_LDLIBS_YES= -Bdynamic
+STATIC_LDLIBS_NO=
 
-#Configure gnu compiler
-GCC = gcc
-G++ = g++
-GCC_CPP = $(GCC) -x c -E
+SHRLIB_LDFLAGS_YES =  -G -h $@
 
-GCC_POSIX_CPPFLAGS += -D__EXTENSIONS__
-G++_POSIX_CPPFLAGS += -D__EXTENSIONS__
-
-GCC_STATIC_LDLIBS_YES= -lposix4 -lpthread -lthread -lrt
-GCC_STATIC_LDLIBS_NO= -lposix4 -lpthread -lthread -lrt
-G++_STATIC_LDLIBS_YES= -lposix4 -lpthread -lthread -lrt
-G++_STATIC_LDLIBS_NO= -lposix4 -lpthread -lthread -lrt
-
-RANLIB =
-# required by sun's C++ compiler
-AR = $(CCC) -xar -o
-
-ARCH_DEP_CPPFLAGS = -DSOLARIS -D_X86_
-# socket and nsl needed by libca.a
-ARCH_DEP_LDLIBS += -lsocket -lnsl
-
-# use loader's -R option
-DEPLIB_LDFLAGS += $(sort $(DEPLIB_DIRS:%=-R%))
+DEPENDS_FLAG = -xM1
 
diff --git a/configure/os/CONFIG.sun4-68k.sun4-68k b/configure/os/CONFIG.sun4-68k.sun4-68k
index fc047b336..d83c92f61 100644
--- a/configure/os/CONFIG.sun4-68k.sun4-68k
+++ b/configure/os/CONFIG.sun4-68k.sun4-68k
@@ -13,80 +13,38 @@ include $(CONFIG)/os/CONFIG.common.UnixCommon
 OS_CLASS = sun4
 ARCH_CLASS = 68k
 
+CC = cc
+CCC = CC
+CPP = $(CCC) -E
 RANLIB = ranlib -t
-
-# required by sun's C++ compiler
 AR = $(CCC) -xar -o
 
+
 # Configure OS vendor C compilers
-ACC = /usr/lang/acc
-ACC_CONFORM_CFLAGS_ANSI = -Xa
-ACC_CONFORM_CFLAGS_STRICT = -Xc
-ACC_CONFORM_CFLAGS_TRAD = -Xs
-ACC_CODE_CFLAGS = -pic
-ACC_WARN_YES = -vc
-ACC_WARN_NO = -w
-ACC_OPT_YES = -O
-ACC_OPT_NO = -g
-ACC_STATIC_CFLAGS_YES= -Bstatic
-ACC_STATIC_CFLAGS_NO=
-ACC_STATIC_LDLIBS_YES=
-ACC_STATIC_LDLIBS_NO=
-#ACC_OP_SYS_LDFLAGS = -L$(SPECIAL_LANG)
-ACC_SHRLIB_LDFLAGS_YES = -assert pure-text -h $@
+CONFORM_CFLAGS_ANSI = -Xa
+CONFORM_CFLAGS_STRICT = -Xc
+CONFORM_CFLAGS_TRAD = -Xs
+CODE_CFLAGS = -pic
+WARN_CFLAGS_YES = -vc
+WARN_CFLAGS_NO = -w
+OPT_CFLAGS_YES = -O
+OPT_CFLAGS_NO = -g
 
-SUNCC = cc
-SUNCC_CONFORM_CFLAGS_NORMAL = echo SUNCC_ANSI not defined
-SUNCC_CONFORM_CFLAGS_STRICT = echo SUNCC_STRICT not defined
-SUNCC_CMPLR_TRAD = $(SUNCC)
-SUNCC_CODE_CFLAGS = -pic
-SUNCC_WARN_YES =
-SUNCC_WARN_NO = -w
-SUNCC_OPT_YES = -O
-SUNCC_OPT_NO = -g
-SUNCC_STATIC_CFLAGS_YES= -Bstatic
-SUNCC_STATIC_CFLAGS_NO=
-SUNCC_STATIC_LDLIBS_YES=
-SUNCC_STATIC_LDLIBS_NO=
-SUNCC_SHRLIB_LDFLAGS_YES = -assert pure-text -h $@
+CONFORM_CFLAGS_NORMAL =
+CONFORM_CFLAGS_STRICT =
+CONFORM_CFLAGS_TRAD = 
+CODE_CFLAGS = -pic
+WARN_CFLAGS_YES =
+WARN_CFLAGS_NO = -w
+OPT_CFLAGS_YES = -O
+OPT_CFLAGS_NO = -g
 
-# Configure OS vendor C++ compiler
-CCC = /usr/lang/CC
-CCC_CONFORM_CFLAGS_NORMAL =
-CCC_CONFORM_CFLAGS_STRICT =
-CCC_TEMPL_INST_FLAG =
-CCC_CODE_CFLAGS = -pic
-CCC_WARN_YES =
-CCC_WARN_NO =
-CCC_TEMPL_INST_FLAG =
-CCC_WARN_YES = +w
-CCC_WARN_NO = 
-CCC_OPT_YES = -O
-CCC_OPT_NO = -g
-CCC_STATIC_CFLAGS_YES= -Bstatic
-CCC_STATIC_CFLAGS_NO=
-CCC_STATIC_LDLIBS_YES=
-CCC_STATIC_LDLIBS_NO=
-CCC_DEPENDS_FLAG = -xM1
-CCC_SHRLIB_LDFLAGS_YES = -assert pure-text -h $@
+STATIC_LDFLAGS_YES= -Bstatic
+STATIC_LDFLAGS_NO=
+STATIC_LDLIBS_YES= -Bdynamic
+STATIC_LDLIBS_NO=
 
-ACC_CPP = cpp
+SHRLIB_LDFLAGS_YES = -assert pure-text -h $@
 
-#Configure gnu compiler
-GCC = gcc
-G++ = g++
-GCC_CPP = $(GCC) -x c -E
-
-GCC_ANSI += -D__USE_FIXED_PROTOTYPES__
-GCC_STRICT += -D__USE_FIXED_PROTOTYPES__
-
-ACC_ARCH_DEP_LDLIBS =
-GCC_ARCH_DEP_LDLIBS = -liberty
-ARCH_DEP_LDLIBS = $($(ANSI)_ARCH_DEP_LDLIBS) -lposix4 -lpthread -lthread
-
-ARCH_DEP_CPPFLAGS = -DSUNOS4
-ARCH_DEP_CFLAGS =
-
-#SPECIAL_LANG = /usr/lang/SC3.0.1
-#SPECIAL_LANG = /usr/lang/lib
+DEPENDS_FLAG = -xM1
 
diff --git a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
index a2577f921..885ae5c90 100644
--- a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
+++ b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
@@ -20,13 +20,6 @@ BORLAND_BIN = $(BORLAND)\\bin
 # 	Use std path variables from ms
 HOME = $(HOMEDRIVE)$(HOMEPATH)
 
-#
-# You currently get Visual C++ even if you ask for GNU.
-#
-# !! borlund support needed here !!
-#
-ANSI = ACC
-CPLUSPLUS = CCC
 
 #
 # "\ " forces gnu make to keep this as one token
@@ -50,7 +43,7 @@ ARCMD = $(BORLAND_BIN)/tlib $@   $(foreach lib,$(LIBRARY_LD_OBJS),+$(lib))
 # -D_WIN32 macro defined to be consistant with Microsoft Visual C++
 # -D_RTLDLL macro defined to use Borland C++ RTL library
 CCLINKOPT = -q -tWM -tWD -a8 -D_WIN32 -D_RTLDLL
-ACC = $(BORLAND_BIN)/bcc32 $(CCLINKOPT)
+CC = $(BORLAND_BIN)/bcc32 $(CCLINKOPT)
 
 #
 # __STDC__=0 works but not as cleanly as with
@@ -60,13 +53,14 @@ ACC = $(BORLAND_BIN)/bcc32 $(CCLINKOPT)
 # by defining NO_BORLAND_STDC in the Makefile.
 #
 ifdef NO_BORLAND_STDC
-ACC_CONFORM_CFLAGS_ANSI =
-ACC_CONFORM_CFLAGS_STRICT =
+CONFORM_CFLAGS_ANSI =
+CONFORM_CFLAGS_STRICT =
 else
-ACC_CONFORM_CFLAGS_ANSI = -D__STDC__=0
-ACC_CONFORM_CFLAGS_STRICT = -D__STDC__=0
+CONFORM_CFLAGS_ANSI = -D__STDC__=0
+CONFORM_CFLAGS_STRICT = -D__STDC__=0
 endif
-ACC_CONFORM_CFLAGS_TRAD =
+CONFORM_CFLAGS_TRAD =
+TEMPL_INST_CXXFLAG =
 
 # -w display warnings on
 # -g0 no limit to warning messages
@@ -75,9 +69,9 @@ ACC_CONFORM_CFLAGS_TRAD =
 # -w-8012 Comparing signed and unsigned values
 # -w-8060 Possibly incorrect assignment
 # -w-8071 Conversion may lose significant digits
-ACC_WARN_YES = -w -g0 -w-8012 -w-8060 -w-8071
+WARN_CFLAGS_YES = -w -g0 -w-8012 -w-8060 -w-8071
 # -w- display warnings off
-ACC_WARN_NO =  -w-
+WARN_CFLAGS_NO =  -w-
 
 #
 # -k- turn off standard stack frame
@@ -86,19 +80,13 @@ ACC_WARN_NO =  -w-
 # -O1 optimization for size
 # -v- turn off source debugging
 # -vi control expansion of inline functions
-ACC_OPT_YES = -k- -H- -R- -O1 -v- -vi
+OPT_CFLAGS_YES = -k- -H- -R- -O1 -v- -vi
 
 #
-ACC_OPT_NO =
-
-#
-# no special libs for static link
-#
-ACC_STATIC_LDLIBS_YES= 
-ACC_STATIC_LDLIBS_NO=
+OPT_CFLAGS_NO =
 
 # OS vendor c preprocessor
-##############ACC_CPP = $(BORLAND_BIN)/cl  /E
+CPP = $(BORLAND_BIN)/cl  /E
 
 # Configure OS vendor C++ compiler
 #
@@ -109,23 +97,19 @@ ACC_STATIC_LDLIBS_NO=
 # by defining NO_BORLAND_STDC in the Makefile.
 #
 CCC = $(BORLAND_BIN)/bcc32 $(CCLINKOPT)
-ifdef NO_BORLAND_STDC
-CCC_NORMAL = $(CCC)
-CCC_STRICT = $(CCC)
-else
-CCC_CONFORM_CFLAGS_NORMAL = -D__STDC__=0
-CCC_CONFORM_CFLAGS_STRICT = -D__STDC__=0
+ifndef NO_BORLAND_STDC
+CONFORM_CXXFLAGS_NORMAL = -D__STDC__=0
+CONFORM_CXXFLAGS_STRICT = -D__STDC__=0
 endif
-CCC_TEMPL_INST_FLAG =
 
 # -w display warnings on
 # -g0 no limit to warning messages
 # -w-8012 Comparing signed and unsigned values
 # -w-8060 Possibly incorrect assignment
 # -w-8071 Conversion may lose significant digits
-CCC_WARN_YES = -w -g0 -w-8012 -w-8060 -w-8071
+WARN_CXXFLAGS_YES = -w -g0 -w-8012 -w-8060 -w-8071
 # -w- display warnings off
-CCC_WARN_NO = -w-
+WARN_CXXFLAGS_NO = -w-
 
 #
 # -k- turn off standard stack frame
@@ -134,16 +118,16 @@ CCC_WARN_NO = -w-
 # -O1 optimization for size
 # -v- turn off source debugging
 # -vi control expansion of inline functions
-CCC_OPT_YES = -k- -H- -R- -O1 -v- -vi
+OPT_CXXFLAGS_YES = -k- -H- -R- -O1 -v- -vi
 
 #
-CCC_OPT_NO =
+OPT_CXXFLAGS_NO =
 
 #
 # no special libs for static link
 #
-CCC_STATIC_LDLIBS_YES=
-CCC_STATIC_LDLIBS_NO=
+STATIC_LDLIBS_YES=
+STATIC_LDLIBS_NO=
  
 PROD_VERSION=3.13
 # -c case sensitive linking
@@ -194,19 +178,19 @@ OP_SYS_LDLIBS =
 #
 # specify dll .def file only if it exists
 #
-#DLL_DEF_FLAG = $(addprefix /def:,$(wildcard ../$(LIBRARY).def))
-DLL_DEF_FLAG = $(subst /,\\,$(wildcard ../$(LIBRARY).def))
+#DLL_DEF_FLAG = $(addprefix /def:,$(wildcard ../$(addsuffix .def,$(LIBRARY))))
+DLL_DEF_FLAG = $(subst /,\\,$(wildcard ../$(addsuffix .def,$(LIBRARY))))
 
 #   HOST_OPT_FLAGS is part of CFLAGS/CXXFLAGS,
 #   which in turn are used in COMPILE.c[c]
 #
 #   If we compile a .c, .cc into an $(OBJ),
 #   we test if this object is part of the
-#   library objects LIBRARY_LD_OBJS.
+#   library objects LIBOBJS_HOST.
 #   If so, we define _WINDLL so that
 #   e.g. include/shareLib.h works correctly.
 #
-HOST_OPT_FLAGS += $(subst $@, /_WINDLL, $(findstring $@,$(LIBRARY_LD_OBJS)))
+OPT_CFLAGS_YES += $(subst $@, /_WINDLL, $(findstring $@,$(LIBOBJS_HOST)))
 
 #
 #   A WIN32 dll has three parts:
@@ -215,7 +199,8 @@ HOST_OPT_FLAGS += $(subst $@, /_WINDLL, $(findstring $@,$(LIBRARY_LD_OBJS)))
 #   x.exp: what you need to build the dll (in no variable)
 #
 LINK.shrlib = $(WINLINK) $(WIN32_DLLFLAGS) -L$(BORLAND_LIB) -L$(BORLAND_LIB)\\Psdk c0d32.obj
-LINK.shrlib+= $(LIBRARY_LD_OBJS) , $@ ,,$(LINKLIBS)  $(subst /,\\,$(SHRLIB_LDLIBS))
+LINK.shrlib+= $(LIBRARY_LD_OBJS) , $@ ,,$(LINKLIBS)  $(subst /,\\,$(SHRLIB_LDLIBS)),
+LINK.shrlib+= $(DLL_DEF_FLAG),$(LIBRARY_LD_RESS)
 
 
 #	adjust names of libraries to build
diff --git a/configure/os/CONFIG.win32-x86.Common b/configure/os/CONFIG.win32-x86.Common
index 34e4e9a3d..4581c4452 100644
--- a/configure/os/CONFIG.win32-x86.Common
+++ b/configure/os/CONFIG.win32-x86.Common
@@ -20,7 +20,3 @@ OSITHREAD_USE_DEFAULT_STACK = NO
 
 HOSTEXE=.exe
 
-#--------------------------------------------------
-# Use C++ constructors to register commands/programs (snc +i option)
-CPPSNCFLAGS += -x c
-TARGET_SNCFLAGS += +i
diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86
index 2d0e44442..3e828f6fc 100644
--- a/configure/os/CONFIG.win32-x86.win32-x86
+++ b/configure/os/CONFIG.win32-x86.win32-x86
@@ -16,14 +16,6 @@ VALID_BUILDS = Host Ioc
 # 	Use std path variables from ms
 HOME = $(HOMEDRIVE)$(HOMEPATH)
 
-#
-# You currently get Visual C++ even if you ask for GNU.
-#
-# !! borlund support needed here !!
-#
-ANSI = ACC
-CPLUSPLUS = CCC
-
 #
 # "\ " forces gnu make to keep this as one token
 #
@@ -41,7 +33,7 @@ DEPENDS_RULE =  @echo depends target not supported
 
 #
 # Configure OS vendor C compiler
-ACC = cl 
+CC = cl 
 
 #
 # __STDC__=0 is a real great idea of Jeff that gives us both:
@@ -51,25 +43,25 @@ ACC = cl
 #
 # Use of /Za would dissable DLL import/export keywords which
 # include/excludes using architecture neutral macros
-ACC_CONFORM_CFLAGS_ANSI = /nologo /D__STDC__=0 
-ACC_CONFORM_CFLAGS_STRICT = /nologo /D__STDC__=0 
-ACC_CONFORM_CFLAGS_TRAD = /nologo
+CONFORM_CFLAGS_ANSI = /nologo /D__STDC__=0 
+CONFORM_CFLAGS_STRICT = /nologo /D__STDC__=0 
+CONFORM_CFLAGS_TRAD = /nologo
 
 #
 # /W<N> use warning level N
 # (maximum (lint type) warnings at level 4)
-ACC_WARN_YES = /W3
-ACC_WARN_NO =  /W1
+WARN_CFLAGS_YES = /W3
+WARN_CFLAGS_NO =  /W1
 
 #
 # /Ox maximum optimizations
 # /MD use MSVCRT (run-time as DLL, multi-thread support)
-ACC_OPT_YES = /Ox
+OPT_CFLAGS_YES = /Ox
 
 #
 # /Zi include debugging info in object files
 # /Fr create source browser file
-ACC_OPT_NO = /Zi /Fr
+OPT_CFLAGS_NO = /Zi /Fr
 
 #
 # the following options are required when
@@ -86,17 +78,11 @@ VISC_DLL = $(VISC_DLL_$(SHARED_LIBRARIES))
 VISC_STATIC_CFLAGS_DEBUG_NO = d
 VISC_STATIC_CFLAGS_DEBUG_YES =
 VISC_STATIC_CFLAGS_DEBUG = $(VISC_STATIC_CFLAGS_DEBUG_$(HOST_OPT))
-ACC_STATIC_CFLAGS_YES= /MT$(VISC_STATIC_CFLAGS_DEBUG) $(VISC_DLL)
-ACC_STATIC_CFLAGS_NO= /MD$(VISC_STATIC_CFLAGS_DEBUG) $(VISC_DLL)
-
-#
-# no special libs for static link
-#
-ACC_STATIC_LDLIBS_YES= ws2_32.lib advapi32.lib user32.lib kernel32.lib winmm.lib
-ACC_STATIC_LDLIBS_NO=
+STATIC_CFLAGS_YES= /MT$(VISC_STATIC_CFLAGS_DEBUG) $(VISC_DLL)
+STATIC_CFLAGS_NO= /MD$(VISC_STATIC_CFLAGS_DEBUG) $(VISC_DLL)
 
 # OS vendor c preprocessor
-ACC_CPP = cl  /E
+CPP = cl  /E
 
 # Configure OS vendor C++ compiler
 #
@@ -108,24 +94,24 @@ ACC_CPP = cl  /E
 # Use of /Za would dissable DLL import/export keywords which
 # include/excludes using architecture neutral macros
 CCC = cl 
-CCC_CONFORM_CFLAGS_NORMAL = /nologo /D__STDC__=0 /GX
-CCC_CONFORM_CFLAGS_STRICT = /nologo /D__STDC__=0 /GX
-CCC_TEMPL_INST_FLAG =
+CONFORM_CXXFLAGS_NORMAL = /nologo /D__STDC__=0 /GX
+CONFORM_CXXFLAGS_STRICT = /nologo /D__STDC__=0 /GX
+TEMPL_INST_CXXFLAG =
 
 #
 # /W<N> use warning level N
 # (maximum lint level warnings at level 4)
-CCC_WARN_YES = /W3
-CCC_WARN_NO =  /W1
+WARN_CXXFLAGS_YES = /W3
+WARN_CXXFLAGS_NO =  /W1
 
 #
 # /Ox maximum optimizations
-CCC_OPT_YES = /Ox
+OPT_CXXFLAGS_YES = /Ox
 
 #
 # /Zi include debugging info in object files
 # /Fr create source browser file
-CCC_OPT_NO = /Zi /Fr
+OPT_CXXFLAGS_NO = /Zi /Fr
 
 #
 # the following options are required when
@@ -136,14 +122,14 @@ CCC_OPT_NO = /Zi /Fr
 # /MTd static multithreaded C RTL (debug version)
 # /MD multithreaded C RTL in DLL
 # /MDd multithreaded C RTL in DLL (debug version)
-CCC_STATIC_CFLAGS_YES= /MT$(VISC_STATIC_CFLAGS_DEBUG) $(VISC_DLL)
-CCC_STATIC_CFLAGS_NO= /MD$(VISC_STATIC_CFLAGS_DEBUG) $(VISC_DLL)
+STATIC_CXXFLAGS_YES= /MT$(VISC_STATIC_CFLAGS_DEBUG) $(VISC_DLL)
+STATIC_CXXFLAGS_NO= /MD$(VISC_STATIC_CFLAGS_DEBUG) $(VISC_DLL)
 
 #
 # no special libs for static link
 #
-CCC_STATIC_LDLIBS_YES=ws2_32.lib advapi32.lib user32.lib kernel32.lib winmm.lib
-CCC_STATIC_LDLIBS_NO= 
+STATIC_LDLIBS_YES=ws2_32.lib advapi32.lib user32.lib kernel32.lib winmm.lib
+STATIC_LDLIBS_NO= 
  
 LINK_OPT_FLAGS_YES = /WARN:3 /incremental:no /opt:ref\
 /release $(PROD_VERSION:%=/version:%)
@@ -199,7 +185,7 @@ WIN32_DLLFLAGS = /subsystem:windows /dll $(OPT_LDFLAGS)
 #
 # specify dll .def file only if it exists
 #
-DLL_DEF_FLAG = $(addprefix /def:,$(wildcard ../$(BUILD_LIBS).def))
+DLL_DEF_FLAG = $(addprefix /def:,$(wildcard ../$(addsuffix .def,$(LIBRARY))))
 
 #	HOST_OPT_FLAGS is part of CFLAGS/CXXFLAGS,
 #	which in turn are used in COMPILE.c[c]
diff --git a/configure/os/CONFIG_SITE.Common.vxWorks-ppc604 b/configure/os/CONFIG_SITE.Common.vxWorks-ppc604
index afc2d3eb4..273b28273 100644
--- a/configure/os/CONFIG_SITE.Common.vxWorks-ppc604
+++ b/configure/os/CONFIG_SITE.Common.vxWorks-ppc604
@@ -6,5 +6,5 @@
 # Only the local epics system manager should modify this file
 
 # APS override
-#VX_DIR = /usr/local/vw/tornado101ppc
+VX_DIR = /usr/local/vw/tornado101ppc