Creating R3.14.12.3

RTEMS: Bump the version number
2012-12-17 14:13:19 -06:00 · 2012-12-17 14:11:47 -06:00 · 2012-12-13 15:52:06 -06:00 · 2012-12-13 15:50:44 -06:00 · 2012-12-13 09:35:18 -07:00 · 2012-12-11 23:38:42 +01:00
1535 changed files with 69795 additions and 61158 deletions
--- a/.bzrignore
+++ b/.bzrignore
@@ -0,0 +1,8 @@
+./bin
+./lib
+./db
+./dbd
+./html
+./include
+./templates
+**/O.*
--- a/9
+++ b/9
@@ -1,11 +1,14 @@
-Copyright (c) 1991-2004 University of Chicago and The Regents of the
-University of California. All rights reserved.
+Copyright (c) 1991-2011 UChicago Argonne LLC.
+Copyright (c) 1991-2006 The Regents of the University of California.
+Copyright (c) 2006-2011. Los Alamos National Security, LLC. Some of this
+material was produced under U.S. Government contract DE-AC52-06NA25396
+for Los Alamos National Laboratory (LANL), which is operated by Los Alamos
+National Security, LLC for the U.S. Department of Energy.

 EPICS BASE is distributed subject to the following license conditions:

 SOFTWARE LICENSE AGREEMENT
 Software: EPICS BASE
- Versions: 3.13.7 and higher

 1. The "Software", below, refers to EPICS BASE (in either source code, or
    binary form and accompanying documentation). Each licensee is
--- a/12
+++ b/12
@@ -8,14 +8,22 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
-# $Id$
+# $Revision-Id$
 #

 TOP = .
 include $(TOP)/configure/CONFIG

-DIRS += config config/tools
+# Bootstrap resolution: tools not installed yet
+TOOLS = $(TOP)/src/tools
+
 DIRS += configure src
+ifeq ($(findstring YES,$(COMPAT_313) $(COMPAT_TOOLS_313)),YES)
+DIRS += config
+endif
+
+src_DEPEND_DIRS = configure
+config_DEPEND_DIRS = src

 include $(TOP)/configure/RULES_TOP

--- a/config/CONFIG
+++ b/config/CONFIG
@@ -8,7 +8,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
-#  $Id$
+#  $Revision-Id$
 #
 #  The developer may edit this file.
 # assume T_A is the host arch if not specified
--- a/config/CONFIG.Host.Linux
+++ b/config/CONFIG.Host.Linux
@@ -29,7 +29,7 @@ G++_SHRLIB_LDFLAGS_YES +=  -Wl,-soname,$@

 OP_SYS_CFLAGS += -D_BSD_SOURCE

-ARCH_DEP_CFLAGS = -D_X86_ -Dlinux -mcpu=pentium
+ARCH_DEP_CFLAGS = -D_X86_ -Dlinux
 ARCH_DEP_LDLIBS += -lpthread -lreadline -lcurses -lrt

 #Allows R3.13 built extensions to load R3.14 shared libs
--- a/config/CONFIG.Host.LynxOS
+++ b/config/CONFIG.Host.LynxOS
@@ -1,65 +0,0 @@
-#*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-#     National Laboratory.
-# Copyright (c) 2002 The Regents of the University of California, as
-#     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
-#*************************************************************************
-# CONFIG.Host.LynxOS
-#
-#  This file is maintained by the EPICS community.
-#  Sites may override these definitions in CONFIG_SITE.Host.LynxOS
- 
-ARCH_CLASS = LynxOS
-
-# Include definitions common to all Unix archs
-include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
-
-AR = ar -rc
-ARCMD = $(AR) $@
-RANLIB = ranlib -t
-
-
-
-# Configure OS vendor C compiler
-ACC_ANSI = $(ACC) -ansi
-ACC_STRICT = $(ACC) -ansi -pedantic
-ACC_TRAD = $(ACC)
-ACC_WARN_YES = -Wall 
-ACC_WARN_NO =  -w
-ACC_OPT_YES =  -O
-ACC_OPT_NO = -g
-ACC_SFLAGS_YES = -Bstatic
-ACC_SFLAGS_NO=
-ACC_SLIBS_YES =
-ACC_SLIBS_NO=
-ACC_SHRLIB_CFLAGS_YES = 
-ACC_SHRLIB_LDFLAGS_YES =
-
-
-
-# Configure OS vendor C++ compiler
-CCC_NORMAL = $(CCC)
-CCC_STRICT = $(CCC)
-CCC_TEMPL_INST_FLAG = -pedantic -DEXPL_TEMP
-CCC_WARN_YES = -Wall
-CCC_WARN_NO = -w
-CCC_OPT_YES =  -O
-CCC_OPT_NO = -g
-CCC_SFLAGS_YES = -Bstatic
-CCC_SFLAGS_NO=
-CCC_SLIBS_YES = 
-CCC_SLIBS_NO=
-CCC_DEPENDS_FLAG = -pedantic
-
-
-# added smh 6/5/98 : when building fdmgr - seems to use this not ACC
-# in effect this overides orig def in CONFIG_COMMON :
-# which is GCC_STRICT = $(GCC) -ansi -pedantic
-GCC_STRICT = $(GCC)
-G++_STRICT = $(G++) -Wtraditional -DEXPL_TEMP
-
-ARCH_DEP_CFLAGS = -DLynxOS -mposix -D_X86_ -DLYNXOS_RELEASE_2_4_0
-ARCH_DEP_LDLIBS = -lc -lbsd -lnsl -lm -lposix4d9 -llynx
--- a/config/CONFIG.Host.WIN32
+++ b/config/CONFIG.Host.WIN32
@@ -96,13 +96,14 @@ ACC_SLIBS_NO=
 # Use of /Za would dissable DLL import/export keywords which
 # EPICS include/excludes using architecture neutral macros
 #
-# /GX support C++ exceptions
+# /EHsc support C++ exceptions
 # /GR generate RTTI information
 #
-CCC = cl /GX /GR
+CCC = cl /EHsc /GR
 CCC_NORMAL = $(CCC) /nologo /D__STDC__=0
 CCC_STRICT = $(CCC) /nologo /D__STDC__=0
 CCC_TEMPL_INST_FLAG =
+ARCH_DEP_CPPFLAGS += /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE

 #
 # /W<N> use warning level N
@@ -269,3 +270,14 @@ LINK.cc = $(WINLINK) -nologo $(LDFLAGS) -out:$@
 # Overrides for CONFIG_COMMON default
 POSIX_CPPFLAGS_YES = 

+#--------------------------------------------------
+# UseManifestTool.pl checks MS Visual c++ compiler version number to
+# decide whether or not to use the Manifest Tool command to embed the
+# linker created .manifest file into a library or product target.
+# useManifestTool.pl returns 0(don't use) or 1(use).
+#
+ifeq ($(shell $(PERL) $(EPICS_BASE_TOOLS)/useManifestTool.pl),1)
+MT_DLL_COMMAND = mt.exe /manifest $@.manifest "/outputresource:$@;\#2"
+MT_EXE_COMMAND = mt.exe /manifest $@.manifest "/outputresource:$@;\#1"
+endif
+
--- a/config/CONFIG.Host.alpha
+++ b/config/CONFIG.Host.alpha
@@ -1,57 +0,0 @@
-#*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-#     National Laboratory.
-# Copyright (c) 2002 The Regents of the University of California, as
-#     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
-#*************************************************************************
-# CONFIG.Host.alpha
-#
-#  This file is maintained by the EPICS community.
-#  Sites may override these definitions in CONFIG_SITE.Host.alpha
-
-ARCH_CLASS = alpha
-
-# Include definitions common to all Unix archs
-include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
-
-AR = ar
-
-# Configure OS vendor C compiler
-ACC = cc
-ACC_ANSI = $(ACC) -std
-ACC_STRICT = $(ACC) -std1
-ACC_TRAD = $(ACC) -std0
-ACC_WARN_YES = 
-ACC_WARN_NO =  -w
-ACC_OPT_YES =  -O
-ACC_OPT_NO = -g
-ACC_SFLAGS_YES= -non_shared
-ACC_SFLAGS_NO= -call_shared
-ACC_SLIBS_YES =
-ACC_SLIBS_NO=
-ACC_SHRLIB_CFLAGS_YES =
-ACC_SHRLIB_LDFLAGS_YES = -shared
-
-# Configure OS vendor C++ compiler
-CCC = cxx
-CCC_NORMAL = $(CCC)
-CCC_STRICT = $(CCC)
-CCC_TEMPL_INST_FLAG = -DEXPL_TEMPL
-CCC_WARN_YES =
-CCC_WARN_NO =
-CCC_OPT_YES =  -O
-CCC_OPT_NO = -g
-CCC_SFLAGS_YES=
-CCC_SFLAGS_NO=
-CCC_SLIBS_YES =
-CCC_SLIBS_NO=
-CCC_SHRLIB_CFLAGS_YES =
-CCC_SHRLIB_LDFLAGS_YES = -shared
-CCC_DEPENDS_FLAG =
-
-ARCH_DEP_CFLAGS = -D_OSF_SOURCE
-ARCH_DEP_LDLIBS =
-
--- a/config/CONFIG.Host.cygwin-x86
+++ b/config/CONFIG.Host.cygwin-x86
@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+
+# cygwin-x86 is the new name for cygwin32
+-include $(EPICS_BASE)/config/CONFIG.Host.cygwin32
--- a/config/CONFIG.Host.cygwin32
+++ b/config/CONFIG.Host.cygwin32
@@ -20,6 +20,17 @@ include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon

 EXE=.exe

+#==========================
+#These overrides remove -ansi because -ansi eliminates strdup
+GCC_ANSI = $(GCC)
+GCC_STRICT = $(GCC) -pedantic
+G++_NORMAL = $(G++) -pedantic
+G++_STRICT = $(G++) -pedantic
+
+#==========================
+#This override will eliminate warnings for old R3.13 extensions
+#GCC_WARN_YES =
+
 #==========================
 # These are overrides of ANSI and CPLUSPLUS values in CONFIG_SITE
 # since OS vendor compilers ACC and CCC are not defined here for cygwin32
@@ -32,7 +43,7 @@ SHARED_LIBRARIES=NO
 #OP_SYS_INCLUDES += /usr/local/include/g++
 #==========================
 
-ARCH_DEP_CFLAGS = -DCYGWIN32 -U_WIN32
+ARCH_DEP_CPPFLAGS = -DCYGWIN32 -U_WIN32
 ARCH_DEP_LDLIBS =
 OP_SYS_LDLIBS =

@@ -41,7 +52,9 @@ OP_SYS_LDLIBS =
 GCC_DEP_CFLAGS = -D_REENTRANT
 G++_DEP_CFLAGS = -D_REENTRANT

-POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE
+#POSIX_SOURCE eliminates select()
+#POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE
+POSIX_CPPFLAGS_YES = -D_POSIX_THREADS -D_POSIX_TIMERS

 # Runtime ldflags
 RUNTIME_LIBS =$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
--- a/config/CONFIG.Host.darwin-ppc
+++ b/config/CONFIG.Host.darwin-ppc
@@ -7,6 +7,6 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 -include $(EPICS_BASE)/config/CONFIG.Host.Darwin
--- a/config/CONFIG.Host.darwin-ppcx86
+++ b/config/CONFIG.Host.darwin-ppcx86
@@ -0,0 +1,14 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.Darwin
+OP_SYS_CFLAGS += "-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
+OP_SYS_LDFLAGS += "-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
--- a/config/CONFIG.Host.darwin-x86
+++ b/config/CONFIG.Host.darwin-x86
@@ -7,7 +7,6 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

-# osf-alpha is the new name for alpha
-include $(EPICS_BASE)/config/CONFIG.Host.alpha
+-include $(EPICS_BASE)/config/CONFIG.Host.Darwin
--- a/config/CONFIG.Host.freebsd
+++ b/config/CONFIG.Host.freebsd
@@ -0,0 +1,35 @@
+#*************************************************************************
+# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+#
+#  This file is maintained by the EPICS community.
+#  Sites may override these definitions in CONFIG_SITE.Host.freebsd
+ 
+OS_CLASS = freebsd
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
+
+CODE_CPPFLAGS = -D_REENTRANT
+
+POSIX_CPPFLAGS = -D_POSIX_THREADS
+POSIX_LDLIBS = -lpthread
+
+# -D_BSD_SOURCE for gethostname() in unistd.h as needed by cacChannelIO.cpp.
+OP_SYS_CPPFLAGS += -D_BSD_SOURCE
+OP_SYS_CPPFLAGS += -Dfreebsd
+
+# Set runtime path for shared libraries
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
+
+#  Definitions used when COMMANDLINE_LIBRARY is READLINE
+LDLIBS_READLINE = -lreadline -lcurses
+
+GNU_LDLIBS_YES = -lgcc_pic
+
--- a/config/CONFIG.Host.freebsd-x86
+++ b/config/CONFIG.Host.freebsd-x86
@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+
+ARCH_CLASS = x86
+
+-include $(EPICS_BASE)/config/CONFIG.Host.freebsd
+
+ARCH_DEP_CPPFLAGS += -D_X86_
--- a/config/CONFIG.Host.freebsd-x86_64
+++ b/config/CONFIG.Host.freebsd-x86_64
@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+
+ARCH_CLASS = x86_64
+
+-include $(EPICS_BASE)/config/CONFIG.Host.freebsd
+
+ARCH_DEP_CPPFLAGS += -D_X86_64_
--- a/config/CONFIG.Host.hpux-parisc
+++ b/config/CONFIG.Host.hpux-parisc
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # hpux-parisc is the new name for hp700
 -include $(EPICS_BASE)/config/CONFIG.Host.hp700
--- a/config/CONFIG.Host.linux-ppc
+++ b/config/CONFIG.Host.linux-ppc
@@ -0,0 +1,24 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.Linux
+
+ARCH_CLASS = ppc
+
+ARCH_DEP_CPPFLAGS += -D_ppc_
+
+GNU_DIR = /usr
+
+GCC = $(GNU_BIN)/gcc
+G++ = $(GNU_BIN)/g++
+
+ARCH_DEP_LDLIBS = -lgcc
+
--- a/config/CONFIG.Host.linux-x86
+++ b/config/CONFIG.Host.linux-x86
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # linux-x86 is the new name for linux
 -include $(EPICS_BASE)/config/CONFIG.Host.Linux
--- a/config/CONFIG.Host.linux-x86-debug
+++ b/config/CONFIG.Host.linux-x86-debug
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 #*************************************************************************
 # Copyright (c) 2002 The University of Chicago, as Operator of Argonne
 #     National Laboratory.
@@ -8,9 +7,6 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
- 
-use Cwd;
+# $Revision-Id$

-chdir $ARGV[0];
-
-print cwd();
+-include $(EPICS_BASE)/config/CONFIG.Host.Linux
--- a/config/CONFIG.Host.linux-x86_64
+++ b/config/CONFIG.Host.linux-x86_64
@@ -0,0 +1,17 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.Linux
+
+ARCH_CLASS = Linux
+
+ARCH_DEP_CFLAGS = -D_X86_64_ -Dlinux
+
--- a/config/CONFIG.Host.linux-x86_64-debug
+++ b/config/CONFIG.Host.linux-x86_64-debug
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.linux-x86_64

-# osf-alpha is the new name for alpha
-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.alpha
--- a/config/CONFIG.Host.solaris
+++ b/config/CONFIG.Host.solaris
@@ -67,18 +67,23 @@ CCC_SHRLIB_LDFLAGS_YES =  -G -h $@

 SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 ARCH_DEP_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) 
-POSIX_CPPFLAGS_YES += -D__EXTENSIONS__
+POSIX_CPPFLAGS_YES += -D__EXTENSIONS__ -mt

-# socket and nsl needed by libca.a
+ARCH_DEP_LDFLAGS += -mt
+
+# socket and nsl needed by libca.a when SHARED_LIBRARIES = NO
 ARCH_DEP_LDLIBS += -lsocket -lnsl
 ARCH_DEP_LDLIBS += -lposix4 -lpthread
-ARCH_DEP_LDLIBS_8 = -lCrun
-ARCH_DEP_LDLIBS_9 = -lCrun
+
+ARCH_DEP_LDLIBS_8 += -lCrun -lc -lCstd
+ARCH_DEP_LDLIBS_9 += -lCrun -lc -lCstd
+ARCH_DEP_LDLIBS_10 += -lCrun -lc -lCstd
 ARCH_DEP_LDLIBS += $(ARCH_DEP_LDLIBS_$(SOLARIS_VERSION))

 #Allows R3.13 built extensions to load R3.14 shared libs
 SYS_DLL_LIBS_solaris_8 = Crun
 SYS_DLL_LIBS_solaris_9 = Crun
+SYS_DLL_LIBS_solaris_10 = Crun
 SYS_DLL_LIBS_solaris += posix4 pthread $(SYS_DLL_LIBS_solaris_$(SOLARIS_VERSION))

 # Runtime ldflags
--- a/config/CONFIG.Host.solaris-sparc
+++ b/config/CONFIG.Host.solaris-sparc
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # solaris-sparc is the new name for solaris
 -include $(EPICS_BASE)/config/CONFIG.Host.solaris
--- a/config/CONFIG.Host.solaris-sparc-debug
+++ b/config/CONFIG.Host.solaris-sparc-debug
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # solaris-sparc is the new name for solaris
 -include $(EPICS_BASE)/config/CONFIG.Host.solaris
--- a/config/CONFIG.Host.solaris-sparc-gnu
+++ b/config/CONFIG.Host.solaris-sparc-gnu
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # solaris-sparc is the new name for solaris
 -include $(EPICS_BASE)/config/CONFIG.Host.solarisGnu
--- a/config/CONFIG.Host.solaris-sparc-staticlib
+++ b/config/CONFIG.Host.solaris-sparc-staticlib
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # solaris-sparc is the new name for solaris
 -include $(EPICS_BASE)/config/CONFIG.Host.solaris
--- a/config/CONFIG.Host.solaris-sparc64
+++ b/config/CONFIG.Host.solaris-sparc64
@@ -0,0 +1,18 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+
+# solaris-sparc is the new name for solaris
+-include $(EPICS_BASE)/config/CONFIG.Host.solaris
+
+ARCH_DEP_CFLAGS += -xarch=generic64
+ARCH_DEP_CXXFLAGS += -xarch=generic64
+ARCH_DEP_LDFLAGS += -xarch=generic64
+
--- a/config/CONFIG.Host.solaris-sparc64-gnu
+++ b/config/CONFIG.Host.solaris-sparc64-gnu
@@ -0,0 +1,18 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+
+# solaris-sparc is the new name for solaris
+-include $(EPICS_BASE)/config/CONFIG.Host.solarisGnu
+
+ARCH_DEP_CFLAGS += -mcpu=v9 -m64
+ARCH_DEP_CXXFLAGS += -mcpu=v9 -m64
+ARCH_DEP_LDFLAGS += -mcpu=v9 -m64
+
--- a/config/CONFIG.Host.solaris-x86-gnu
+++ b/config/CONFIG.Host.solaris-x86-gnu
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# CONFIG.Host.solaris-x86
+# CONFIG.Host.solaris-x86-gnu
 #
 #  This file is maintained by the EPICS community.
 #  Sites may override these definitions in CONFIG_SITE.Host.solaris-x86
--- a/config/CONFIG.Host.solarisGnu
+++ b/config/CONFIG.Host.solarisGnu
@@ -12,20 +12,7 @@
 #  This file is maintained by the EPICS community.
 #  Sites may override these definitions in CONFIG_SITE.Host.solarisGnu

-ARCH_CLASS = solaris
-
-# Include definitions common to all Unix archs
-include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
-
-#
-# required by sun's C++ compiler
-#
-AR = ar
-_AR = $(AR) $(ARFLAGS)
-G++_AR = $(_AR)
-CCC_AR = $(CCC) -xar -o
-ARCMD = $($(CPLUSPLUS)_AR) $@
-RANLIB =
+include $(EPICS_BASE)/config/CONFIG.Host.solaris

 #==========================
 # These are overrides of ANSI and CPLUSPLUS values in CONFIG_SITE
@@ -33,23 +20,3 @@ ANSI=GCC
 CPLUSPLUS=G++
 #==========================

-SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
-ARCH_DEP_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) 
-POSIX_CPPFLAGS_YES += -D__EXTENSIONS__
-
-# socket and nsl needed by libca.a
-ARCH_DEP_LDLIBS += -lsocket -lnsl
-ARCH_DEP_LDLIBS += -lposix4 -lpthread
-ARCH_DEP_LDLIBS_8 = -lCrun
-ARCH_DEP_LDLIBS_9 = -lCrun
-ARCH_DEP_LDLIBS += $(ARCH_DEP_LDLIBS_$(SOLARIS_VERSION))
-
-#Allows R3.13 built extensions to load R3.14 shared libs
-SYS_DLL_LIBS_solaris_8 = Crun
-SYS_DLL_LIBS_solaris_9 = Crun
-SYS_DLL_LIBS_solaris += posix4 pthread $(SYS_DLL_LIBS_solaris_$(SOLARIS_VERSION))
-
-# Runtime ldflags
-RUNTIME_LDFLAGS =$(addprefix -R,$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
- $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH))
-
--- a/config/CONFIG.Host.sun4-sparc
+++ b/config/CONFIG.Host.sun4-sparc
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # sun4-sparc is the new name for sun4
 -include $(EPICS_BASE)/config/CONFIG.Host.sun4
--- a/config/CONFIG.Host.win32-x86
+++ b/config/CONFIG.Host.win32-x86
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # win32-x86 is the new name for WIN32
 -include $(EPICS_BASE)/config/CONFIG.Host.WIN32
--- a/config/CONFIG.Host.win32-x86-borland
+++ b/config/CONFIG.Host.win32-x86-borland
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # win32-x86-borland is the new name for Borland
 -include $(EPICS_BASE)/config/CONFIG.Host.Borland
--- a/config/CONFIG.Host.win32-x86-cygwin
+++ b/config/CONFIG.Host.win32-x86-cygwin
@@ -0,0 +1,62 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+#
+#  This file is maintained by the EPICS community.
+#  Sites may override these definitions in CONFIG_SITE.Host.win32-x86-cygwin
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
+
+EXE = .exe
+
+SHARED_LIBRARIES = NO
+ 
+ARCH_CLASS = WIN32
+
+AR = ar -rc
+ARCMD = $(AR) $@
+RANLIB = ranlib -t
+
+ANSI=GCC
+CPLUSPLUS=G++
+
+# Dont use -ansi: -ansi eliminates strdup and _tempnam
+GCC_ANSI = $(GCC)
+GCC_STRICT = $(GCC) -pedantic
+G++_NORMAL = $(G++) -pedantic
+G++_STRICT = $(G++) -pedantic
+
+# Dont use -fPIC: with -fPIC we get
+# "warning: -fPIC ignored for target (all code is position independent) "
+GCC_DEP_CFLAGS =
+G++_DEP_CFLAGS =
+
+OP_SYS_CFLAGS =
+OP_SYS_CPPFLAGS = -mno-cygwin
+OP_SYS_CXXFLAGS += -D__cplusplus
+OP_SYS_LDFLAGS += -mno-cygwin
+
+POSIX_CPPFLAGS_YES = 
+
+# With no-cygwin option:
+#       compiler defines _X86_ 1
+#       compiler defines __MSVCRT__ 1
+#       compiler defines __MINGW32__ 1
+#       compiler defines __WIN32 1
+#       compiler defines __WIN32__ 1
+#       compiler defines _WIN32 1
+#       compiler defines WIN32 1
+#       compiler defines WINNT 1
+#       compiler does not define  __unix __unix__ unix
+#       compiler does not define  __CYGWIN__ __CYGWIN32__
+
+ARCH_DEP_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
+
--- a/config/CONFIG.Host.win32-x86-debug
+++ b/config/CONFIG.Host.win32-x86-debug
@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.WIN32
--- a/config/CONFIG.Host.win32-x86-mingw
+++ b/config/CONFIG.Host.win32-x86-mingw
@@ -0,0 +1,58 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+#
+#  This file is maintained by the EPICS community.
+#  Sites may override these definitions in CONFIG_SITE.Host.win32-x86-mingw
+ 
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
+
+EXE = .exe
+
+SHARED_LIBRARIES = NO
+
+ARCH_CLASS = WIN32
+
+AR = ar -rc
+ARCMD = $(AR) $@
+RANLIB = ranlib -t
+
+ANSI=GCC
+CPLUSPLUS=G++
+
+# Compiler defines _X86_ 1
+
+# Compiler defines __MSVCRT__ 1
+# Compiler defines __MINGW32__ 1
+# Compiler defines __WIN32 1
+# Compiler defines __WINNT 1
+# Compiler defines __WINNT__ 1
+# Compiler defines __WIN32__ 1
+# Compiler defines _WIN32 1
+# Compiler defines WIN32 1
+# Compiler defines WINNT 1
+# Compiler does not define  __unix __unix__ unix
+
+OP_SYS_CFLAGS =
+OP_SYS_CXXFLAGS += -D__cplusplus
+
+GCC_DEP_CFLAGS =
+G++_DEP_CFLAGS =
+
+POSIX_CPPFLAGS_YES = 
+
+ARCH_DEP_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
+
+# Remove -ansi compile option for gcc (does not allow c++ type comments).
+GCC_ANSI = $(GCC)
+GCC_STRICT = $(GCC) -pedantic
+G++_NORMAL = $(G++) -pedantic
+G++_STRICT = $(G++)  -pedantic
--- a/config/CONFIG.LynxOS
+++ b/config/CONFIG.LynxOS
@@ -1,142 +0,0 @@
-#*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-#     National Laboratory.
-# Copyright (c) 2002 The Regents of the University of California, as
-#     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
-#*************************************************************************
-# $Id$
-#
-# This file contains definitions for Vx builds
-
-#--------------------------------------------------
-# operating system class (include/os/<os_class>)
-OS_CLASS = LynxOS
-
-lynx_pc486 =YES
-
-CC = gcc
-CXX = g++
-
-#--------------------------------------------------
-# vxWorks directory definitions
-
-# The definitions VX_DIR, VX_GNU, GNU_DIR and GNU_LIB
-# can be overridden for specific host architectures
-# by creating a CONFIG_SITE.Vx.<host_arch> file with
-# the override definitions.
- 
-# Tornado directory definitions
-VX_INCLUDE_YES =
-VX_GNU_YES =
-VX_GNU_BIN_YES =
-VX_GNU_LIB_YES =
-
-
-# pre Torando directory definitions
-VX_INCLUDE_NO =
-VX_GNU_NO =
-VX_GNU_BIN_NO =
- 
-# directory definitions
-VX_DIR =
-VX_INCLUDE =
-VX_GNU = 
-
-GNU_BIN = /usr/local/bin
-GNU_LIB = /usr/local/lib
-
-#--------------------------------------------------
-# VxWorks command definitions
-
-#GCC = $(GNU_BIN)/cc$(CMPLR_SUFFIX) -B$(GNU_LIB)/gcc-lib/ -nostdinc
-#AR = $(GNU_BIN)/ar$(CMPLR_SUFFIX)
-#CPP = $(GNU_BIN)/cpp$(CMPLR_SUFFIX) -nostdinc
-#RANLIB = $(GNU_BIN)/ranlib$(CMPLR_SUFFIX)
-#LD = $(GNU_BIN)/ld$(CMPLR_SUFFIX) -r
-
-AR = ar -rc
-ARCMD = $(AR) $@
-RANLIB = ranlib -t
-GCC = gcc 
-CPP = cpp
-LD = ld -r
-
-
-#--------------------------------------------------
-# Tornado C++ crosscompiler definitions
-
-#CPLUSPLUS_YES = G++
-#G++ = $(GNU_BIN)/cc$(CMPLR_SUFFIX) -B$(GNU_LIB)/gcc-lib/ -nostdinc
-#LD_G++ = $(GNU_BIN)/ld$(CMPLR_SUFFIX) -r
-#NM = $(GNU_BIN)/nm$(CMPLR_SUFFIX)
-#MUNCH = $(GNU_BIN)/munch
-
-CPLUSPLUS_YES = g++ -DLynxOS -DLynxOS_pc486 -mposix -D_X86_ -DEXPL_TEMP
-G++ = g++ -DLynxOS -DLynxOS_pc486 -mposix -D_X86_ -DEXPL_TEMP
-LD_G++ = ld -r
-NM = nm
-
-#--------------------------------------------------
-# Pre Tornado C++ crosscompiler definitions
-# These are pre tornado definitions for Hideos builds (defined for 68k only)
-
-#CPLUSPLUS_NO = CCC
-#CCC = $(GNU_DIR)/bin/sun3-g++ -B$(GNU_DIR)/lib/gcc-lib/ -nostdinc -DEXPL_TEMPL
-#LD_CCC = $(GNU_DIR)/bin/sun3-ld $(OLD_ARCH_DEP_LDFLAGS) -r
-
-CPLUSPLUS_NO = g++ -DLynxOS -DLynxOS_pc486 -mposix -D_X86_ -DEXPL_TEMP
-CCC = g++ -DLynxOS -DLynxOS_pc486 -mposix -D_X86_ -DEXPL_TEMP
-LD_CCC = ld -r
-
-CCC_NORMAL = $(CCC) $(OLD_ARCH_DEP_CFLAGS)
-CCC_STRICT = $(CCC) -ansi -pedantic -Wall -traditional $(OLD_ARCH_DEP_CFLAGS)
-CCC_TRAD = $(CCC) -traditional $(OLD_ARCH_DEP_CFLAGS)
-CCC_TEMPL_INST_FLAG = -DEXPL_TEMP
-CCC_WARN_YES = -Wall
-CCC_WARN_NO = -w
-CCC_OPT_YES = -O
-CCC_OPT_NO = -g
-CCC_DEPENDS_FLAG =  -pedantic -DLynxOS -DLynxOS_pc486 -mposix -D_X86_
-CPU = i486
-OS = lynxos
-OLD_ARCH_DEP_CFLAGS = -DLynxOS -DLynxOS_pc486 -mposix -D_X86_
-#	 --no-builtin -Wa,"-m68040" -DOS_EQ_$(OS) \
-#	-DBOARD_EQ_$(BOARD) -DCPU_EQ_$(CPU) -DBOARD=$(BOARD)
-OLD_ARCH_DEP_LDFLAGS = -mposix -lc -lbsd -lnsl -lm -lposix4d9 -llynx
-#	 -Ur -N -T$(EPICS_BASE_BIN)/vxldscript.MRI
-
-#--------------------------------------------------
-# C compiler definitions  
-ANSI = gcc -ansi
-
-#--------------------------------------------------
-# Command definitions
-CPLUSPLUS = g++
-#	 $(CPLUSPLUS_$(TORNADO))
-LD_CXX = ld -r
-#	 $(LD_$(CPLUSPLUS))
-
-#--------------------------------------------------
-# Operating system flags
-OP_SYS_INCLUDES =
-#	 -I$(VX_INCLUDE)
-OP_SYS_CFLAGS =  -DLynxOS -DLynxOS_pc486 -mposix -D_X86_
-#		-DvxWorks -DV5_vxWorks -fno-builtin 
-OP_SYS_LDFLAGS = -DLynxOS -DLynxOS_pc486 -mposix -D_X86_
-OP_SYS_LDLIBS = -lc -lbsd -lnsl -lm -lposix4d9 -llynx
-
-#--------------------------------------------------
-# Optimization flag overrides
-GCC_OPT_YES = -O	
-#	2 -fstrength-reduce
-G++_OPT_YES = -O
-#	2 -fstrength-reduce
-
-#--------------------------------------------------
-# Link definitions
-LINK.c = $(LD) $(LDFLAGS) -o
-LINK.cc = $(LD_CXX) $(LDFLAGS) -o
-
--- a/config/CONFIG.Vx
+++ b/config/CONFIG.Vx
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$
 #
 # This file contains definitions for Vx builds

@@ -20,7 +20,7 @@ OS_CLASS = vxWorks

 # The definitions VX_DIR, VX_GNU, GNU_DIR and GNU_LIB
 # can be overridden for specific host architectures
-# by creating a CONFIG_SITE.Vx.<host_archfile with
+# by creating a CONFIG_SITE.Vx.<host_arch> file with
 # the override definitions.

 # Tornado directory definitions
@@ -41,7 +41,6 @@ VX_GNU = $(VX_GNU_$(TORNADO))
 GNU_BIN = $(VX_GNU_BIN_$(TORNADO))
 GNU_LIB = $(VX_GNU_LIB_$(TORNADO))
 export GCC_EXEC_PREFIX = $(GNU_LIB)/gcc-lib/
-export WIND_BASE = $(VX_DIR)

 #--------------------------------------------------
 # VxWorks command definitions
@@ -148,4 +147,3 @@ MUNCHNAME = $(LIBNAME:%=%$(MUNCH_SUFFIX))
 export WIND_BASE = $(VX_DIR)
 export WIND_HOST_TYPE

-
--- a/config/CONFIG.Vx.frc40
+++ b/config/CONFIG.Vx.frc40
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$
 #
 # This file is maintained by the EPICS community.

--- a/config/CONFIG.Vx.hkbaja47
+++ b/config/CONFIG.Vx.hkbaja47
@@ -8,7 +8,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************

-# $Id$
+# $Revision-Id$
 #
 # This file is maintained by the EPICS community.

--- a/config/CONFIG.Vx.hkbaja60
+++ b/config/CONFIG.Vx.hkbaja60
@@ -8,7 +8,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************

-# $Id$
+# $Revision-Id$
 #
 # This file is maintained by the EPICS community.

--- a/config/CONFIG.Vx.hkv2f
+++ b/config/CONFIG.Vx.hkv2f
@@ -8,7 +8,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************

-# $Id$
+# $Revision-Id$
 #
 # This file is maintained by the EPICS community.

--- a/config/CONFIG.Vx.mv147
+++ b/config/CONFIG.Vx.mv147
@@ -8,7 +8,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************

-# $Id$
+# $Revision-Id$
 #
 # This file is maintained by the EPICS community.

--- a/config/CONFIG.Vx.mv1604
+++ b/config/CONFIG.Vx.mv1604
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$
 #
 # This file is maintained by the EPICS community.

--- a/config/CONFIG.Vx.mv162
+++ b/config/CONFIG.Vx.mv162
@@ -8,7 +8,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************

-# $Id$
+# $Revision-Id$
 #
 # This file is maintained by the EPICS community.

--- a/config/CONFIG.Vx.mv162lc
+++ b/config/CONFIG.Vx.mv162lc
@@ -8,7 +8,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************

-# $Id$
+# $Revision-Id$
 #
 # This file is maintained by the EPICS community.

--- a/config/CONFIG.Vx.mv167
+++ b/config/CONFIG.Vx.mv167
@@ -8,7 +8,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************

-# $Id$
+# $Revision-Id$
 #
 # This file is maintained by the EPICS community.

--- a/config/CONFIG.Vx.mv177
+++ b/config/CONFIG.Vx.mv177
@@ -8,7 +8,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************

-# $Id$
+# $Revision-Id$
 #
 # This file is maintained by the EPICS community.

--- a/config/CONFIG.Vx.mv2700
+++ b/config/CONFIG.Vx.mv2700
@@ -8,7 +8,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************

-# $Id$
+# $Revision-Id$
 #
 # This file is maintained by the EPICS community.

--- a/config/CONFIG.Vx.ppc603
+++ b/config/CONFIG.Vx.ppc603
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$
 #
 # This file is maintained by the EPICS community.

--- a/config/CONFIG.Vx.ppc603_long
+++ b/config/CONFIG.Vx.ppc603_long
@@ -1,4 +1,4 @@
-# $Id$
+# $Revision-Id$
 #
 # This file is maintained by the EPICS community.

--- a/config/CONFIG.Vx.ppc604
+++ b/config/CONFIG.Vx.ppc604
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$
 #
 # This file is maintained by the EPICS community.

--- a/config/CONFIG.Vx.ppc604_long
+++ b/config/CONFIG.Vx.ppc604_long
@@ -1,4 +1,4 @@
-# $Id$
+# $Revision-Id$
 #
 # This file is maintained by the EPICS community.

--- a/config/CONFIG.Vx.vxWorks-486
+++ b/config/CONFIG.Vx.vxWorks-486
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # vxWorks-486 is the new R3.14 name for pc486
 include $(EPICS_BASE)/config/CONFIG.Vx.pc486
--- a/config/CONFIG.Vx.vxWorks-68040
+++ b/config/CONFIG.Vx.vxWorks-68040
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # vxWorks-68040 is the new R3.14 name for mv167
 include $(EPICS_BASE)/config/CONFIG.Vx.mv167
--- a/config/CONFIG.Vx.vxWorks-68040lc
+++ b/config/CONFIG.Vx.vxWorks-68040lc
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # vxWorks-68040lc is the new R3.14 name for mv162lc
 include $(EPICS_BASE)/config/CONFIG.Vx.mv162lc
--- a/config/CONFIG.Vx.vxWorks-68060
+++ b/config/CONFIG.Vx.vxWorks-68060
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # vxWorks-68060 is the new R3.14 name for mv177
 include $(EPICS_BASE)/config/CONFIG.Vx.mv177
--- a/config/CONFIG.Vx.vxWorks-ppc603
+++ b/config/CONFIG.Vx.vxWorks-ppc603
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # vxWorks-ppc603 is the new R3.14 name for ppc603
 include $(EPICS_BASE)/config/CONFIG.Vx.ppc603
--- a/config/CONFIG.Vx.vxWorks-ppc603_long
+++ b/config/CONFIG.Vx.vxWorks-ppc603_long
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # vxWorks-ppc603 is the new R3.14 name for ppc603
 include $(EPICS_BASE)/config/CONFIG.Vx.ppc603_long
--- a/config/CONFIG.Vx.vxWorks-ppc604
+++ b/config/CONFIG.Vx.vxWorks-ppc604
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # vxWorks-ppc604 is the new R3.14 name for ppc604
 include $(EPICS_BASE)/config/CONFIG.Vx.ppc604
--- a/config/CONFIG.Vx.vxWorks-ppc604_long
+++ b/config/CONFIG.Vx.vxWorks-ppc604_long
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # vxWorks-ppc604 is the new R3.14 name for ppc604
 include $(EPICS_BASE)/config/CONFIG.Vx.ppc604_long
--- a/config/CONFIG_BASE
+++ b/config/CONFIG_BASE
@@ -8,7 +8,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
-#  $Id$
+#  $Revision-Id$
 #

 # the order of following list is important
@@ -52,6 +52,9 @@ EPICS_BASE = $(TOP)
 # EPICS include config file
 include $(EPICS_BASE)/config/CONFIG

+-include $(EPICS_BASE)/configure/RELEASE
+-include $(EPICS_BASE)/configure/RELEASE.$(EPICS_HOST_ARCH)
+
 ifdef INSTALL_LOCATION_BASE
 INSTALL_LOCATION = $(INSTALL_LOCATION_BASE)
 endif
--- a/config/CONFIG_BASE_VERSION
+++ b/config/CONFIG_BASE_VERSION
@@ -8,26 +8,8 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
-#  $Id$
-#
-#  EPICS Version information
-#
-# This file is interpreted by the Bourne Shell (MakeRelease), so spaces are
-# not allowed around the '=' signs or in unquoted values.
+#  $Revision-Id$
 #
+#  EPICS Version information now comes from configure...

-EPICS_VERSION=3
-EPICS_REVISION=14
-EPICS_MODIFICATION=5
-EPICS_UPDATE_NAME=
-EPICS_UPDATE_LEVEL=0
-
-EPICS_LOCAL_NAME=B
-EPICS_LOCAL_VERSION=0
-
-EPICS_VERSION_STRING="EPICS Version ${EPICS_VERSION}.${EPICS_REVISION}.${EPICS_MODIFICATION}.${EPICS_UPDATE_NAME}${EPICS_UPDATE_LEVEL}.$(EPICS_LOCAL_NAME)$(EPICS_LOCAL_VERSION)"
-
-CVS_DATE="\$$Date$$"
-CVS_TAG="\$$Name$$"
-
-BASE_3_14=YES
+include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION
--- a/config/CONFIG_COMMON
+++ b/config/CONFIG_COMMON
@@ -8,7 +8,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
-#  $Id$
+#  $Revision-Id$
 #
 #  CONFIG_COMMON - Another EPICS BASE config file
 #	by Matthew Needes and Mike Bordua
@@ -42,6 +42,7 @@ INSTALL_CONFIG              = $(INSTALL_LOCATION)/config
 INSTALL_JAVA                = $(INSTALL_LOCATION)/javalib

 EPICS_BASE_INCLUDE      = $(EPICS_BASE)/include
+EPICS_BASE_TOOLS        = $(EPICS_BASE)/config/tools

 DIVIDER = .
 OBJ = .
@@ -63,7 +64,7 @@ LEX   = $(ELEX)
 PERL=perl

 # install from EPICS
-INSTALL = $(PERL) $(EPICS_BASE_HOST_BIN)/installEpics.pl
+INSTALL = $(PERL) $(EPICS_BASE_TOOLS)/installEpics.pl
 INSTALL_PRODUCT = $(INSTALL)
 INSTALL_LIBRARY = $(INSTALL)

@@ -86,10 +87,10 @@ EPICS_BASE_BIN          = $(EPICS_BASE)/bin/$(T_A)

 GCC_ANSI = $(GCC) -ansi
 GCC_STRICT = $(GCC) -ansi -pedantic
-GCC_TRAD = $(GCC) -traditional
+GCC_TRAD = $(GCC)
 GCC_DEP_CFLAGS = -fPIC -D_REENTRANT

-GCC_WARN_YES = -Wall
+GCC_WARN_YES = -Wall -Wmissing-prototypes -Wstrict-prototypes
 GCC_WARN_NO = -w
 GCC_OPT_YES = -O3
 GCC_OPT_NO = -g
@@ -101,13 +102,13 @@ GCC_SHRLIB_CFLAGS_YES =
 GCC_SHRLIB_LDFLAGS_YES =  -shared

 G++_NORMAL = $(G++) -ansi -pedantic
-G++_STRICT = $(G++) -ansi -pedantic -Wtraditional
-G++_TRAD = $(G++) -traditional
+G++_STRICT = $(G++) -ansi -pedantic
+G++_TRAD = $(G++)
 G++_TEMPL_INST_FLAG = -DEXPL_TEMPL
 G++_DEP_CFLAGS = -fPIC -D_REENTRANT
 G++_WARN_YES = -Wall \
-      -Wmissing-prototypes -Woverloaded-virtual \
-      -Wwrite-strings -Wconversion -Wstrict-prototypes\
+      -Woverloaded-virtual \
+      -Wwrite-strings -Wconversion\
      -Wpointer-arith -Winline
 G++_WARN_NO = -w
 G++_OPT_YES = -O3
@@ -240,10 +241,10 @@ CXXFLAGS = $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS)
 LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS)\
 $(ARCH_DEP_LDFLAGS) $(STATIC_LDFLAGS) $(OP_SYS_LDFLAGS) $(RUNTIME_LDFLAGS)

-LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS)\
- $(STATIC_LDLIBS) $(OP_SYS_LDLIBS) $(POSIX_LDLIBS)
+LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(STATIC_LDLIBS) $(ARCH_DEP_LDLIBS)\
+  $(OP_SYS_LDLIBS) $(POSIX_LDLIBS)

-CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(POSIX_CPPFLAGS)
+CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(POSIX_CPPFLAGS)  $(OP_SYS_CPPFLAGS)

 CPPSNCFLAGS = $(INCLUDES)

--- a/config/CONFIG_COMPAT
+++ b/config/CONFIG_COMPAT
@@ -8,23 +8,24 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
-# $Id$
+# $Revision-Id$
 #
 # Convert old HOST_ARCH environment variable 

 #Syntax:
 # ARCH_<host_arch> = <epics_host_arch>
 ARCH_solarisGnu = solaris-sparc-gnu
+ARCH_solarisNonshared = solaris-sparc-nonshared
 #ARCH_solaris = solaris-sparc-static
 #ARCH_solaris = solaris-sparc-debug
 ARCH_solaris = solaris-sparc
 ARCH_sun4 = sun4-sparc
 ARCH_Linux = linux-x86
+ARCH_freebsd = freebsd-x86_64
 ARCH_WIN32 = win32-x86
-ARCH_hp700 = hpux-m68k
-ARCH_alpha = osf-alpha
+ARCH_hp700 = hpux-parisc
 ARCH_Borland = win32-x86-borland
-ARCH_cygwin32 = win32-x86-cygwin
+ARCH_cygwin32 = cygwin-x86

 ifndef EPICS_HOST_ARCH
 ifdef HOST_ARCH
@@ -46,4 +47,3 @@ HOST_ARCH := $(EPICS_HOST_ARCH)
 # and change ARCH_solaris=solaris-<arch> to ARCH_solaris=solaris-<arch>-gnu
 # in base/config/CONFIG_COMPAT.

-
--- a/config/CONFIG_ENV
+++ b/config/CONFIG_ENV
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-#	$Id$
+#	$Revision-Id$
 #	Author:	Andrew Johnson
 #	Date:	20 April 1995
 #
--- a/config/CONFIG_HOST_ARCH.Borland
+++ b/config/CONFIG_HOST_ARCH.Borland
@@ -13,12 +13,12 @@
 EXE=.exe
 HOSTEXE=.exe

-CP   =$(PERL) $(EPICS_BASE_HOST_BIN)/cp.pl
-MV   =$(PERL) $(EPICS_BASE_HOST_BIN)/mv.pl
-RM   =$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -f
-MKDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/mkdir.pl
-RMDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -rf
-FN   =$(PERL) $(EPICS_BASE_HOST_BIN)/fullName.pl
+CP   =$(PERL) $(EPICS_BASE_TOOLS)/cp.pl
+MV   =$(PERL) $(EPICS_BASE_TOOLS)/mv.pl
+RM   =$(PERL) $(EPICS_BASE_TOOLS)/rm.pl -f
+MKDIR=$(PERL) $(EPICS_BASE_TOOLS)/mkdir.pl
+RMDIR=$(PERL) $(EPICS_BASE_TOOLS)/rm.pl -rf
+FN   =$(PERL) $(EPICS_BASE_TOOLS)/fullName.pl
 CHMOD=echo
 ECHO=echo

--- a/config/CONFIG_HOST_ARCH.Darwin
+++ b/config/CONFIG_HOST_ARCH.Darwin
@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.Darwin
 #
-# Override values in CONFIG.Vx

 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
--- a/config/CONFIG_HOST_ARCH.Linux
+++ b/config/CONFIG_HOST_ARCH.Linux
@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.Linux
 #
-# Override values in CONFIG.Vx

 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
--- a/config/CONFIG_HOST_ARCH.WIN32
+++ b/config/CONFIG_HOST_ARCH.WIN32
@@ -13,11 +13,11 @@
 EXE=.exe
 HOSTEXE=.exe

-CP   =$(PERL) $(EPICS_BASE_HOST_BIN)/cp.pl
-MV   =$(PERL) $(EPICS_BASE_HOST_BIN)/mv.pl
-RM   =$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -f
-MKDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/mkdir.pl
-RMDIR=$(PERL) $(EPICS_BASE_HOST_BIN)/rm.pl -rf
+CP   =$(PERL) $(EPICS_BASE_TOOLS)/cp.pl
+MV   =$(PERL) $(EPICS_BASE_TOOLS)/mv.pl
+RM   =$(PERL) $(EPICS_BASE_TOOLS)/rm.pl -f
+MKDIR=$(PERL) $(EPICS_BASE_TOOLS)/mkdir.pl
+RMDIR=$(PERL) $(EPICS_BASE_TOOLS)/rm.pl -rf
 CHMOD=echo
 ECHO=echo

--- a/config/CONFIG_HOST_ARCH.cygwin-x86
+++ b/config/CONFIG_HOST_ARCH.cygwin-x86
@@ -7,18 +7,17 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
+# CONFIG_HOST_ARCH.cygwin-x86
 #
-# $Id$
-#
+# This file is maintained by the EPICS community.

-TOP=../..
+# Include definitions common to all Unix archs
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

-include $(TOP)/configure/CONFIG
+EXE=.exe
+HOSTEXE=.exe

-ifeq ($(findstring YES,$(COMPAT_313) $(COMPAT_TOOLS_313)),YES)
-SCRIPTS_HOST += $(subst ../,,$(wildcard ../*.pl)) 
-SCRIPTS_HOST += installEpics
-endif
+TORNADO=YES

-include $(TOP)/configure/RULES
+WIND_HOST_TYPE = x86-win32

--- a/config/CONFIG_HOST_ARCH.darwin-ppc
+++ b/config/CONFIG_HOST_ARCH.darwin-ppc
@@ -7,6 +7,6 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Darwin
--- a/config/CONFIG_HOST_ARCH.darwin-ppcx86
+++ b/config/CONFIG_HOST_ARCH.darwin-ppcx86
@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Darwin
--- a/config/CONFIG_HOST_ARCH.darwin-x86
+++ b/config/CONFIG_HOST_ARCH.darwin-x86
@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Darwin
--- a/config/CONFIG_HOST_ARCH.freebsd-x86_64
+++ b/config/CONFIG_HOST_ARCH.freebsd-x86_64
@@ -0,0 +1,11 @@
+#*************************************************************************
+# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
--- a/config/CONFIG_HOST_ARCH.hp700
+++ b/config/CONFIG_HOST_ARCH.hp700
@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.hp700
 #
-# Override values in CONFIG.Vx

 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
--- a/config/CONFIG_HOST_ARCH.hpux-parisc
+++ b/config/CONFIG_HOST_ARCH.hpux-parisc
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # hpux-parisc is the new name for hp700
 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.hp700
--- a/config/CONFIG_HOST_ARCH.hpux-parisc-gnu
+++ b/config/CONFIG_HOST_ARCH.hpux-parisc-gnu
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # hpux-parisc is the new name for hp700
 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.hp700
--- a/config/CONFIG_HOST_ARCH.linux-ppc
+++ b/config/CONFIG_HOST_ARCH.linux-ppc
@@ -0,0 +1,14 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Linux
+
+WIND_HOST_TYPE = ppc-linux
--- a/config/CONFIG_HOST_ARCH.linux-x86
+++ b/config/CONFIG_HOST_ARCH.linux-x86
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # linux-x86 is the new name for linux
 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Linux
--- a/config/CONFIG_HOST_ARCH.linux-x86-debug
+++ b/config/CONFIG_HOST_ARCH.linux-x86-debug
@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+
+# linux-x86 is the new name for linux
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Linux
+
+HOST_OPT = NO
--- a/config/CONFIG_HOST_ARCH.linux-x86_64
+++ b/config/CONFIG_HOST_ARCH.linux-x86_64
@@ -7,12 +7,9 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-#  CONFIG_HOST_ARCH.alpha
-#
-# Override values in CONFIG.Vx
+# $Revision-Id$

 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

-WIND_HOST_TYPE = alpha
-
+WIND_HOST_TYPE = x86-linux2
--- a/config/CONFIG_HOST_ARCH.linux-x86_64-debug
+++ b/config/CONFIG_HOST_ARCH.linux-x86_64-debug
@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.linux-x86_64
+
+HOST_OPT = NO
--- a/config/CONFIG_HOST_ARCH.sgi
+++ b/config/CONFIG_HOST_ARCH.sgi
@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.sgi
 #
-# Override values in CONFIG.Vx

 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
--- a/config/CONFIG_HOST_ARCH.solaris
+++ b/config/CONFIG_HOST_ARCH.solaris
@@ -8,8 +8,6 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #  CONFIG_HOST_ARCH.solaris
-#
-# Override values in CONFIG.Vx

 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
--- a/config/CONFIG_HOST_ARCH.solaris-sparc
+++ b/config/CONFIG_HOST_ARCH.solaris-sparc
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # solaris-sparc is the new name for solaris
 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solaris
--- a/config/CONFIG_HOST_ARCH.solaris-sparc-debug
+++ b/config/CONFIG_HOST_ARCH.solaris-sparc-debug
@@ -7,7 +7,8 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-#  $Id$
+#  $Revision-Id$

 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solaris

+HOST_OPT = NO
--- a/config/CONFIG_HOST_ARCH.solaris-sparc-gnu
+++ b/config/CONFIG_HOST_ARCH.solaris-sparc-gnu
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-#  $Id$
+#  $Revision-Id$

 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solarisGnu

--- a/config/CONFIG_HOST_ARCH.solaris-sparc-staticlib
+++ b/config/CONFIG_HOST_ARCH.solaris-sparc-staticlib
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-#  $Id$
+#  $Revision-Id$

 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solaris

--- a/config/CONFIG_HOST_ARCH.solaris-sparc64
+++ b/config/CONFIG_HOST_ARCH.solaris-sparc64
@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Revision-Id$
+
+# solaris-sparc is the new name for solaris
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solaris
--- a/config/CONFIG_HOST_ARCH.solaris-sparc64-gnu
+++ b/config/CONFIG_HOST_ARCH.solaris-sparc64-gnu
@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE Versions 3.13.7
+# and higher are distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+#  $Revision-Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solarisGnu
+
--- a/config/CONFIG_HOST_ARCH.solaris-x86
+++ b/config/CONFIG_HOST_ARCH.solaris-x86
@@ -8,8 +8,6 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #  CONFIG_HOST_ARCH.solaris-x86
-#
-# Override values in CONFIG.Vx

 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
--- a/config/CONFIG_HOST_ARCH.solaris-x86-gnu
+++ b/config/CONFIG_HOST_ARCH.solaris-x86-gnu
@@ -1,4 +1,4 @@
-#  $Id$
+#  $Revision-Id$

 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solarisGnu

--- a/config/CONFIG_HOST_ARCH.solarisGnu
+++ b/config/CONFIG_HOST_ARCH.solarisGnu
@@ -1,6 +1,5 @@
 #  CONFIG_HOST_ARCH.solarisGnu
 #
-# Override values in CONFIG.Vx

 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
--- a/config/CONFIG_HOST_ARCH.sun4
+++ b/config/CONFIG_HOST_ARCH.sun4
@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.sun4
 #
-# Override values in CONFIG.Vx

 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
--- a/config/CONFIG_HOST_ARCH.sun4-sparc
+++ b/config/CONFIG_HOST_ARCH.sun4-sparc
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # sun4-sparc is the new name for sun4
 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.sun4
--- a/config/CONFIG_HOST_ARCH.win32-x86
+++ b/config/CONFIG_HOST_ARCH.win32-x86
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # win32-x86 is the new name for WIN32
 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.WIN32
--- a/config/CONFIG_HOST_ARCH.win32-x86-borland
+++ b/config/CONFIG_HOST_ARCH.win32-x86-borland
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# $Id$
+# $Revision-Id$

 # win32-x86-borland is the new name for Borland
 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Borland
--- a/config/CONFIG_HOST_ARCH.win32-x86-cygwin
+++ b/config/CONFIG_HOST_ARCH.win32-x86-cygwin
@@ -7,12 +7,14 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-#  CONFIG_HOST_ARCH.LynxOS
+#  $Revision-Id$
 #
-# Override values in CONFIG.LynxOS
+# Override values in CONFIG_SITE_HOST_ARCH.win32-x86-cygwin

 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

-WIND_HOST_TYPE = LynxOS
+HOSTEXE=.exe
+
+WIND_HOST_TYPE = x86-win32

--- a/Show More
+++ b/Show More