fix posix epicsThreadSleepQuantum() implementation not to return 0.01 on Linux

using <namespace::function>; seems not to work but
using namespace <namespace>; works
Also 'add' only works with explicit namespace. Why?

.appveyor.yml

@@ -48,7 +48,6 @@ environment:
     TOOLCHAIN: 2017
   - TOOLCHAIN: cygwin
   - TOOLCHAIN: mingw
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
 # Platform: architecture
 platform:
@@ -61,10 +60,6 @@ matrix:
   # VS Express installs don't have the 64 bit compiler
   - platform: x64
     TOOLCHAIN: 10.0
-  # Cygwin static-debug has compiler problems
-  - configuration: static-debug
-    TOOLCHAIN: cygwin
-
 
 #---------------------------------#
 #     building & testing          #
@@ -86,9 +81,6 @@ test_script:
 
 notifications:
 
-  - provider: Email
-    to:
-      - core-talk@aps.anl.gov
-    on_build_success: false
-
-  - provider: GitHubPullRequest
+  - provider: Slack
+    incoming_webhook:
+      secure: RYOm3FIUYeZGjWKaeTVKwq+C3fzK54AKwbmAoECED45mex3lN+8HmrC845a6mg9xPUJ/ND51RopWVaKDD9/UzaM0SO195RQLKqUTIUafiuM=

.ci/appveyor-make.bat

@@ -42,13 +42,13 @@ if "%TOOLCHAIN%"=="mingw" (
     set "MAKE=mingw32-make"
     if "%OS%"=="64BIT" (
         set "EPICS_HOST_ARCH=windows-x64-mingw"
-        set "INCLUDE=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\include;%INCLUDE%"
-        set "PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH%"
+        set "INCLUDE=C:\tools\mingw64\include;%INCLUDE%"
+        set "PATH=C:\tools\mingw64\bin;%PATH%"
         echo [INFO] MinGW Toolchain 64bit
     ) else (
         set "EPICS_HOST_ARCH=win32-x86-mingw"
-        set "INCLUDE=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\include;%INCLUDE%"
-        set "PATH=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin;%PATH%"
+        set "INCLUDE=C:\tools\mingw32\include;%INCLUDE%"
+        set "PATH=C:\tools\mingw32\bin;%PATH%"
         echo [INFO] MinGW Toolchain 32bit
     )
     echo [INFO] Compiler Version

.ci/appveyor-prepare.bat

@@ -55,9 +55,16 @@ if "%TOOLCHAIN%"=="mingw" (
     ) || (
         echo [INFO] EPICS set up for optimized build
     )
+    if "%OS%"=="64BIT" (
+        echo [INFO] Installing MinGW 64bit
+        cinst mingw || cinst mingw
+    ) else (
+        echo [INFO] Installing MinGW 32bit
+        cinst mingw --x86 || cinst mingw --x86
+    )
 )
 
-echo [INFO] Installing Make 4.2.1 from ANL web site
-curl -fsS --retry 3 -o C:\tools\make-4.2.1.zip https://epics.anl.gov/download/tools/make-4.2.1-win64.zip
+echo [INFO] Installing Make 4.1
+curl -fsS --retry 3 -o C:\tools\make-4.1.zip https://epics.anl.gov/download/tools/make-4.1-win64.zip
 cd \tools
-"C:\Program Files\7-Zip\7z" e make-4.2.1.zip
+"C:\Program Files\7-Zip\7z" e make-4.1.zip

.gitmodules

@@ -22,3 +22,6 @@
     path = modules/pva2pva
     url = https://github.com/epics-base/pva2pva
     branch = master
+[submodule "modules/pcas"]
+	path = modules/pcas
+	url = https://github.com/epics-modules/pcas

.tools/make-tar.sh

@@ -16,46 +16,23 @@ PREFIX="$3"
 if ! [ "$TOPREV" ]
 then
    cat <<EOF >&2
-usage: $0 <rev> [<outfile> [<prefix>]]
+usage: $0 [rev] [outfile.tar.gz] [prefix/]
 
   <rev> may be any git revision spec. (tag, branch, or commit id).
 
-  If provided, <outfile> must end with ".tar", ".tar.gz" or ".tar.bz2".
-  If <outfile> is omitted, "base-<rev>.tar.gz" will be used.
-  If provided, <prefix> must end with "/".  If <prefix> is omitted,
-  the default is "base-<rev>/".
+  Output file may be .tar.gz, .tar.bz2, or any extension supported by "tar -a".
+  If output file name is omitted, "base-<rev>.tar.gz" will be used.
+  If <prefix> is omitted, the default prefix is "base-<rev>/".
 EOF
    exit 1
 fi
 
-case "$FINALTAR" in
-"")
-  TAROPT=-z
-  FINALTAR="base-$TOPREV.tar.gz"
-  ;;
-*.tar)
-  TAROPT=""
-  ;;
-*.tar.gz)
-  TAROPT=-z
-  ;;
-*.tar.bz2)
-  TAROPT=-j
-  ;;
-*)
-  die "outfile must end with '.tar.gz' or '.tar.bz2'"
-  ;;
-esac
+[ "$FINALTAR" ] || FINALTAR="base-$TOPREV.tar.gz"
+[ "$PREFIX" ] || PREFIX="base-$TOPREV/"
 
 case "$PREFIX" in
-"")
-  PREFIX="base-$TOPREV/"
-  ;;
-*/)
-  ;;
-*)
-  die "Prefix must end with '/'"
-  ;;
+*/) ;;
+*)  die "Prefix must end with '/'";;
 esac
 
 # Check for both <tag> and R<tag>
@@ -120,11 +97,13 @@ then
 fi
 
 # Use the filtered list to build the final tar
-tar -c $TAROPT -C "$TDIR"/tar -T "$TDIR"/list.2 -f "$FINALTAR"
+#  The -a option chooses compression automatically based on output file name.
+
+tar -C "$TDIR"/tar --files-from="$TDIR"/list.2 -caf "$FINALTAR"
 
 echo "Wrote $FINALTAR"
 
-tar -t $TAROPT -f "$FINALTAR" > "$TDIR"/list.3
+tar -taf "$FINALTAR" > "$TDIR"/list.3
 
 # make sure we haven't picked up anything extra
 if ! diff -u "$TDIR"/list.2 "$TDIR"/list.3

Makefile

@@ -23,3 +23,10 @@ DIRS += modules
 modules_DEPEND_DIRS = src
 
 include $(TOP)/configure/RULES_TOP
+
+UNINSTALL_DIRS += $(INSTALL_LOCATION)/src
+copysrc:
+	tar cf - --exclude-vcs --exclude-backups --exclude=O.* modules/*/src | tar xf - -C $(INSTALL_LOCATION)
+
+tar:
+	tar cfjP epics_base-$(EPICS_VERSION_NUMBER).tar.bz2 $(INSTALL_LOCATION)

configure/CONFIG_BASE

@@ -30,11 +30,10 @@ endif # BASE_TOP
 #---------------------------------------------------------------
 # Where to find the installed build tools
 #   Windows does not like commands with relative paths starting ../
-#   so TOOLS must be an absolute path, although Perl scripts are OK.
-#   FIND_TOOL is for scripts run before the build reaches src/tools.
+#   but the Perl scripts in TOP/src/tools are OK
 
 TOOLS = $(abspath $(EPICS_BASE_HOST_BIN))
-FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(EPICS_BASE)/src/tools/$(1)))
+FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(TOP)/src/tools/$(1)))
 
 #---------------------------------------------------------------
 # EPICS Base build tools and tool flags
@@ -55,8 +54,3 @@ INSTALL_LIBRARY = $(INSTALL)
 # tools for making header dependencies and variable replacement
 MKMF       = $(PERL) $(TOOLS)/mkmf.pl
 REPLACEVAR = $(PERL) $(TOOLS)/replaceVAR.pl
-
-#---------------------------------------------------------------
-# tools for cleaning out unwanted files
-CVSCLEAN = $(call FIND_TOOL,cvsclean.pl)
-DEPCLEAN = $(call FIND_TOOL,depclean.pl)

configure/CONFIG_BASE_VERSION

@@ -48,16 +48,16 @@ EPICS_VERSION = 7
 EPICS_REVISION = 0
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 3
+EPICS_MODIFICATION = 2
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
-# Not included in the official EPICS version number if zero
-EPICS_PATCH_LEVEL = 0
+# Not included if zero
+EPICS_PATCH_LEVEL = 2
 
 # Between official releases, the EPICS_PATCH_LEVEL gets incremented
 # and a -DEV suffix is added (similar to the Maven -SNAPSHOT versions)
-EPICS_DEV_SNAPSHOT=
-#EPICS_DEV_SNAPSHOT=-DEV
+#EPICS_DEV_SNAPSHOT=
+EPICS_DEV_SNAPSHOT=-DEV
 #EPICS_DEV_SNAPSHOT=-pre1
 #EPICS_DEV_SNAPSHOT=-pre1-DEV
 #EPICS_DEV_SNAPSHOT=-pre2

configure/CONFIG_SITE

@@ -161,7 +161,7 @@ USE_POSIX_THREAD_PRIORITY_SCHEDULING = YES
 
 # Site version number, if set will append '-' and this string to the
 #  EPICS version number string that is reported by many tools.
-EPICS_SITE_VERSION =
+EPICS_SITE_VERSION:=$(shell date +%Y-%m)
 
 # For GNU compiler, use pipes rather than temporary files for
 #  communication between the various stages of compilation.

configure/RULES_BUILD

@@ -86,6 +86,23 @@ include $(CONFIG)/RULES_FILE_TYPE
 
 include $(CONFIG)/RULES.Db
 
+#---------------------------------------------------------------
+# Do not build anything if current path matches SKIP_BUILD
+
+ifneq (,$(strip $(SKIP_BUILDS)))
+CURRENT_MODULE=$(subst $(realpath $(TOP)/..)/,,$(subst $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)/,,$(realpath ..)))
+ifneq ($(filter $(SKIP_BUILDS) $(addsuffix /%,$(SKIP_BUILDS)),$(CURRENT_MODULE)),)
+$(info Skipping $(CURRENT_MODULE) for $(T_A))
+PROD=
+TESTPROD=
+LIBRARY=
+TESTLIBRARY=
+LOADABLE_LIBRARY=
+TESTS=
+SRC_FILES=
+endif
+endif
+
 #---------------------------------------------------------------
 # Include defines and rules for prod, library and test* targets
 
@@ -202,9 +219,9 @@ endif
 
 $(TESTPRODNAME) $(PRODNAME): $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)
 
-$(TESTPRODNAME) $(PRODNAME): %$(EXE): | $(INSTALL_LIB)
+$(TESTPRODNAME) $(PRODNAME): %$(EXE):
 	@$(RM) $@
-	$(LINK.cpp)
+	$(DEBUGCMD) $(LINK.cpp)
 	$(MT_EXE_COMMAND)
 
 %_ctdt$(OBJ) : %_ctdt.c
@@ -305,10 +322,6 @@ $(LOADABLE_SHRLIBNAME): $(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX):
 	$(LINK.shrlib)
 	$(MT_DLL_COMMAND)
 
-$(LIBNAME) $(SHRLIBNAME) $(LOADABLE_SHRLIBNAME): | $(INSTALL_LIB)
-$(INSTALL_LIB):
-	@$(MKDIR) $@
-
 #---------------------------------------------------------------
 # C++ munching for VxWorks
 
@@ -471,11 +484,9 @@ $(INSTALL_TCLLIB)/%: ../%
 	@$(INSTALL) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_TCLLIB)
 endif
 
-ifneq ($(TCLINDEX),)
 $(INSTALL_TCLLIB)/$(TCLINDEX): $(INSTALL_TCLLIBS)
 	$(ECHO) "Updating $@"
 	$(ECHO) eval auto_mkindex $(INSTALL_TCLLIB) "$(TCLLIBNAME)" | tclsh
-endif
 
 $(INSTALL_LOADABLE_SHRLIBS): $(INSTALL_SHRLIB)/%: %
 	$(ECHO) "Installing loadable shared library $@"
@@ -553,6 +564,6 @@ include $(CONFIG)/RULES_EXPAND
 include $(CONFIG)/RULES_COMMON
 
 else
-    $(warning Warning: Base configure/RULES_BUILD file included more than once. \
-        Does configure/RELEASE have multiple pointers to $(EPICS_BASE)?)
+    $(warning RULES_BUILD included more than once. \
+        Use 'make show-makefiles' to work out why.)
 endif # BASE_RULES_BUILD

configure/RULES_COMMON

@@ -8,18 +8,16 @@
 # These rules show the set of Makefiles, config files and
 # rules files loaded by GNUmake.
 
-show-makefiles::
-	@echo
-	@echo Makefiles read:
-define SHOW_MAKEFILE_template
-show-makefiles::
-	@echo "    $(1)"
-endef
-$(foreach file,$(MAKEFILE_LIST), \
-    $(eval $(call SHOW_MAKEFILE_template,$(file))))
+# Protect against filenames containing colons (Windows)
+SAFE_MAKEFILES = $(subst :,__colon__,$(MAKEFILE_LIST))
+SHOW_MAKEFILES = $(SAFE_MAKEFILES:%=show-makefile.%)
+show-makefiles: $(SHOW_MAKEFILES)
 
-.PHONY: show-makefiles
+# The sort prevents warnings about duplicate targets:
+$(sort $(SHOW_MAKEFILES)): show-makefile.%:
+	@echo "    $(subst __colon__,:,$(@:show-makefile.%=%))"
 
+.PHONY: show-makefiles show-makefile.%
 
 # These rules support printing a Makefile variable values.
 # Many variables are only set inside an O.<arch> build directory.
@@ -32,17 +30,6 @@ PRINT.%:
 .PHONY: PRINT PRINT.%
 
 
-# Clean rules for recursively deleting editor backup files
-# and dependency (.d) files from CWD and below.
-
-cvsclean:
-	$(PERL) $(CVSCLEAN)
-depclean:
-	$(PERL) $(DEPCLEAN)
-
-.PHONY: cvsclean depclean
-
-
 #  User specific rules
 #
 -include $(HOME)/configure/RULES_USER

configure/RULES_DIRS

@@ -86,11 +86,10 @@ $(DIRS) $(dirActionTargets) $(dirArchTargets) $(dirActionArchTargets) :
 $(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \
     $(foreach dir, $(DIRS), $(dir)$(DIVIDER)%)
 
-
-.PHONY: $(DIRS) all host rebuild
-.PHONY: $(ARCHS) $(ACTIONS)
-.PHONY: $(dirActionTargets) $(dirArchTargets)
-.PHONY: $(dirActionArchTargets)
-.PHONY: $(actionArchTargets)
+.PHONY : $(DIRS) all host rebuild
+.PHONY : $(ARCHS) $(ACTIONS)
+.PHONY : $(dirActionTargets) $(dirArchTargets)
+.PHONY : $(dirActionArchTargets)
+.PHONY : $(actionArchTargets)
 
 include $(CONFIG)/RULES_COMMON

configure/RULES_MODULES

@@ -1,47 +0,0 @@
-#*************************************************************************
-# EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
-#*************************************************************************
-
-# Support modules can use these rules to build submodules too.
-#
-# The requirements to do so are:
-#    1. Create a file CONFIG_SITE.local in the same directory as the
-#       Makefile, which defines these variables (the last one is empty):
-#           PARENT_MODULE - The name submodules call their parent
-#           INSTALL_LOCATION := $($(PARENT_MODULE))
-#           CONFIG_INSTALLS =
-#    2. The Makefile must set TOP and include $(TOP)/configure/CONFIG and
-#       CONFIG_SITE.local
-#    3. Submodules are added to the SUBMODULES variable in the Makefile
-#    4. Dependencies between submodules must be set using
-#           <name>_DEPEND_DIRS = <prerequisites>
-#    5. The Makefile must end by including $(TOP)/configure/RULES_MODULES
-#    6. Submodules must have a configure/RELEASE file that contains
-#           -include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
-#    7. Submodules must have a configure/CONFIG_SITE file that contains
-#           -include $(TOP)/../CONFIG_SITE.local
-
-# Add checked-out submodules to DIRS
-DIRS += $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
-
-include $(CONFIG)/RULES_DIRS
-
-INSTALL_LOCATION_ABS := $(abspath $(INSTALL_LOCATION))
-RELEASE_LOCAL := RELEASE.$(EPICS_HOST_ARCH).local
-
-# Ensure that RELEASE.<host>.local exists before doing anything else
-all host $(DIRS) $(ARCHS) $(ACTIONS) $(dirActionTargets) $(dirArchTargets) \
-    $(dirActionArchTargets) $(actionArchTargets): | $(RELEASE_LOCAL)
-
-# Convenience target
-RELEASE.host: $(RELEASE_LOCAL)
-
-$(RELEASE_LOCAL): Makefile CONFIG_SITE.local
-	$(ECHO) Creating $@ with
-	$(ECHO) "    $(PARENT_MODULE) = $(INSTALL_LOCATION_ABS)"
-	@echo $(PARENT_MODULE) = $(INSTALL_LOCATION_ABS)> $@
-realclean:
-	$(RM) $(wildcard RELEASE.*.local)
-
-.PHONY: RELEASE.host realclean

configure/RULES_TOP

@@ -9,30 +9,26 @@
 
 include $(CONFIG)/RULES_DIRS
 
-# Disable most top rules when installing into a parent's tree, indicated
-# by PARENT_MODULE being set in the modules/CONFIG_SITE.local file and
-# INSTALL_LOCATION pointing to the the same place as in the parent.
-ifeq ($(origin PARENT_MODULE),file)
-  ifeq ($(INSTALL_LOCATION),$($(PARENT_MODULE)))
-    DISABLE_TOP_RULES=YES
-  endif
-endif
-
-ifndef DISABLE_TOP_RULES
-  #
-  # Rules for a regular application top directory
-  #
-
 distclean: realclean cvsclean realuninstall
 
+CVSCLEAN = $(call FIND_TOOL,cvsclean.pl)
+cvsclean:
+	$(PERL) $(CVSCLEAN)
+
+DEPCLEAN = $(call FIND_TOOL,depclean.pl)
+depclean:
+	$(PERL) $(DEPCLEAN)
+
 realuninstall: uninstallDirs
 	$(RMDIR) $(INSTALL_LOCATION_BIN)
 	$(RMDIR) $(INSTALL_LOCATION_LIB)
 
-UNINSTALL_DIRS += $(INSTALL_DB) $(INSTALL_DBD) $(INSTALL_DOC) $(INSTALL_HTML)
-UNINSTALL_DIRS += $(INSTALL_INCLUDE) $(INSTALL_TEMPLATES) $(DIRECTORY_TARGETS)
+UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC) \
+    $(INSTALL_HTML) $(INSTALL_TEMPLATES) $(INSTALL_DB) $(DIRECTORY_TARGETS)
 ifneq ($(INSTALL_LOCATION),$(TOP))
-  UNINSTALL_DIRS += $(INSTALL_CONFIG)
+ifneq ($(INSTALL_LOCATION),$(EPICS_BASE))
+UNINSTALL_DIRS += $(INSTALL_CONFIG)
+endif
 endif
 uninstallDirs:
 	$(RMDIR) $(UNINSTALL_DIRS)
@@ -46,8 +42,6 @@ uninstall$(DIVIDER)%:
 	$(RMDIR) $(INSTALL_LOCATION_BIN)/$(archPart)
 	$(RMDIR) $(INSTALL_LOCATION_LIB)/$(archPart)
 
-# Remove the bin and lib directories if they have no sub-directories
-#
 cleandirs:
 	@$(NOP)
 ifeq ($(wildcard $(INSTALL_LOCATION_BIN)/*),)
@@ -57,16 +51,6 @@ ifeq ($(wildcard $(INSTALL_LOCATION_LIB)/*),)
 	$(RMDIR) $(INSTALL_LOCATION_LIB)
 endif
 
-else
-  #
-  # Using a disabled rule aborts
-  #
-
-  cleandirs distclean uninstall realuninstall archuninstall:
-	$(error Target '$@' not available in a submodule)
-
-endif # DISABLE_TOP_RULES
-
 
 help:
 	@echo "Usage: gnumake [options] [target] ..."
@@ -82,39 +66,33 @@ help:
 	@echo "                      Cannot be used within an O.<arch> dir"
 	@echo "     rebuild        - Same as clean install"
 	@echo "     archclean      - Removes O.<arch> dirs but not O.Common dir"
-	@echo "     depclean       - Removes .d files from all O.<arch> dirs."
-	@echo "     cvsclean       - Removes backup files etc. from all dirs below"
-	@echo "     runtests       - Run self-tests, summarize results immediately"
-	@echo "     tapfiles       - Run self-tests, save to O.<arch>/*.tap files"
-	@echo "     test-results   - Summarize all O.<arch>/*.tap files"
-	@echo "     clean-tests    - Removes all O.<arch>/*.tap files"
+	@echo "     runtests       - Run self-tests, summarize results"
 	@echo "\"Partial\" build targets supported by Makefiles:"
 	@echo "     host           - Builds and installs $(EPICS_HOST_ARCH) only."
 	@echo "     inc$(DIVIDER)<arch>     - Installs <arch> only header files."
 	@echo "     build$(DIVIDER)<arch>   - Builds and installs <arch> only."
 	@echo "     install$(DIVIDER)<arch> - Builds and installs <arch> only."
 	@echo "     clean$(DIVIDER)<arch>   - Cleans <arch> binaries in O.<arch> dirs only."
-	@echo "Targets supported by top level Makefile:"
-ifndef DISABLE_TOP_RULES
-	@echo "     archuninstall  - Remove bin & lib directories created by this hostarch."
 	@echo "     uninstall$(DIVIDER)<arch> - Remove bin & lib directories for <arch> only."
+	@echo "Targets supported by top level Makefile:"
+	@echo "     archuninstall  - Remove bin & lib directories created by this hostarch."
 	@echo "     uninstall      - Remove install directories created by this hostarch."
 	@echo "     realuninstall  - Removes ALL install dirs"
 	@echo "     distclean      - Same as realclean cvsclean realuninstall."
-endif
+	@echo "     depclean       - Removes all .d files from O.<arch> directories."
+	@echo "     cvsclean       - Removes cvs .#* files in all dirs of directory tree"
 	@echo "     help           - Prints this list of valid make targets "
-	@echo "Object targets are supported by the O.<arch> level Makefile .e.g"
+	@echo "Indiv. object targets are supported by O.<arch> level Makefile .e.g"
 	@echo "     xxxRecord.o"
 
-.PHONY: cleandirs distclean uninstall help
+.PHONY: cleandirs distclean cvsclean depclean
 .PHONY: realuninstall archuninstall uninstallDirs
+.PHONY: uninstall help
 
-ifndef DISABLE_TOP_RULES
-  # Include <top>/cfg/TOP_RULES* files from tops defined in RELEASE* files
-  #
-  RELEASE_CFG_TOP_RULES = $(foreach top, $(RELEASE_TOPS), \
-      $(wildcard $($(top))/cfg/TOP_RULES*))
-  ifneq ($(RELEASE_CFG_TOP_RULES),)
-    include $(RELEASE_CFG_TOP_RULES)
-  endif
+# Include <top>/cfg/TOP_RULES* files from tops defined in RELEASE* files
+#
+RELEASE_CFG_TOP_RULES = $(foreach top, $(RELEASE_TOPS), \
+    $(wildcard $($(top))/cfg/TOP_RULES*))
+ifneq ($(RELEASE_CFG_TOP_RULES),)
+  include $(RELEASE_CFG_TOP_RULES)
 endif

configure/os/CONFIG.Common.RHEL7-x86_64

@@ -0,0 +1,4 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+COMMANDLINE_LIBRARY = READLINE

configure/os/CONFIG.Common.RHEL7-x86_64-clang

@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang
+
+COMMANDLINE_LIBRARY = READLINE

configure/os/CONFIG.Common.SL5-x86

@@ -0,0 +1,6 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+ARCH_DEP_CFLAGS += -march=i686

configure/os/CONFIG.Common.SL5-x86_64

@@ -0,0 +1,4 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES

configure/os/CONFIG.Common.SL6-x86

@@ -0,0 +1,9 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+COMMANDLINE_LIBRARY = READLINE
+
+ARCH_DEP_CFLAGS += -march=i686
+
+# remove warning in anyscalar.h
+ARCH_DEP_CXXFLAGS += -fno-strict-aliasing

configure/os/CONFIG.Common.SL6-x86_64

@@ -0,0 +1,7 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+COMMANDLINE_LIBRARY = READLINE
+
+# remove warning in anyscalar.h
+ARCH_DEP_CXXFLAGS += -fno-strict-aliasing

configure/os/CONFIG.Common.SL6-x86_64-clang

@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang
+
+COMMANDLINE_LIBRARY = READLINE

configure/os/CONFIG.Common.T2-ppc604

@@ -0,0 +1,8 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 5.5.1
+WIND_BASE = /afs/psi.ch/project/vxworks/Tornado2.2.1
+
+#there is a problem with our ccppc and optimization
+# -O0 works, -O and -O1 and higher are buggy
+OPT_CFLAGS_YES = -O0
+OPT_CXXFLAGS_YES = -O0

configure/os/CONFIG.Common.UnixCommon

@@ -18,8 +18,10 @@ OBJ = .o
 LIB_PREFIX = lib
 LIB_SUFFIX = .a
 SHRLIB_SUFFIX_BASE = .so
-SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(SHRLIB_VERSION))
-LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
+#SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(SHRLIB_VERSION))
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
+#LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
 LOADABLE_SHRLIB_PREFIX = lib
 
 #-------------------------------------------------------

configure/os/CONFIG.Common.V62-ppc604

@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.2

configure/os/CONFIG.Common.V63-ppc603

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long
+VXWORKS_VERSION = 6.3
+
+# Buggy "uninitialized variable" warning produces many false positives
+ARCH_DEP_CXXFLAGS += -Wno-uninitialized

configure/os/CONFIG.Common.V63-ppc604

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.3
+
+# Buggy "uninitialized variable" warning produces many false positives
+ARCH_DEP_CXXFLAGS += -Wno-uninitialized

configure/os/CONFIG.Common.V66-ppc603

@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long
+VXWORKS_VERSION = 6.6

configure/os/CONFIG.Common.V66-ppc604

@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.6

configure/os/CONFIG.Common.V67-ppc604

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.7
+
+#needed when including memPartLib.h, e.g. through moduleLib.h or loadLib.h
+ARCH_DEP_CFLAGS += -D_VSB_CONFIG_FILE='<../lib/h/config/vsbConfig.h>'

configure/os/CONFIG.Common.eldk42-ppc4xxFP

@@ -0,0 +1,25 @@
+# DeltaTau PowerPMAC with ELDK 4.2
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+ARCH_CLASS = ppc
+
+ELDK=/opt/eldk-4.2
+GNU_TARGET=ppc_4xxFP
+GNU_DIR=$(ELDK)/usr
+
+# This cross tool chain is installed in a somehow weired way
+# Without the following lines it does not work on RHEL7
+# but it worked on SL6
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2 
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/powerpc-linux 
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/backward 
+
+ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/lib
+ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/usr/lib
+
+# Some drivers complain
+ARCH_DEP_CFLAGS += -fno-strict-aliasing

configure/os/CONFIG.Common.eldk51-ppc4xxSF

@@ -0,0 +1,16 @@
+# Virtex FPGA embedded Processor with ELDK 5.1
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.1
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_TARGET = powerpc-4xx-softfloat
+GNU_ARCH = ppc405-linux
+GNU_DIR = $(SDK_DIR)/$(GNU_TARGET)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)

configure/os/CONFIG.Common.eldk52-e500v2

@@ -0,0 +1,17 @@
+# IOxOS IFC1210 with ELDK 5.2
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.2
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_TARGET = powerpc-e500v2
+GNU_ARCH = ppce500v2-linux-gnuspe
+GNU_DIR = $(SDK_DIR)/$(GNU_TARGET)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
+GNU_TARGET_INCLUDE_DIR =

configure/os/CONFIG.Common.eldk53-ppc4xxFP

@@ -0,0 +1,23 @@
+# DeltaTau PowerPMAC with ELDK 5.2
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.3
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_ARCH = ppc440e-linux
+SDKTARGETSYSROOT=$(SDK_DIR)/powerpc-4xx/sysroots
+GNU_DIR = $(SDKTARGETSYSROOT)/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
+GNU_TARGET_INCLUDE_DIR =
+GNU_TARGET=powerpc-linux
+
+ARCH_DEP_CPPFLAGS =  -m32 -mcpu=440fp -mhard-float
+ARCH_DEP_CPPFLAGS += --sysroot=$(SDKTARGETSYSROOT)/$(GNU_ARCH)
+ARCH_DEP_LDFLAGS =   --sysroot=$(SDKTARGETSYSROOT)/$(GNU_ARCH)
+AS=$(GNU_BIN)/$(GNU_TARGET)-as

configure/os/CONFIG.Common.fslqoriq20-e6500_64

@@ -0,0 +1,25 @@
+# IOxOS IFC1211 with Freescale QorIQ 2.0 toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE
+
+ARCH_CLASS = ppc
+
+SDK = fslsdk
+SDK_DIR = /opt/fsl-qoriq/2.0
+SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
+SDK_TARGET = ppc64e6500-fsl-linux
+GNU_TARGET = powerpc64-fsl-linux
+SDKTARGETSYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
+
+ARCH_DEP_CPPFLAGS = --sysroot=$(SDKTARGETSYSROOT)
+ARCH_DEP_CFLAGS = -mcpu=e6500 -m64 -mhard-float
+ARCH_DEP_LDFLAGS = --sysroot=$(SDKTARGETSYSROOT)
+
+# warning -O2 and higher are broken!
+#OPT_CFLAGS_YES = -O1
+#OPT_CXXFLAGS_YES = -O1

configure/os/CONFIG.Common.linux-clang

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+GNU         = NO
+CMPLR_CLASS = clang
+CC          = clang
+CCC         = clang++

configure/os/CONFIG.Common.moxa42-armv6l

@@ -0,0 +1,19 @@
+# Moxa DA-66x with SDK 4.2 and ARM7 processor
+
+# Include definitions common to all Linux ARM targets
+include $(CONFIG)/os/CONFIG.Common.linux-arm
+
+GNU_DIR=/afs/psi.ch/project/embeddedlinux/moxa/arm-linux-4.4.2-v4
+GNU_TARGET=arm
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(GNU_DIR)/arm-none-linux-gnueabi/lib
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB)
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# suppress note "the mangling of 'va_list' has changed in GCC 4.4"
+ARCH_DEP_CXXFLAGS += -Wno-psabi
+
+ARCH_DEP_CFLAGS += -funwind-tables
+
+# remove warning in anyscalar.h
+ARCH_DEP_CXXFLAGS += -fno-strict-aliasing

configure/os/CONFIG.Common.mvl40-xscale_be

@@ -0,0 +1,15 @@
+# Moxa DA-66x with Montavista Linux 4.0
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE_CURSES
+
+ARCH_CLASS = xscale
+
+GNU_DIR=/afs/psi.ch/project/embeddedlinux/moxa/xscale_be/armv5teb-montavista-linuxeabi
+
+ARCH_DEP_CFLAGS += -funwind-tables
+
+# Cannot build PVA because of missing boost support
+SKIP_BUILDS = pv% normativeTypes

configure/os/CONFIG.Common.raspbian-arm

@@ -0,0 +1,43 @@
+# RaspberryPi with github.com/raspberrypi/tools toolchain
+# Tested on:
+# * Raspberry 3B+ Raspbian 9
+# * Raspberry 2   Raspbian 7
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+# Using readline:
+# Due to missing/messed up libs in the toolchain, readline needs copies of
+# libtinfo.so.5.9 and libreadline.so.6.2 from a Raspbian 7 rootfs 
+# /lib/arm-linux-gnueabihf/ to the toolchain, e.g.
+# $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf/
+# and manually created links libtinfo.so.5 and libreadline.so.
+# For gcc-linaro-arm-linux-gnueabihf-raspbian, an existing incompatible
+# libtinfo.so.5 is in the way. Remove it.
+# (Built with glibc 2.16 like installed on Raspbian 9 but toolchain uses glibc 2.13.)
+# Also copy /usr/include/readline/ directory from some readline 6 installation
+# to $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/usr/include/
+
+COMMANDLINE_LIBRARY = READLINE
+
+ARCH_CLASS = arm
+
+SDK_DIR = /opt/raspberrypi/arm-bcm2708
+
+# Available SDK_TARGETs:
+
+# gcc 4.8.3 for 32 bit hosts with GLIBC 2.3 or higher
+SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian
+
+# gcc 4.8.3 for 64 bit hosts with GLIBC 2.14 or higher
+# SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian-x64
+
+# gcc 4.7.1 for 64 bit hosts with GLIBC 2.8 or higher
+# SDK_TARGET = arm-linux-gnueabihf
+
+# gcc 4.7.1 for 32 bit hosts with GLIBC 2.4 or higher
+# SDK_TARGET = arm-bcm2708hardfp-linux-gnueabi
+# SDK_TARGET = arm-bcm2708-linux-gnueabi
+
+GNU_DIR = $(SDK_DIR)/$(SDK_TARGET)
+GNU_TARGET = $(if $(filter arm-bcm2708%,SDK_TARGET),$(SDK_TARGET),arm-linux-gnueabihf)

configure/os/CONFIG.Common.vxWorksCommon

@@ -63,6 +63,7 @@ VXWORKS_MAJOR_VERSION = $(basename $(basename $(VXWORKS_VERSION)))
 
 # These are needed for vxWorks 6.x; the GNU toolset version number
 # is in the path to the compiler tools:
+VX_GNU_VERSION_5   = 2.96
 VX_GNU_VERSION_6.0 = 3.3.2
 VX_GNU_VERSION_6.1 = 3.3.2
 VX_GNU_VERSION_6.2 = 3.3.2
@@ -73,9 +74,17 @@ VX_GNU_VERSION_6.6 = 4.1.2
 VX_GNU_VERSION_6.7 = 4.1.2
 VX_GNU_VERSION_6.8 = 4.1.2
 VX_GNU_VERSION_6.9 = 4.3.3
-VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
+VX_GNU_VERSION_6 = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
+VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_MAJOR_VERSION))
 
 VX_GNU_MAJOR_VERSION = $(basename $(basename $(VX_GNU_VERSION)))
+VX_GNU_MINOR_VERSION = $(basename $(patsubst $(VX_GNU_MAJOR_VERSION).%,%,$(VX_GNU_VERSION)))
+
+# gcc version before 3.4 are "old" and need special treatment
+VX_OLD_GCC_2   = OLD
+VX_OLD_GCC_3.3 = OLD
+VX_OLD_GCC_3   = $(VX_OLD_GCC_3.$(VX_GNU_MINOR_VERSION))
+VX_OLD_GCC = $(VX_OLD_GCC_$(VX_GNU_MAJOR_VERSION))
 
 #--------------------------------------------------
 # Fix old Linux WIND_HOST_TYPE
@@ -85,14 +94,21 @@ endif
 
 #--------------------------------------------------
 # vxWorks directory definitions
-VX_DIR = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
+VX_DIR_5 = $(WIND_BASE)
+VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
+VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
 
-GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
+VX_INCLUDE_DIRS_5 = $(VX_DIR)/target/h
+VX_INCLUDE_DIRS_6 = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
+GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
+TARGET_CPPFLAGS = -isystem $(VX_DIR)/target/h
 
 #--------------------------------------------------
 # vxWorks GNU directories
 
-GNU_DIR = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
+GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
+GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
+GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
 
 #--------------------------------------------------
 # This finds nm on any supported VxWorks version
@@ -116,7 +132,7 @@ export TOOL_FAMILY = GNU
 #--------------------------------------------------
 # Operating system flags
 OP_SYS_CPPFLAGS += -DvxWorks=vxWorks
-OP_SYS_CFLAGS += -fno-builtin
+OP_SYS_CFLAGS += -fno-builtin -fno-strict-aliasing
 
 # Fix for vxWorks headers that use macros defined in vxWorks.h but
 # which don't actually include vxWorks.h themselves, for example the
@@ -133,12 +149,23 @@ OPT_CXXFLAGS_YES = -O2
 # code flags
 CODE_CFLAGS =
 #
-# For vxWorks versions before 6.3 we need this g++ compiler flag
-CODE_CXXFLAGS_6.0 = -fno-implicit-templates
-CODE_CXXFLAGS_6.1 = -fno-implicit-templates
-CODE_CXXFLAGS_6.2 = -fno-implicit-templates
-CODE_CXXFLAGS_6 = $(CODE_CXXFLAGS_$(VXWORKS_VERSION))
-CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VXWORKS_MAJOR_VERSION))
+# For gcc versions before 3.4 we need this g++ compiler flag
+# However WindRiver says gcc 3.3 does not need it any more
+# which would allow to build vxWorks 6 without this flag.
+# Maybe we can live without it at the penalty of larger code.
+# See vxWorks 5 docs/gnu2.96+ppc/gcc.html
+# chapter 4.5 "Where's the Template?"
+CODE_CXXFLAGS_OLD = -fno-implicit-templates
+CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VX_OLD_GCC))
+
+#--------------------------------------------------
+# Modules we cannot build with old compiler
+
+PV_MODULES = pv% normativeTypes
+SKIP_BUILDS_5 = $(PV_MODULES)
+SKIP_BUILDS_OLD = $(PV_MODULES)
+SKIP_BUILDS_6 = $(SKIP_BUILDS_$(VX_OLD_GCC))
+SKIP_BUILDS = $(SKIP_BUILDS_$(VXWORKS_MAJOR_VERSION))
 
 #--------------------------------------------------
 # no shared libs for vxWorks

configure/os/CONFIG.Common.yocto21-aarch64

@@ -0,0 +1,20 @@
+# XILINX Zynq with Yocto 2.1 / Petalinux toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE
+
+ARCH_CLASS = arm64
+
+SDK = petalinux
+SDK_DIR = /opt/petalinux-gfa/2017.2
+SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
+SDK_TARGET = aarch64-xilinx-linux
+GNU_TARGET = $(SDK_TARGET)
+SDKTARGETSYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
+
+ARCH_DEP_CPPFLAGS = --sysroot=$(SDKTARGETSYSROOT)
+ARCH_DEP_LDFLAGS = --sysroot=$(SDKTARGETSYSROOT)

configure/os/CONFIG.RHEL7-x86_64.Common

@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common

configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64

@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG.RHEL7-x86_64.SL6-x86

@@ -0,0 +1,16 @@
+# "cross compile" for older Linux version
+# Use older compiler and older libraries
+# Used packages:
+# compat-gcc-44-c++-4.4
+# compat-gcc-44-4.4
+# compat-glibc-headers-2.12-4
+# It was neccessary to install 32 bit compatibility libraries manually
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44
+
+TARGET_CPPFLAGS = -isystem /usr/lib/x86_64-redhat-linux6E/include
+TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib 
+LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo

configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64

@@ -0,0 +1,16 @@
+# "cross compile" for older Linux version
+# Use older compiler and older libraries
+# Used packages:
+# compat-gcc-44-c++-4.4
+# compat-gcc-44-4.4
+# compat-glibc-headers-2.12-4
+# compat-glibc-2.12-4
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44
+
+TARGET_CPPFLAGS = -isystem /usr/lib/x86_64-redhat-linux6E/include
+TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib64
+LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo

configure/os/CONFIG.SL5-x86.Common

@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86.Common

configure/os/CONFIG.SL5-x86.SL5-x86

@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG.SL5-x86_64.Common

@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common

configure/os/CONFIG.SL5-x86_64.SL5-x86_64

@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG.SL6-x86.Common

@@ -0,0 +1,2 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts

configure/os/CONFIG.SL6-x86.SL6-x86

@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG.SL6-x86_64.Common

@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common

configure/os/CONFIG.SL6-x86_64.SL6-x86

@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG.SL6-x86_64.SL6-x86_64

@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -21,5 +21,6 @@ VXWORKS_VERSION = 6.9
 # WIND_BASE is where you installed the Wind River software.
 
 #WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
-WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
+#WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
 #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
+WIND_BASE = /afs/psi.ch/project/vxworks/VxWorks$(VXWORKS_VERSION)

configure/os/CONFIG_SITE.RHEL7-x86_64.Common

@@ -0,0 +1,13 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
+
+# Build 32 bit version as a cross architecture
+#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86
+
+# Improved error checking with clang
+CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang
+
+# Build for old SL6 64 bit
+CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64
+
+# Build for old SL6 32 bit
+CROSS_COMPILER_TARGET_ARCHS += SL6-x86

configure/os/CONFIG_SITE.SL5-x86.Common

@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common

configure/os/CONFIG_SITE.SL5-x86_64.Common

@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
+# Build 32 bit version as a cross architecture
+CROSS_COMPILER_TARGET_ARCHS += SL5-x86

configure/os/CONFIG_SITE.SL6-x86.Common

@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common

configure/os/CONFIG_SITE.SL6-x86_64.Common

@@ -0,0 +1,7 @@
+# Build 32 bit version as a cross architecture
+CROSS_COMPILER_TARGET_ARCHS += SL6-x86
+
+# Improved error checking with clang
+#CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64-clang
+
+include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common

configure/os/CONFIG_SITE.linux-x86.Common

@@ -1,9 +1,43 @@
-# CONFIG_SITE.linux-x86.Common
-#
-# Site override definitions for linux-x86 host builds
-#-------------------------------------------------------
+INSTALL_LOCATION=/usr/local/epics/base-$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
+EPICS_SITE_VERSION:=$(shell date +%Y-%m-%d)
 
-# JBA test override values
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
-#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386 # RTEMS-mvme5500 RTEMS-mvme167
+GNU_HOST_ARCH=i686
+GNU_HOST_OS=linux
+
+# LD_LIBRARY_PATH may cause problems for eldk53-ppc4xxFP
+LD_LIBRARY_PATH=
+
+# vxWorks 5.5 for MVxxxx boards
+CROSS_COMPILER_TARGET_ARCHS += T2-ppc604
+
+# vxWorks 6.7 for MVxxxx boards
+CROSS_COMPILER_TARGET_ARCHS += V67-ppc604
+
+# NI compact RIO
+CROSS_COMPILER_TARGET_ARCHS += V63-ppc603
+
+# MOXA montavista linux (No PVA because of missing boost support)
+CROSS_COMPILER_TARGET_ARCHS += mvl40-xscale_be
+
+# MOXA SDK 4.2
+CROSS_COMPILER_TARGET_ARCHS += moxa42-armv6l
+
+# Virtex embedded PPC
+CROSS_COMPILER_TARGET_ARCHS += eldk51-ppc4xxSF
+
+# IOxOS IFC1210
+CROSS_COMPILER_TARGET_ARCHS += eldk52-e500v2
+
+# DeltaTau PowerPMAC
+CROSS_COMPILER_TARGET_ARCHS += eldk42-ppc4xxFP
+CROSS_COMPILER_TARGET_ARCHS += eldk53-ppc4xxFP
+
+# Test other vxWorks versions
+#CROSS_COMPILER_TARGET_ARCHS += V66-ppc603
+CROSS_COMPILER_TARGET_ARCHS += V66-ppc604
+#CROSS_COMPILER_TARGET_ARCHS += V63-ppc604
+# (No PVA because of old compiler)
+CROSS_COMPILER_TARGET_ARCHS += V62-ppc604
+
+# Raspberry Pi
+CROSS_COMPILER_TARGET_ARCHS += raspbian-arm

configure/os/CONFIG_SITE.linux-x86_64.Common

@@ -1,9 +1,9 @@
-# CONFIG_SITE.linux-x86_64.Common
-#
-# Site override definitions for linux-x86_64 host builds
-#-------------------------------------------------------
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
 
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
-#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100
+GNU_HOST_ARCH_64=x86_64
 
+# IOxOS IFC1211
+CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64
+
+# Zynq
+CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64

documentation/KnownProblems.html

@@ -4,17 +4,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <title>Known Problems in EPICS 7.0.3</title>
+  <title>Known Problems in EPICS 7.0.2</title>
 </head>
 
 <body>
-<h1 style="text-align: center">EPICS 7.0.3: Known Problems</h1>
+<h1 style="text-align: center">EPICS 7.0.2: Known Problems</h1>
 
 <p>Any patch files linked below should be applied at the root of the
-base-7.0.3 tree. Download them, then use the GNU Patch program as
+base-7.0.2 tree. Download them, then use the GNU Patch program as
 follows:</p>
 
-<blockquote><pre>% <b>cd <i>/path/to/</i>base-7.0.3</b>
+<blockquote><pre>% <b>cd <i>/path/to/</i>base-7.0.2</b>
 % <b>patch -p1 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
 
 <p>The following problems were known by the developers at the time of this

documentation/README.1st

@@ -1,24 +1,24 @@
                            Installation Instructions
 
-                            EPICS Base Release 7.0.3
+                            EPICS Base Release 7.0.2
 
    --------------------------------------------------------------------------
 
   Table of Contents
 
-     * What is EPICS base?
-     * What is new in this release?
-     * Copyright
-     * Supported platforms
-     * Supported compilers
-     * Software requirements
-     * Host system storage requirements
-     * Documentation
-     * Directory Structure
-     * Build related components
-     * Building EPICS base (Unix and Win32)
-     * Example application and extension
-     * Multiple host platforms
+     * What is EPICS base?
+     * What is new in this release?
+     * Copyright
+     * Supported platforms
+     * Supported compilers
+     * Software requirements
+     * Host system storage requirements
+     * Documentation
+     * Directory Structure
+     * Build related components
+     * Building EPICS base (Unix and Win32)
+     * Example application and extension
+     * Multiple host platforms
 
    --------------------------------------------------------------------------
 

documentation/README.html

@@ -9,7 +9,7 @@
 <BODY>
 <CENTER>
 <H1>Installation Instructions</H1>
-<H2>EPICS Base Release 7.0.3</H2><BR>
+<H2>EPICS Base Release 7.0.2</H2><BR>
 </CENTER>
 <HR>
 <H3> Table of Contents</H3>

documentation/RELEASE_NOTES.html

@@ -20,7 +20,7 @@ release.</p>
 which should also be read to understand what has changed since an earlier
 release.</p>
 
-<h1 align="center">EPICS Release 7.0.3</h1>
+<h1 align="center">EPICS Release 7.0.2.2</h1>
 
 <!-- Insert new items immediately below this template ...
 
@@ -30,66 +30,6 @@ release.</p>
 
 -->
 
-<h3>epicsTimeGetCurrent() optimization</h3>
-
-<p>Add a fast path to epicsTimeGetCurrent() and related calls
-in the common case where only the default OS current time provider is
-registered.  This path does not take the global mutex guarding
-the time providers list, potentially reducing lock contention.</p>
-
-<h3>dbEvent tweak Queue size</h3>
-
-<p>The size of the queue used by dbEvent to push monitor updates
-has been slightly increased based on DBR_TIME_DOUBLE to better fill
-an ethernet frame.  This may result in slightly fewer, but larger
-frames being sent.</p>
-
-<h3>mbbo/mbbiDirect number of bits as precision</h3>
-
-<p>Report NOBT as &quot;precision&quot; through the dbAccess API.
-This is not accessible through CA, but is planned to be used through
-QSRV.</p>
-
-<h1 align="center">EPICS Release 7.0.2.2</h1>
-
-<h3>Build System changes</h3>
-
-<ul>
-
-<li>The GNUmake build targets <tt>cvsclean</tt> and <tt>depclean</tt> are now
-available from any directory; previously they were only available from
-application top directories.</li>
-
-<li>The approach that EPICS Base uses for building submodules inside the parent
-module looks useful for support modules too. The rules for building submodules
-have been modified and extracted into a new <tt>RULES_MODULES</tt> file, so a
-support module will be able to use them too without having to copy them into its
-own <tt>modules/Makefile</tt>. There are some specific requirements that support
-modules and their submodules must follow, which are described as comments in the
-new <tt>base/configure/RULES_MODULES</tt> file itself.</li>
-
-</ul>
-
-<h3>EPICS_BASE_VERSION Update Policy change</h3>
-
-<p>In the past, a build of EPICS using sources checked out from the repository
-branch between official releases would have shown the version number of the
-previous release, followed by a <q>-DEV</q> suffix, for example
-<q>7.0.2.1-DEV</q>.</p>
-
-<p>The policy that controls when the number gets updated has been changed, and
-now immediately after a release has been tagged the version number will be
-updated to the next patch release version, plus the <q>-DEV</q> suffix as
-before. Thus following <q>7.0.2.2</q> the version number will show as
-<q>7.0.2.3-DEV</q>. This does not require the next official release to be
-numbered <q>7.0.2.3</q> though, it could become <q>7.0.3</q> or even
-<q>7.1.0</q> if the changes incorporated into it are more substantial than bug
-fixes.</p>
-
-<h3>Drop CLOCK_MONOTONIC_RAW from posix/osdMonotonic.c</h3>
-
-<p>Turns out this is ~10x slower to query than CLOCK_MONOTONIC.</p>
-
 
 <h1 align="center">EPICS Release 7.0.2.1</h1>
 
@@ -1037,15 +977,6 @@ of its CALLBACK objects.</p>
 
 <!-- Insert inherited items immediately below here ... -->
 
-<h3>Cleaning up with Multiple CA contexts in a Process</h3>
-
-<p>Bruno Martins reported a problem with the CA client library at shutdown in a
-process that uses multiple CA client contexts. The first context that triggers
-the CA client exit handler prevents any others from being able to clean up
-because it resets the ID of an internal epicsThreadPrivate variable which is
-shared by all clients. This action has been removed from the client library,
-which makes cleanup of clients like this possible.</p>
-
 <h3>Perl CA bindings fixed for macOS Mojave</h3>
 
 <p>Apple removed some Perl header files from macOS Mojave that were available

documentation/ReleaseChecklist.html

@@ -53,10 +53,9 @@ made.</p>
 
 <h4>Short Process for Patch Releases</h4>
 
-<p>The Patch Release date and its scope are agreed upon a few weeks ahead of the
-release. If no blocking issues are raised, the release is made by the Release
-Manager on or as soon as possible after that date, following the steps below
-starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
+<p>The Patch Release date and its scope are agreed upon about four weeks
+ahead of time. If no blocking issues are raised, the release is made by the
+release manager.</p>
 
 <h3>Roles</h3>
 
@@ -73,7 +72,6 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
     <dd>Responsible for the EPICS website</dd>
 </dl>
 
-<form>
 <table border="1" width="100%">
   <tbody>
     <tr>
@@ -126,81 +124,80 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Website Manager</td>
-      <td>Create a release milestone on Launchpad. If a target release date is
-        known set "Date Targeted" to the expected release date. Note that
-        pre-release and release-candidate versions should not get Launchpad
-        milestones, only the final release.</td>
+      <td>Create a release milestone on Launchpad if necessary and set the
+        expected release date. Note that pre-release and release-candidate
+        versions do not appear on Launchpad, only the final release.</td>
       </tr>
     <tr>
       <th colspan="3">Creating pre-release and release-candidate versions</th>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Release Manager</td>
       <!-- Submodules... -->
       <td>Edit and commit changes to the EPICS version number file
         configure/CONFIG_BASE_VERSION.</td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Release Manager</td>
       <td>Tag the module in Git, using these tag conventions:
         <ul>
           <li>
-            <tt>R7.0.3-pre<i>n</i></tt>
+            <tt>R7.0.2-pre<i>n</i></tt>
             &mdash; pre-release tag
             </li>
           <li>
-            <tt>R7.0.3-rc<i>n</i></tt>
+            <tt>R7.0.2-rc<i>n</i></tt>
             &mdash; release candidate tag
             </li>
           </ul>
         <blockquote><tt>
           cd base-7.0<br />
-          git tag -m 'ANJ: Tagged for 7.0.3-rc1' R7.0.3-rc1
+          git tag -m 'ANJ: Tagged for 7.0.2-rc1' R7.0.2-rc1
           </tt></blockquote>
         Note that submodules must <em>not</em> be tagged with the version used
         for the top-level, they each have their own separate version numbers
         that are only tagged at the final release.</td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Release Manager</td>
       <td>Export the tagged version into a tarfile. The <tt>make-tar.sh</tt>
         script generates a gzipped tarfile directly from the tag, excluding the
         files and directories that are only used for continuous integration:
         <blockquote><tt>
           cd base-7.0<br />
-          ./.tools/make-tar.sh R7.0.3-rc1 base-7.0.3-rc1.tar.gz base-7.0.3-rc1/
+          ./.tools/make-tar.sh R7.0.2-rc1 base-7.0.2-rc1.tar.gz base-7.0.2-rc1/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
-          gpg --armor --sign --detach-sig base-7.0.3-rc1.tar.gz
+          gpg --armor --sign --detach-sig base-7.0.2-rc1.tar.gz
           </tt></blockquote>
         </td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Release Manager</td>
       <td>Test the tarfile by extracting its contents and building it on at
         least one supported platform.</td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Website Manager</td>
       <td>Copy the tarfile and its signature to the Base download area of the
         website and add the new files to the website Base download index
         page.</td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Website Manager</td>
       <td>Create or update a website subdirectory to hold the release
         documentation, and copy in selected files from the base/documentation
         and base/html directories of the tarfile.</td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Website Manager</td>
       <td>Create or modify the webpage for the new release with links to the
         release documents and tar file. Pre-release and release-candidate
@@ -260,11 +257,10 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
       </tr>
 
     <tr>
-      <th colspan="3" id="ReleaseApproval">
-        Release Approval</th>
+      <th colspan="3">Release Approval</th>
     </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Release Manager</td>
       <td>Obtain a positive <q>Ok to release</q> from all platform developers
         once a release candidate version has gone for 2 weeks without any major
@@ -274,7 +270,7 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
       <th colspan="3">Creating the final release version</th>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Release Manager</td>
       <td>
         <p>For each external submodule, check if the module's release version
@@ -286,7 +282,7 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
           commit.</p></td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Release Manager</td>
       <td>Edit and commit changes to the EPICS Base version number file and
         the embedded module version files:
@@ -298,33 +294,33 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
           </ul></td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Release Manager</td>
       <td>Tag the epics-base module in Git:
         <blockquote><tt>
           cd base-7.0<br />
-          git tag -m 'ANJ: Tagged for 7.0.3' R7.0.3</i>
+          git tag -m 'ANJ: Tagged for 7.0.2' R7.0.2</i>
           </tt></blockquote>
         Don't push the new tag to the Launchpad repository yet.</td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Release Manager</td>
       <td>Export the tagged version into a tarfile. The <tt>make-tar.sh</tt>
         script generates a gzipped tarfile directly from the tag, excluding the
         files and directories that are only used for continuous integration:
         <blockquote><tt>
           cd base-7.0<br />
-          ./.tools/make-tar.sh R7.0.3 base-7.0.3.tar.gz base-7.0.3/
+          ./.tools/make-tar.sh R7.0.2 base-7.0.2.tar.gz base-7.0.2/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
-          gpg --armor --sign --detach-sig base-7.0.3.tar.gz
+          gpg --armor --sign --detach-sig base-7.0.2.tar.gz
           </tt></blockquote>
         </td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Release Manager</td>
       <td>Test the tar file by extracting its contents and building it on at
         least one supported platform. When this succeeds the new git tag can be
@@ -335,7 +331,7 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
         </td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Release Manager</td>
       <td>Edit and commit changes to the EPICS Base version number file and
         the embedded module version files:
@@ -349,95 +345,64 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
         with a "-DEV" tag added (where applicable).
       </td>
     </tr>
-
     <tr>
-      <th colspan="3">Publish to epics.anl.gov</th>
-      </tr>
-    <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Release Manager</td>
       <td>Copy the tarfile and its signature to the Base download area of the
         website.</td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
+      <td>Release Manager</td>
+      <td>Find all Launchpad bug reports with the status Fix Committed which
+        have been fixed in this release and mark them Fix Released.</td>
+      </tr>
+    <tr>
+      <th colspan="3">Publish and Announce it</th>
+      </tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>Website Manager</td>
+      <td>Upload the tar file and its <tt>.asc</tt> signature file to the
+        Launchpad milestone for this release version.</td>
+      </tr>
+    <tr>
+      <td>&nbsp;</td>
       <td>Website Manager</td>
       <td>Update the website subdirectory that holds the release
         documentation, and copy in the files from the base/documentation
         directory of the tarfile.</td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Website Manager</td>
       <td>Update the webpage for the new release with links to the release
         documents and tar file.</td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Website Manager</td>
       <td>Add the new release tar file to the website Base download index
         page.</td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Website Manager</td>
       <td>Link to the release webpage from other relevent areas of the
         website - update front page and sidebars.</td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Website Manager</td>
       <td>Add an entry to the website News page, linking to the new version
         webpage.</td>
       </tr>
-
     <tr>
-      <th colspan="3">Publish to epics-controls</th>
-      </tr>
-    <tr>
-      <td><input type="checkbox"></td>
-      <td>Website Manager</td>
-      <td>Upload the tar file and its <tt>.asc</tt> signature file to the
-        epics-controls web-server [ToDo: ssh-key, location]</td>
-      </tr>
-    <tr>
-      <td><input type="checkbox"></td>
-      <td>Website Manager</td>
-      <td>Follow instructions on
-        <a href="https://epics-controls.org/resources-and-support/documents/epics-website-documentation/adding-a-page-for-a-new-release/">
-        Add a page for a new release</a> to create a new release webpage (not
-        required for a patch release though, just edit the existing page).</td>
-      </tr>
-
-    <tr>
-      <th colspan="3">Publish to Launchpad</th>
-      </tr>
-    <tr>
-      <td><input type="checkbox"></td>
-      <td>Website Manager</td>
-      <td>Go to the Launchpad milestone for this release. Click the Create
-        release button and add the release date. Put a URL for the release page
-        in the Release notes box, and click the Create release button. Upload
-        the tar file and its <tt>.asc</tt> signature file to the new Launchpad
-        release page.</td>
-      </tr>
-    <tr>
-      <td><input type="checkbox"></td>
-      <td>Release Manager</td>
-      <td>Find all Launchpad bug reports with the status Fix Committed which
-        have been fixed in this release and mark them Fix Released.</td>
-      </tr>
-
-    <tr>
-      <th colspan="3">Make Announcement</th>
-      </tr>
-    <tr>
-      <td><input type="checkbox"></td>
+      <td>&nbsp;</td>
       <td>Release Manager</td>
       <td>Announce the release on the tech-talk mailing list.</td>
       </tr>
     </tbody>
   </table>
-</form>
 </body>
 </html>

modules/CONFIG_SITE.local

@@ -3,11 +3,8 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# The name our submodules know us by:
-PARENT_MODULE = EPICS_BASE
-
 # When building submodules, this should always be true:
-INSTALL_LOCATION := $($(PARENT_MODULE))
+INSTALL_LOCATION = $(EPICS_BASE)
 
-# Stop submodules installing their configure/ files into our area
+# Stop submodules from installing their configuration files:
 CONFIG_INSTALLS =

modules/Makefile

@@ -5,7 +5,6 @@
 
 TOP = ..
 include $(TOP)/configure/CONFIG
-include CONFIG_SITE.local
 
 # Submodules for bundle build
 SUBMODULES += libcom
@@ -37,7 +36,26 @@ pva2pva_DEPEND_DIRS = pvAccess
 SUBMODULES += example
 example_DEPEND_DIRS = pva2pva pvaClient
 
+SUBMODULES += pcas
+pcas_DEPEND_DIRS = ca
+
 # Allow sites to add extra submodules
 -include Makefile.local
 
-include $(TOP)/configure/RULES_MODULES
+# Add only checked-out submodules to DIRS
+DIRS += $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
+
+include $(TOP)/configure/RULES_DIRS
+
+INSTALL_LOCATION_ABS := $(abspath $(INSTALL_LOCATION))
+RELEASE_LOCAL := RELEASE.$(EPICS_HOST_ARCH).local
+
+# Ensure that RELEASE.<host>.local exists before doing anything else
+all host $(DIRS) $(ARCHS) $(ACTIONS) $(dirActionTargets) $(dirArchTargets) \
+    $(dirActionArchTargets) $(actionArchTargets): | $(RELEASE_LOCAL)
+
+$(RELEASE_LOCAL):
+	$(ECHO) Creating $@, EPICS_BASE = $(INSTALL_LOCATION_ABS)
+	@echo EPICS_BASE = $(INSTALL_LOCATION_ABS)> $@
+realclean:
+	$(RM) $(wildcard RELEASE.*.local)

modules/ca/configure/CONFIG_CA_VERSION

@@ -1,4 +1,4 @@
 EPICS_CA_MAJOR_VERSION = 4
 EPICS_CA_MINOR_VERSION = 13
-EPICS_CA_MAINTENANCE_VERSION = 4
+EPICS_CA_MAINTENANCE_VERSION = 3
 EPICS_CA_DEVELOPMENT_FLAG = 0

modules/ca/src/client/CAref.html

@@ -3143,8 +3143,7 @@ indicating the current state of the channel.</p>
 <dl>
   <dt><code>COUNT</code></dt>
     <dd>The element count to be read from the specified channel. A count of
-      zero means use the current element count from the server, effectively
-      resulting in a variable size array subscription.</dd>
+      zero means use the current element count from the server.</dd>
 </dl>
 <dl>
   <dt><code>CHID</code></dt>

modules/ca/src/client/Makefile

@@ -72,6 +72,7 @@ LIBSRCS += comQueSend.cpp
 LIBSRCS += comBuf.cpp
 LIBSRCS += hostNameCache.cpp
 LIBSRCS += msgForMultiplyDefinedPV.cpp
+LIBSRCS_vxWorks += templateInstances.cpp
 
 LIBRARY=ca
 

modules/ca/src/client/ca_client_context.cpp

@@ -45,12 +45,20 @@ static epicsThreadOnceId cacOnce = EPICS_THREAD_ONCE_INIT;
 
 const unsigned ca_client_context :: flushBlockThreshold = 0x58000;
 
+extern "C" void cacExitHandler ( void *)
+{
+    epicsThreadPrivateDelete ( caClientCallbackThreadId );
+    caClientCallbackThreadId = 0;
+    delete ca_client_context::pDefaultServiceInstallMutex;
+}
+
 // runs once only for each process
 extern "C" void cacOnceFunc ( void * )
 {
     caClientCallbackThreadId = epicsThreadPrivateCreate ();
     assert ( caClientCallbackThreadId );
     ca_client_context::pDefaultServiceInstallMutex = newEpicsMutex;
+    epicsAtExit ( cacExitHandler,0 );
 }
 
 extern epicsThreadPrivateId caClientContextId;
@@ -59,8 +67,6 @@ cacService * ca_client_context::pDefaultService = 0;
 epicsMutex * ca_client_context::pDefaultServiceInstallMutex;
 
 ca_client_context::ca_client_context ( bool enablePreemptiveCallback ) :
-    mutex(__FILE__, __LINE__),
-    cbMutex(__FILE__, __LINE__),
     createdByThread ( epicsThreadGetIdSelf () ),
     ca_exception_func ( 0 ), ca_exception_arg ( 0 ),
     pVPrintfFunc ( errlogVprintf ), fdRegFunc ( 0 ), fdRegArg ( 0 ),

modules/ca/src/client/oldAccess.h

@@ -289,6 +289,7 @@ private:
 };
 
 extern "C" void cacOnceFunc ( void * );
+extern "C" void cacExitHandler ( void *);
 
 struct ca_client_context : public cacContextNotify
 {
@@ -428,6 +429,7 @@ private:
     ca_client_context & operator = ( const ca_client_context & );
 
     friend void cacOnceFunc ( void * );
+    friend void cacExitHandler ( void *);
     static cacService * pDefaultService;
     static epicsMutex * pDefaultServiceInstallMutex;
     static const unsigned flushBlockThreshold;

modules/ca/src/client/repeaterSubscribeTimer.cpp

@@ -37,7 +37,6 @@ repeaterSubscribeTimer::repeaterSubscribeTimer (
     epicsMutex & cbMutexIn, cacContextNotify & ctxNotifyIn ) :
     timer ( queueIn.createTimer () ), iiu ( iiuIn ), 
         cbMutex ( cbMutexIn ),ctxNotify ( ctxNotifyIn ),
-        stateMutex(__FILE__, __LINE__),
         attempts ( 0 ), registered ( false ), once ( false )
 {
 }

modules/ca/src/client/templateInstances.cpp

@@ -0,0 +1,66 @@
+/*************************************************************************\
+* 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. 
+\*************************************************************************/
+
+/*  
+ *
+ *                              
+ *                    L O S  A L A M O S
+ *              Los Alamos National Laboratory
+ *               Los Alamos, New Mexico 87545
+ *                                  
+ *  Copyright, 1986, The Regents of the University of California.
+ *                                  
+ *           
+ *	Author Jeffrey O. Hill
+ *	johill@lanl.gov
+ *	505 665 1831
+ */
+
+#include "cac.h"
+#include "oldAccess.h"
+#include "repeaterClient.h"
+
+template class chronIntIdResTable < nciu >;
+template class chronIntIdResTable < baseNMIU >;
+template class chronIntIdResTable < CASG >;
+template class resTable < nciu, chronIntId >;
+template class resTable < baseNMIU, chronIntId >;
+template class resTable < CASG, chronIntId >;
+template class resTable < bhe, inetAddrID >;
+template class resTable < tcpiiu, caServerID >;
+template class tsFreeList < bhe, 0x100 >;
+template class tsFreeList < tcpiiu, 32, epicsMutexNOOP >;
+template class tsFreeList < netReadNotifyIO, 1024, epicsMutexNOOP >;
+template class tsFreeList < netWriteNotifyIO, 1024, epicsMutexNOOP >;
+template class tsFreeList < netSubscription, 1024, epicsMutexNOOP >;
+template class tsFreeList < CASG, 128, epicsMutexNOOP  >;
+template class tsFreeList < syncGroupReadNotify, 128, epicsMutexNOOP >;
+template class tsFreeList < syncGroupWriteNotify, 128, epicsMutexNOOP >;
+template class tsFreeList < comBuf, 0x20 >;
+template class tsFreeList < getCallback, 1024, epicsMutexNOOP >;
+template class tsFreeList < getCopy, 1024, epicsMutexNOOP >;
+template class tsFreeList < msgForMultiplyDefinedPV, 16 >;
+template class tsFreeList < nciu, 1024, epicsMutexNOOP>;
+template class tsFreeList < oldChannelNotify, 1024, epicsMutexNOOP >;
+template class tsFreeList < oldSubscription, 1024, epicsMutexNOOP >;
+template class tsFreeList < putCallback, 1024, epicsMutexNOOP >;
+template class tsFreeList < repeaterClient, 0x20 >;
+template class epicsSingleton < localHostName >;
+template unsigned comBuf :: push ( const double * pValue, unsigned nElem );
+template unsigned comBuf :: push ( const float * pValue, unsigned nElem );
+template unsigned comBuf :: push ( const int * pValue, unsigned nElem );
+template unsigned comBuf :: push ( const short * pValue, unsigned nElem );
+template comBuf :: popStatus comBuf :: pop ( unsigned int & returnVal );
+template comBuf :: popStatus comBuf :: pop ( unsigned short & returnVal );
+template comBuf :: popStatus comBuf :: pop ( unsigned char & returnVal );
+template void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO
+    (epicsGuard < epicsMutex > &, syncGroupWriteNotify & );
+template void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO
+    ( epicsGuard < epicsMutex > &, syncGroupReadNotify & );

modules/database/configure/CONFIG_DATABASE_VERSION

@@ -1,4 +1,4 @@
 EPICS_DATABASE_MAJOR_VERSION = 3
 EPICS_DATABASE_MINOR_VERSION = 17
-EPICS_DATABASE_MAINTENANCE_VERSION = 4
+EPICS_DATABASE_MAINTENANCE_VERSION = 3
 EPICS_DATABASE_DEVELOPMENT_FLAG = 0

modules/database/src/ioc/db/Makefile

@@ -42,6 +42,7 @@ INC += dbState.h
 INC += db_access_routines.h
 INC += db_convert.h
 INC += dbUnitTest.h
+INC += dbCaPvt.h
 
 # Generate menuGlobal.dbd, not really by concatenation, see RULES
 DBDCAT += menuGlobal.dbd
@@ -96,4 +97,5 @@ dbCore_SRCS += chfPlugin.c
 dbCore_SRCS += dbState.c
 dbCore_SRCS += dbUnitTest.c
 dbCore_SRCS += dbServer.c
+dbCore_SRCS_vxWorks += templateInstances.cpp
 

modules/database/src/ioc/db/callback.c

@@ -55,7 +55,7 @@ typedef struct cbQueueSet {
     epicsRingPointerId queue;
     int queueOverflow;
     int queueOverflows;
-    int shutdown; // use atomic
+    int shutdown;
     int threadsConfigured;
     int threadsRunning;
 } cbQueueSet;
@@ -71,16 +71,13 @@ epicsExportAddress(int,callbackParallelThreadsDefault);
 /* Timer for Delayed Requests */
 static epicsTimerQueueId timerQueue;
 
-enum cbState_t {
-    cbInit,  /* before callbackInit() and after callbackCleanup() */
-    cbRun,   /* after callbackInit() and before callbackStop() */
-    cbStop,  /* after callbackStop() and before callbackCleanup() */
-};
-
-static int cbState; // holdscbState_t, use atomic ops
-
+/* Shutdown handling */
+enum ctl {ctlInit, ctlRun, ctlPause, ctlExit};
+static volatile enum ctl cbCtl;
 static epicsEventId startStopEvent;
 
+static int callbackIsInit;
+
 /* Static data */
 static char *threadNamePrefix[NUM_CALLBACK_PRIORITIES] = {
     "cbLow", "cbMedium", "cbHigh"
@@ -99,7 +96,7 @@ static int priorityValue[NUM_CALLBACK_PRIORITIES] = {0, 1, 2};
 
 int callbackSetQueueSize(int size)
 {
-    if (epicsAtomicGetIntT(&cbState)!=cbInit) {
+    if (callbackIsInit) {
         fprintf(stderr, "Callback system already initialized\n");
         return -1;
     }
@@ -110,7 +107,7 @@ int callbackSetQueueSize(int size)
 int callbackQueueStatus(const int reset, callbackQueueStats *result)
 {
     int ret;
-    if (epicsAtomicGetIntT(&cbState)==cbInit) return -1;
+    if (!callbackIsInit) return -1;
     if (result) {
         int prio;
         result->size = callbackQueueSize;
@@ -154,7 +151,7 @@ void callbackQueueShow(const int reset)
 
 int callbackParallelThreads(int count, const char *prio)
 {
-    if (epicsAtomicGetIntT(&cbState)!=cbInit) {
+    if (callbackIsInit) {
         fprintf(stderr, "Callback system already initialized\n");
         return -1;
     }
@@ -210,7 +207,7 @@ static void callbackTask(void *arg)
     taskwdInsert(0, NULL, NULL);
     epicsEventSignal(startStopEvent);
 
-    while(!epicsAtomicGetIntT(&mySet->shutdown)) {
+    while(!mySet->shutdown) {
         void *ptr;
         if (epicsRingPointerIsEmpty(mySet->queue))
             epicsEventMustWait(mySet->semWakeUp);
@@ -233,10 +230,11 @@ void callbackStop(void)
 {
     int i;
 
-    if (epicsAtomicCmpAndSwapIntT(&cbState, cbRun, cbStop)!=cbRun) return;
+    if (cbCtl == ctlExit) return;
+    cbCtl = ctlExit;
 
     for (i = 0; i < NUM_CALLBACK_PRIORITIES; i++) {
-        epicsAtomicSetIntT(&callbackQueue[i].shutdown, 1);
+        callbackQueue[i].shutdown = 1;
         epicsEventSignal(callbackQueue[i].semWakeUp);
     }
 
@@ -254,10 +252,6 @@ void callbackCleanup(void)
 {
     int i;
 
-    if(epicsAtomicCmpAndSwapIntT(&cbState, cbStop, cbInit)!=cbStop) {
-        fprintf(stderr, "callbackCleanup() but not stopped\n");
-    }
-
     for (i = 0; i < NUM_CALLBACK_PRIORITIES; i++) {
         cbQueueSet *mySet = &callbackQueue[i];
 
@@ -267,6 +261,7 @@ void callbackCleanup(void)
     }
 
     epicsTimerQueueRelease(timerQueue);
+    callbackIsInit = 0;
     memset(callbackQueue, 0, sizeof(callbackQueue));
 }
 
@@ -276,14 +271,15 @@ void callbackInit(void)
     int j;
     char threadName[32];
 
-    if (epicsAtomicCmpAndSwapIntT(&cbState, cbInit, cbRun)!=cbInit) {
-        fprintf(stderr, "Warning: callbackInit called again before callbackCleanup\n");
+    if (callbackIsInit) {
+        errlogMessage("Warning: callbackInit called again before callbackCleanup\n");
         return;
     }
+    callbackIsInit = 1;
 
     if(!startStopEvent)
         startStopEvent = epicsEventMustCreate(epicsEventEmpty);
-
+    cbCtl = ctlRun;
     timerQueue = epicsTimerQueueAllocate(0, epicsThreadPriorityScanHigh);
 
     for (i = 0; i < NUM_CALLBACK_PRIORITIES; i++) {

modules/database/src/ioc/db/dbEvent.c

@@ -49,13 +49,7 @@
 #include "link.h"
 #include "special.h"
 
-/* Queue size based on Ethernet MTU of 1500 bytes.
- * Assume <=66 bytes of ethernet+IP+TCP overhead
- * and 40 byte CA messages (DBF_TIME_DOUBLE).
- *
- * (1500-66)/40 -> 35
- */
-#define EVENTSPERQUE    36
+#define EVENTSPERQUE    32
 #define EVENTENTRIES    4      /* the number of que entries for each event */
 #define EVENTQUESIZE    (EVENTENTRIES  * EVENTSPERQUE)
 #define EVENTQEMPTY     ((struct evSubscrip *)NULL)

modules/database/src/ioc/db/templateInstances.cpp

@@ -0,0 +1,9 @@
+#include "dbCAC.h"
+#include "dbChannelIO.h"
+#include "dbPutNotifyBlocker.h"
+
+template class tsFreeList < dbSubscriptionIO, 256, epicsMutexNOOP >;
+template class tsFreeList < dbChannelIO, 256, epicsMutexNOOP >;
+template class tsFreeList < dbPutNotifyBlocker, 64, epicsMutexNOOP >;
+template class resTable < dbBaseIO, chronIntId >;
+template class chronIntIdResTable < dbBaseIO >;

modules/database/src/ioc/dbtemplate/Makefile

@@ -13,7 +13,7 @@ SRC_DIRS += $(IOCDIR)/dbtemplate
 
 PROD_HOST += msi
 
-msi_SRCS = msi.cpp
+msi_SRCS = msi.c
 msi_LIBS += Com
 HTMLS += msi.html
 

modules/database/src/ioc/dbtemplate/msi.c

@@ -9,9 +9,6 @@
 
 /* msi - macro substitutions and include */
 
-#include <string>
-#include <list>
-
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -21,6 +18,7 @@
 
 #include <dbDefs.h>
 #include <macLib.h>
+#include <ellLib.h>
 #include <errlog.h>
 #include <epicsString.h>
 #include <osiFileName.h>
@@ -58,35 +56,32 @@ int din = 0;
 typedef struct inputData inputData;
 
 static void inputConstruct(inputData **ppvt);
-static void inputDestruct(inputData * const pvt);
-static void inputAddPath(inputData * const pvt, const char * const pval);
-static void inputBegin(inputData * const pvt, const char * const fileName);
-static char *inputNextLine(inputData * const pvt);
-static void inputNewIncludeFile(inputData * const pvt, const char * const name);
-static void inputErrPrint(const inputData * const pvt);
+static void inputDestruct(inputData *pvt);
+static void inputAddPath(inputData *pvt, char *pval);
+static void inputBegin(inputData *pvt, char *fileName);
+static char *inputNextLine(inputData *pvt);
+static void inputNewIncludeFile(inputData *pvt, char *name);
+static void inputErrPrint(inputData *pvt);
 
 /* Module to read the substitution file */
 typedef struct subInfo subInfo;
 
-static void substituteOpen(subInfo **ppvt, const std::string& substitutionName);
-static void substituteDestruct(subInfo * const pvt);
-static bool substituteGetNextSet(subInfo * const pvt, char **filename);
-static bool substituteGetGlobalSet(subInfo * const pvt);
-static const char *substituteGetReplacements(subInfo * const pvt);
-static const char *substituteGetGlobalReplacements(subInfo * const pvt);
+static void substituteOpen(subInfo **ppvt, char *substitutionName);
+static void substituteDestruct(subInfo *pvt);
+static int substituteGetNextSet(subInfo *pvt, char **filename);
+static int substituteGetGlobalSet(subInfo *pvt);
+static char *substituteGetReplacements(subInfo *pvt);
+static char *substituteGetGlobalReplacements(subInfo *pvt);
 
 /* Forward references to local routines */
-static void usageExit(const int status);
-static void abortExit(const int status);
-static void addMacroReplacements(MAC_HANDLE * const macPvt,
-                                 const char * const pval);
-static void makeSubstitutions(inputData * const inputPvt,
-                              MAC_HANDLE * const macPvt,
-                              const char * const templateName);
+static void usageExit(int status);
+static void abortExit(int status);
+static void addMacroReplacements(MAC_HANDLE *macPvt, char *pval);
+static void makeSubstitutions(inputData *inputPvt, MAC_HANDLE *macPvt, char *templateName);
 
 /*Global variables */
 static int opt_V = 0;
-static bool opt_D = false;
+static int opt_D = 0;
 
 static char *outFile = 0;
 static int numDeps = 0, depHashes[MAX_DEPS];
@@ -97,21 +92,23 @@ int main(int argc,char **argv)
     inputData *inputPvt;
     MAC_HANDLE *macPvt;
     char *pval;
-    std::string substitutionName;
+    int  narg;
+    char *substitutionName = 0;
     char *templateName = 0;
-    bool localScope = true;
+    int  i;
+    int  localScope = 1;
 
     inputConstruct(&inputPvt);
     macCreateHandle(&macPvt, 0);
     while ((argc > 1) && (argv[1][0] == '-')) {
-        int narg = (strlen(argv[1]) == 2) ? 2 : 1;
+        narg = (strlen(argv[1]) == 2) ? 2 : 1;
         pval = (narg == 1) ? (argv[1] + 2) : argv[2];
 
         if (strncmp(argv[1], "-I", 2) == 0) {
             inputAddPath(inputPvt, pval);
         }
         else if (strcmp(argv[1], "-D") == 0) {
-            opt_D = true;
+            opt_D = 1;
             narg = 1; /* no argument for this option */
         }
         else if(strncmp(argv[1], "-o", 2) == 0) {
@@ -121,14 +118,14 @@ int main(int argc,char **argv)
             addMacroReplacements(macPvt, pval);
         }
         else if(strncmp(argv[1], "-S", 2) == 0) {
-            substitutionName = pval;
+            substitutionName = epicsStrDup(pval);
         }
         else if (strcmp(argv[1], "-V") == 0) {
             opt_V = 1;
             narg = 1; /* no argument for this option */
         }
         else if (strcmp(argv[1], "-g") == 0) {
-            localScope = false;
+            localScope = 0;
             narg = 1; /* no argument for this option */
         }
         else if (strcmp(argv[1], "-h") == 0) {
@@ -140,7 +137,7 @@ int main(int argc,char **argv)
         }
 
         argc -= narg;
-        for (int i = 1; i < argc; i++)
+        for (i = 1; i < argc; i++)
             argv[i] = argv[i + narg];
     }
 
@@ -168,24 +165,24 @@ int main(int argc,char **argv)
     if (argc == 2)
         templateName = epicsStrDup(argv[1]);
 
-    if (substitutionName.empty()) {
+    if (!substitutionName) {
         STEP("Single template+substitutions file");
         makeSubstitutions(inputPvt, macPvt, templateName);
     }
     else {
         subInfo *substitutePvt;
         char *filename = 0;
-        bool isGlobal, isFile;
+        int isGlobal, isFile;
 
-        STEPS("Substitutions from file", substitutionName.c_str());
+        STEPS("Substitutions from file", substitutionName);
         substituteOpen(&substitutePvt, substitutionName);
         do {
             isGlobal = substituteGetGlobalSet(substitutePvt);
             if (isGlobal) {
                 STEP("Handling global macros");
-                const char *macStr = substituteGetGlobalReplacements(substitutePvt);
-                if (macStr)
-                    addMacroReplacements(macPvt, macStr);
+                pval = substituteGetGlobalReplacements(substitutePvt);
+                if (pval)
+                    addMacroReplacements(macPvt, pval);
             }
             else if ((isFile = substituteGetNextSet(substitutePvt, &filename))) {
                 if (templateName)
@@ -196,12 +193,11 @@ int main(int argc,char **argv)
                 }
 
                 STEPS("Handling template file", filename);
-                const char *macStr;
-                while ((macStr = substituteGetReplacements(substitutePvt))) {
+                while ((pval = substituteGetReplacements(substitutePvt))) {
                     if (localScope)
                         macPushScope(macPvt);
 
-                    addMacroReplacements(macPvt, macStr);
+                    addMacroReplacements(macPvt, pval);
                     makeSubstitutions(inputPvt, macPvt, filename);
 
                     if (localScope)
@@ -211,18 +207,18 @@ int main(int argc,char **argv)
         } while (isGlobal || isFile);
         substituteDestruct(substitutePvt);
     }
+    errlogFlush();
     macDeleteHandle(macPvt);
-    errlogFlush();  // macLib calls errlogPrintf()
     inputDestruct(inputPvt);
     if (opt_D) {
         printf("\n");
     }
-    fflush(stdout);
     free(templateName);
+    free(substitutionName);
     return opt_V & 2;
 }
 
-void usageExit(const int status)
+void usageExit(int status)
 {
     fprintf(stderr,
         "Usage: msi [options] [template]\n"
@@ -240,7 +236,7 @@ void usageExit(const int status)
     exit(status);
 }
 
-void abortExit(const int status)
+void abortExit(int status)
 {
     if (outFile) {
         fclose(stdout);
@@ -249,8 +245,7 @@ void abortExit(const int status)
     exit(status);
 }
 
-static void addMacroReplacements(MAC_HANDLE * const macPvt,
-                                 const char * const pval)
+static void addMacroReplacements(MAC_HANDLE *macPvt, char *pval)
 {
     char **pairs;
     long status;
@@ -273,9 +268,7 @@ static void addMacroReplacements(MAC_HANDLE * const macPvt,
 typedef enum {cmdInclude,cmdSubstitute} cmdType;
 static const char *cmdNames[] = {"include","substitute"};
 
-static void makeSubstitutions(inputData * const inputPvt,
-                              MAC_HANDLE * const macPvt,
-                              const char * const templateName)
+static void makeSubstitutions(inputData *inputPvt, MAC_HANDLE *macPvt, char *templateName)
 {
     char *input;
     static char buffer[MAX_BUFFER_SIZE];
@@ -299,6 +292,7 @@ static void makeSubstitutions(inputData * const inputPvt,
         if (command) {
             char *pstart;
             char *pend;
+            char *copy;
             int  cmdind=-1;
             int  i;
 
@@ -331,15 +325,16 @@ static void makeSubstitutions(inputData * const inputPvt,
             /*skip quote and any trailing blanks*/
             while (*++p == ' ') ;
             if (*p != '\n' && *p != 0) goto endcmd;
-            std::string copy = std::string(pstart, pend);
+            copy = calloc(pend-pstart + 1, sizeof(char));
+            strncpy(copy, pstart, pend-pstart);
 
             switch(cmdind) {
             case cmdInclude:
-                inputNewIncludeFile(inputPvt, copy.c_str());
+                inputNewIncludeFile(inputPvt,copy);
                 break;
 
             case cmdSubstitute:
-                addMacroReplacements(macPvt, copy.c_str());
+                addMacroReplacements(macPvt,copy);
                 break;
 
             default:
@@ -347,6 +342,7 @@ static void makeSubstitutions(inputData * const inputPvt,
                 inputErrPrint(inputPvt);
                 abortExit(1);
             }
+            free(copy);
             expand = 0;
         }
 
@@ -365,72 +361,94 @@ endcmd:
 }
 
 typedef struct inputFile {
-    std::string filename;
+    ELLNODE     node;
+    char        *filename;
     FILE        *fp;
     int         lineNum;
 } inputFile;
 
+typedef struct pathNode {
+    ELLNODE     node;
+    char        *directory;
+} pathNode;
+
 struct inputData {
-    std::list<inputFile> inputFileList;
-    std::list<std::string> pathList;
+    ELLLIST     inputFileList;
+    ELLLIST     pathList;
     char        inputBuffer[MAX_BUFFER_SIZE];
-    inputData() { memset(inputBuffer, 0, sizeof(inputBuffer) * sizeof(inputBuffer[0])); };
 };
 
-static void inputOpenFile(inputData *pinputData, const char * const filename);
+static void inputOpenFile(inputData *pinputData, char *filename);
 static void inputCloseFile(inputData *pinputData);
 static void inputCloseAllFiles(inputData *pinputData);
 
 static void inputConstruct(inputData **ppvt)
 {
-    *ppvt = new inputData;
+    inputData *pinputData;
+
+    pinputData = calloc(1, sizeof(inputData));
+    ellInit(&pinputData->inputFileList);
+    ellInit(&pinputData->pathList);
+    *ppvt = pinputData;
 }
 
-static void inputDestruct(inputData * const pinputData)
+static void inputDestruct(inputData *pinputData)
 {
+    pathNode *ppathNode;
+
     inputCloseAllFiles(pinputData);
-    delete(pinputData);
+    while ((ppathNode = (pathNode *) ellFirst(&pinputData->pathList))) {
+        ellDelete(&pinputData->pathList, &ppathNode->node);
+        free(ppathNode->directory);
+        free(ppathNode);
+    }
+    free(pinputData);
 }
 
-static void inputAddPath(inputData * const pinputData, const char * const path)
+static void inputAddPath(inputData *pinputData, char *path)
 {
+    ELLLIST     *ppathList = &pinputData->pathList;
+    pathNode    *ppathNode;
     const char  *pcolon;
     const char  *pdir;
     size_t      len;
+    int         emptyName;
     const char  sep = *OSI_PATH_LIST_SEPARATOR;
 
     ENTER;
     pdir = path;
     /*an empty name at beginning, middle, or end means current directory*/
     while (pdir && *pdir) {
-        bool emptyName = (*pdir == sep);
+        emptyName = ((*pdir == sep) ? 1 : 0);
         if (emptyName) ++pdir;
 
-        std::string directory;
+        ppathNode = (pathNode *) calloc(1, sizeof(pathNode));
+        ellAdd(ppathList, &ppathNode->node);
+
         if (!emptyName) {
             pcolon = strchr(pdir, sep);
             len = (pcolon ? (pcolon - pdir) : strlen(pdir));
             if (len > 0)  {
-                directory = std::string(pdir, len);
+                ppathNode->directory = (char *) calloc(len + 1, sizeof(char));
+                strncpy(ppathNode->directory, pdir, len);
                 pdir = pcolon;
                 /*unless at end skip past first colon*/
                 if (pdir && *(pdir + 1) != 0) ++pdir;
             }
             else { /*must have been trailing : */
-                emptyName = true;
+                emptyName = 1;
             }
         }
 
         if (emptyName) {
-            directory = ".";
+            ppathNode->directory = (char *) calloc(2, sizeof(char));
+            strcpy(ppathNode->directory, ".");
         }
-
-        pinputData->pathList.push_back(directory);
     }
     EXIT;
 }
 
-static void inputBegin(inputData * const pinputData, const char * const fileName)
+static void inputBegin(inputData *pinputData, char *fileName)
 {
     ENTER;
     inputCloseAllFiles(pinputData);
@@ -438,16 +456,16 @@ static void inputBegin(inputData * const pinputData, const char * const fileName
     EXIT;
 }
 
-static char *inputNextLine(inputData * const pinputData)
+static char *inputNextLine(inputData *pinputData)
 {
-    std::list<inputFile>& inFileList = pinputData->inputFileList;
+    inputFile   *pinputFile;
+    char        *pline;
 
     ENTER;
-    while (!inFileList.empty()) {
-        inputFile& inFile = inFileList.front();
-        char *pline = fgets(pinputData->inputBuffer, MAX_BUFFER_SIZE, inFile.fp);
+    while ((pinputFile = (inputFile *) ellFirst(&pinputData->inputFileList))) {
+        pline = fgets(pinputData->inputBuffer, MAX_BUFFER_SIZE, pinputFile->fp);
         if (pline) {
-            ++inFile.lineNum;
+            ++pinputFile->lineNum;
             EXITS(pline);
             return pline;
         }
@@ -457,31 +475,32 @@ static char *inputNextLine(inputData * const pinputData)
     return 0;
 }
 
-static void inputNewIncludeFile(inputData * const pinputData,
-                                const char * const name)
+static void inputNewIncludeFile(inputData *pinputData, char *name)
 {
     ENTER;
     inputOpenFile(pinputData,name);
     EXIT;
 }
 
-static void inputErrPrint(const inputData *const pinputData)
+static void inputErrPrint(inputData *pinputData)
 {
+    inputFile   *pinputFile;
+
     ENTER;
     fprintf(stderr, "input: '%s' at ", pinputData->inputBuffer);
-    const std::list<inputFile>& inFileList = pinputData->inputFileList;
-    std::list<inputFile>::const_iterator inFileIt = inFileList.begin();
-    while (inFileIt != inFileList.end()) {
-        fprintf(stderr, "line %d of ", inFileIt->lineNum);
+    pinputFile = (inputFile *) ellFirst(&pinputData->inputFileList);
+    while (pinputFile) {
+        fprintf(stderr, "line %d of ", pinputFile->lineNum);
 
-        if (!inFileIt->filename.empty()) {
-            fprintf(stderr, " file %s\n", inFileIt->filename.c_str());
+        if (pinputFile->filename) {
+            fprintf(stderr, " file %s\n", pinputFile->filename);
         }
         else {
             fprintf(stderr, "stdin:\n");
         }
 
-        if (++inFileIt != inFileList.end()) {
+        pinputFile = (inputFile *) ellNext(&pinputFile->node);
+        if (pinputFile) {
             fprintf(stderr, "  included from ");
         }
         else {
@@ -492,11 +511,12 @@ static void inputErrPrint(const inputData *const pinputData)
     EXIT;
 }
 
-static void inputOpenFile(inputData *pinputData, const char * const filename)
+static void inputOpenFile(inputData *pinputData,char *filename)
 {
-    std::list<std::string>& pathList = pinputData->pathList;
-    std::list<std::string>::iterator pathIt = pathList.end();
-    std::string fullname;
+    ELLLIST     *ppathList = &pinputData->pathList;
+    pathNode    *ppathNode = 0;
+    inputFile   *pinputFile;
+    char        *fullname = 0;
     FILE        *fp = 0;
 
     ENTER;
@@ -504,19 +524,24 @@ static void inputOpenFile(inputData *pinputData, const char * const filename)
         STEP("Using stdin");
         fp = stdin;
     }
-    else if (pathList.empty() || strchr(filename, '/')){
+    else if ((ellCount(ppathList) == 0) || strchr(filename, '/')){
         STEPS("Opening ", filename);
         fp = fopen(filename, "r");
     }
     else {
-        pathIt = pathList.begin();
-        while(pathIt != pathList.end()) {
-            fullname = *pathIt + "/" + filename;
+        ppathNode = (pathNode *) ellFirst(ppathList);
+        while (ppathNode) {
+            fullname = calloc(strlen(filename) + strlen(ppathNode->directory) + 2,
+                sizeof(char));
+            strcpy(fullname, ppathNode->directory);
+            strcat(fullname, "/");
+            strcat(fullname, filename);
             STEPS("Trying", filename);
-            fp = fopen(fullname.c_str(), "r");
+            fp = fopen(fullname, "r");
             if (fp)
                 break;
-            ++pathIt;
+            free(fullname);
+            ppathNode = (pathNode *) ellNext(&ppathNode->node);
         }
     }
 
@@ -527,20 +552,20 @@ static void inputOpenFile(inputData *pinputData, const char * const filename)
     }
 
     STEP("File opened");
-    inputFile inFile = inputFile();
+    pinputFile = calloc(1, sizeof(inputFile));
 
-    if (pathIt != pathList.end()) {
-        inFile.filename = fullname;
+    if (ppathNode) {
+        pinputFile->filename = fullname;
     }
     else if (filename) {
-        inFile.filename = filename;
+        pinputFile->filename = epicsStrDup(filename);
     }
     else {
-        inFile.filename = "stdin";
+        pinputFile->filename = epicsStrDup("stdin");
     }
 
     if (opt_D) {
-        int hash = epicsStrHash(inFile.filename.c_str(), 12345);
+        int hash = epicsStrHash(pinputFile->filename, 12345);
         int i = 0;
         int match = 0;
 
@@ -553,7 +578,7 @@ static void inputOpenFile(inputData *pinputData, const char * const filename)
         if (!match) {
             const char *wrap = numDeps ? " \\\n" : "";
 
-            printf("%s %s", wrap, inFile.filename.c_str());
+            printf("%s %s", wrap, pinputFile->filename);
             if (numDeps < MAX_DEPS) {
                 depHashes[numDeps++] = hash;
             }
@@ -564,29 +589,33 @@ static void inputOpenFile(inputData *pinputData, const char * const filename)
         }
     }
 
-    inFile.fp = fp;
-    pinputData->inputFileList.push_front(inFile);
+    pinputFile->fp = fp;
+    ellInsert(&pinputData->inputFileList, 0, &pinputFile->node);
     EXIT;
 }
 
 static void inputCloseFile(inputData *pinputData)
 {
-    std::list<inputFile>& inFileList = pinputData->inputFileList;
+    inputFile *pinputFile;
+
     ENTER;
-    if(!inFileList.empty()) {
-        inputFile& inFile = inFileList.front();
-        if (fclose(inFile.fp))
-            fprintf(stderr, "msi: Can't close input file '%s'\n", inFile.filename.c_str());
-        inFileList.erase(inFileList.begin());
+    pinputFile = (inputFile *) ellFirst(&pinputData->inputFileList);
+    if (pinputFile) {
+        ellDelete(&pinputData->inputFileList, &pinputFile->node);
+        if (fclose(pinputFile->fp))
+            fprintf(stderr, "msi: Can't close input file '%s'\n", pinputFile->filename);
+        free(pinputFile->filename);
+        free(pinputFile);
     }
     EXIT;
 }
 
 static void inputCloseAllFiles(inputData *pinputData)
 {
+    inputFile   *pinputFile;
+
     ENTER;
-    const std::list<inputFile>& inFileList = pinputData->inputFileList;
-    while(!inFileList.empty()) {
+    while ((pinputFile = (inputFile *) ellFirst(&pinputData->inputFileList))) {
         inputCloseFile(pinputData);
     }
     EXIT;
@@ -598,7 +627,7 @@ typedef enum {
 } tokenType;
 
 typedef struct subFile {
-    std::string substitutionName;
+    char        *substitutionName;
     FILE        *fp;
     int         lineNum;
     char        inputBuffer[MAX_BUFFER_SIZE];
@@ -607,20 +636,25 @@ typedef struct subFile {
     char        string[MAX_BUFFER_SIZE];
 } subFile;
 
+typedef struct patternNode {
+    ELLNODE     node;
+    char        *var;
+} patternNode;
+
 struct subInfo {
     subFile     *psubFile;
-    bool        isFile;
+    int         isFile;
     char        *filename;
-    bool        isPattern;
-    std::list<std::string> patternList;
-    std::string macroReplacements;
-    subInfo() : psubFile(NULL), isFile(false), filename(NULL),
-                isPattern(false) {};
+    int         isPattern;
+    ELLLIST     patternList;
+    size_t      size;
+    size_t      curLength;
+    char        *macroReplacements;
 };
 
 static char *subGetNextLine(subFile *psubFile);
 static tokenType subGetNextToken(subFile *psubFile);
-static void subFileErrPrint(subFile *psubFile, const char * message);
+static void subFileErrPrint(subFile *psubFile,char * message);
 static void freeSubFile(subInfo *psubInfo);
 static void freePattern(subInfo *psubInfo);
 static void catMacroReplacements(subInfo *psubInfo,const char *value);
@@ -634,7 +668,7 @@ void freeSubFile(subInfo *psubInfo)
         if (fclose(psubFile->fp))
             fprintf(stderr, "msi: Can't close substitution file\n");
     }
-    delete(psubFile);
+    free(psubFile);
     free(psubInfo->filename);
     psubInfo->psubFile = 0;
     EXIT;
@@ -642,36 +676,43 @@ void freeSubFile(subInfo *psubInfo)
 
 void freePattern(subInfo *psubInfo)
 {
+    patternNode *ppatternNode;
+
     ENTER;
-    psubInfo->patternList.clear();
-    psubInfo->isPattern = false;
+    while ((ppatternNode = (patternNode *) ellFirst(&psubInfo->patternList))) {
+        ellDelete(&psubInfo->patternList, &ppatternNode->node);
+        free(ppatternNode->var);
+        free(ppatternNode);
+    }
+    psubInfo->isPattern = 0;
     EXIT;
 }
 
-static void substituteDestruct(subInfo * const psubInfo)
+static void substituteDestruct(subInfo *psubInfo)
 {
     ENTER;
     freeSubFile(psubInfo);
     freePattern(psubInfo);
-    delete(psubInfo);
+    free(psubInfo);
     EXIT;
 }
 
-static void substituteOpen(subInfo **ppvt, const std::string& substitutionName)
+static void substituteOpen(subInfo **ppvt, char *substitutionName)
 {
     subInfo     *psubInfo;
     subFile     *psubFile;
     FILE        *fp;
 
     ENTER;
-    psubInfo = new subInfo;
+    psubInfo = calloc(1, sizeof(subInfo));
     *ppvt = psubInfo;
-    psubFile = new subFile;
+    psubFile = calloc(1, sizeof(subFile));
     psubInfo->psubFile = psubFile;
+    ellInit(&psubInfo->patternList);
 
-    fp = fopen(substitutionName.c_str(), "r");
+    fp = fopen(substitutionName, "r");
     if (!fp) {
-        fprintf(stderr, "msi: Can't open file '%s'\n", substitutionName.c_str());
+        fprintf(stderr, "msi: Can't open file '%s'\n", substitutionName);
         abortExit(1);
     }
 
@@ -684,7 +725,7 @@ static void substituteOpen(subInfo **ppvt, const std::string& substitutionName)
     EXIT;
 }
 
-static bool substituteGetGlobalSet(subInfo * const psubInfo)
+static int substituteGetGlobalSet(subInfo *psubInfo)
 {
     subFile *psubFile = psubInfo->psubFile;
 
@@ -696,16 +737,17 @@ static bool substituteGetGlobalSet(subInfo * const psubInfo)
         strcmp(psubFile->string, "global") == 0) {
         subGetNextToken(psubFile);
         EXITD(1);
-        return true;
+        return 1;
     }
 
     EXITD(0);
-    return false;
+    return 0;
 }
 
-static bool substituteGetNextSet(subInfo * const psubInfo,char **filename)
+static int substituteGetNextSet(subInfo *psubInfo,char **filename)
 {
     subFile     *psubFile = psubInfo->psubFile;
+    patternNode *ppatternNode;
 
     ENTER;
     *filename = 0;
@@ -714,7 +756,7 @@ static bool substituteGetNextSet(subInfo * const psubInfo,char **filename)
 
     if (psubFile->token == tokenEOF) {
         EXITD(0);
-        return false;
+        return 0;
     }
 
     if (psubFile->token == tokenString &&
@@ -722,7 +764,7 @@ static bool substituteGetNextSet(subInfo * const psubInfo,char **filename)
         size_t len;
 
         STEP("Parsed 'file'");
-        psubInfo->isFile = true;
+        psubInfo->isFile = 1;
         if (subGetNextToken(psubFile) != tokenString) {
             subFileErrPrint(psubFile, "Parse error, expecting a filename");
             abortExit(1);
@@ -757,7 +799,7 @@ static bool substituteGetNextSet(subInfo * const psubInfo,char **filename)
 
     if (psubFile->token == tokenLBrace) {
         EXITD(1);
-        return true;
+        return 1;
     }
 
     if (psubFile->token == tokenRBrace) {
@@ -773,7 +815,7 @@ static bool substituteGetNextSet(subInfo * const psubInfo,char **filename)
 
     STEP("Parsed 'pattern'");
     freePattern(psubInfo);
-    psubInfo->isPattern = true;
+    psubInfo->isPattern = 1;
 
     while (subGetNextToken(psubFile) == tokenSeparator);
 
@@ -783,13 +825,15 @@ static bool substituteGetNextSet(subInfo * const psubInfo,char **filename)
     }
     STEP("Parsed '{'");
 
-    while (true) {
+    while (1) {
         while (subGetNextToken(psubFile) == tokenSeparator);
 
         if (psubFile->token != tokenString)
             break;
 
-        psubInfo->patternList.push_back(psubFile->string);
+        ppatternNode = calloc(1, sizeof(patternNode));
+        ellAdd(&psubInfo->patternList, &ppatternNode->node);
+        ppatternNode->var = epicsStrDup(psubFile->string);
     }
 
     if (psubFile->token != tokenRBrace) {
@@ -799,21 +843,23 @@ static bool substituteGetNextSet(subInfo * const psubInfo,char **filename)
 
     subGetNextToken(psubFile);
     EXITD(1);
-    return true;
+    return 1;
 }
 
-static const char *substituteGetGlobalReplacements(subInfo * const psubInfo)
+static char *substituteGetGlobalReplacements(subInfo *psubInfo)
 {
     subFile     *psubFile = psubInfo->psubFile;
 
     ENTER;
-    psubInfo->macroReplacements.clear();
+    if (psubInfo->macroReplacements)
+        psubInfo->macroReplacements[0] = 0;
+    psubInfo->curLength = 0;
 
     while (psubFile->token == tokenSeparator)
         subGetNextToken(psubFile);
 
     if (psubFile->token == tokenRBrace && psubInfo->isFile) {
-        psubInfo->isFile = false;
+        psubInfo->isFile = 0;
         free(psubInfo->filename);
         psubInfo->filename = 0;
         freePattern(psubInfo);
@@ -831,12 +877,12 @@ static const char *substituteGetGlobalReplacements(subInfo * const psubInfo)
         return 0;
     }
 
-    while (true) {
+    while (1) {
         switch(subGetNextToken(psubFile)) {
             case tokenRBrace:
                 subGetNextToken(psubFile);
-                EXITS(psubInfo->macroReplacements.c_str());
-                return psubInfo->macroReplacements.c_str();
+                EXITS(psubInfo->macroReplacements);
+                return psubInfo->macroReplacements;
 
             case tokenSeparator:
                 catMacroReplacements(psubInfo, ",");
@@ -856,18 +902,21 @@ static const char *substituteGetGlobalReplacements(subInfo * const psubInfo)
     }
 }
 
-static const char *substituteGetReplacements(subInfo * const psubInfo)
+static char *substituteGetReplacements(subInfo *psubInfo)
 {
     subFile     *psubFile = psubInfo->psubFile;
+    patternNode *ppatternNode;
 
     ENTER;
-    psubInfo->macroReplacements.clear();
+    if (psubInfo->macroReplacements)
+        psubInfo->macroReplacements[0] = 0;
+    psubInfo->curLength = 0;
 
     while (psubFile->token == tokenSeparator)
         subGetNextToken(psubFile);
 
     if (psubFile->token==tokenRBrace && psubInfo->isFile) {
-        psubInfo->isFile = false;
+        psubInfo->isFile = 0;
         free(psubInfo->filename);
         psubInfo->filename = 0;
         freePattern(psubInfo);
@@ -887,16 +936,15 @@ static const char *substituteGetReplacements(subInfo * const psubInfo)
     }
 
     if (psubInfo->isPattern) {
-        bool gotFirstPattern = false;
+        int gotFirstPattern = 0;
 
         while (subGetNextToken(psubFile) == tokenSeparator);
-        std::list<std::string>& patternList = psubInfo->patternList;
-        std::list<std::string>::iterator patternIt = patternList.begin();
-        while (true) {
+        ppatternNode = (patternNode *) ellFirst(&psubInfo->patternList);
+        while (1) {
             if (psubFile->token == tokenRBrace) {
                 subGetNextToken(psubFile);
-                EXITS(psubInfo->macroReplacements.c_str());
-                return psubInfo->macroReplacements.c_str();
+                EXITS(psubInfo->macroReplacements);
+                return psubInfo->macroReplacements;
             }
 
             if (psubFile->token != tokenString) {
@@ -906,13 +954,13 @@ static const char *substituteGetReplacements(subInfo * const psubInfo)
 
             if (gotFirstPattern)
                 catMacroReplacements(psubInfo, ",");
-            gotFirstPattern = true;
+            gotFirstPattern = 1;
 
-            if (patternIt != patternList.end()) {
-                catMacroReplacements(psubInfo, patternIt->c_str());
+            if (ppatternNode) {
+                catMacroReplacements(psubInfo, ppatternNode->var);
                 catMacroReplacements(psubInfo, "=");
                 catMacroReplacements(psubInfo, psubFile->string);
-                ++patternIt;
+                ppatternNode = (patternNode *) ellNext(&ppatternNode->node);
             }
             else {
                 subFileErrPrint(psubFile, "Warning, too many values given");
@@ -921,12 +969,12 @@ static const char *substituteGetReplacements(subInfo * const psubInfo)
             while (subGetNextToken(psubFile) == tokenSeparator);
         }
     }
-    else while(true) {
+    else while(1) {
         switch(subGetNextToken(psubFile)) {
             case tokenRBrace:
                 subGetNextToken(psubFile);
-                EXITS(psubInfo->macroReplacements.c_str());
-                return psubInfo->macroReplacements.c_str();
+                EXITS(psubInfo->macroReplacements);
+                return psubInfo->macroReplacements;
 
             case tokenSeparator:
                 catMacroReplacements(psubInfo, ",");
@@ -969,12 +1017,11 @@ static char *subGetNextLine(subFile *psubFile)
     return &psubFile->inputBuffer[0];
 }
 
-static void subFileErrPrint(subFile *psubFile, const char * message)
+static void subFileErrPrint(subFile *psubFile,char * message)
 {
     fprintf(stderr, "msi: %s\n",message);
     fprintf(stderr, "  in substitution file '%s' at line %d:\n  %s",
-            psubFile->substitutionName.c_str(), psubFile->lineNum,
-            psubFile->inputBuffer);
+        psubFile->substitutionName, psubFile->lineNum, psubFile->inputBuffer);
 }
 
 
@@ -1060,8 +1107,32 @@ done:
 
 static void catMacroReplacements(subInfo *psubInfo, const char *value)
 {
+    size_t len = strlen(value);
+
     ENTER;
+    if (psubInfo->size <= (psubInfo->curLength + len)) {
+        size_t newsize = psubInfo->size + MAX_BUFFER_SIZE;
+        char *newbuf;
+
+        STEP("Enlarging buffer");
+        if (newsize <= psubInfo->curLength + len)
+            newsize = psubInfo->curLength + len + 1;
+        newbuf = calloc(1, newsize);
+        if (!newbuf) {
+            fprintf(stderr, "calloc failed for size %lu\n",
+                (unsigned long) newsize);
+            abortExit(1);
+        }
+        if (psubInfo->macroReplacements) {
+            memcpy(newbuf, psubInfo->macroReplacements, psubInfo->curLength);
+            free(psubInfo->macroReplacements);
+        }
+        psubInfo->size = newsize;
+        psubInfo->macroReplacements = newbuf;
+    }
+
     STEPS("Appending", value);
-    psubInfo->macroReplacements += value;
+    strcat(psubInfo->macroReplacements, value);
+    psubInfo->curLength += len;
     EXIT;
 }

modules/database/src/ioc/rsrv/Makefile

@@ -16,6 +16,7 @@ caserverio_INCLUDES = -I$(SRC)/ca/client
 camessage_INCLUDES = -I$(SRC)/ca/client
 
 INC += rsrv.h
+INC += server.h
 
 DBD += rsrv.dbd
 

modules/database/src/std/filters/filters.dbd.pod

@@ -241,7 +241,7 @@ Assuming there is a system state called "blue", that is being controlled by
 some other facility such as a timing system, updates could be restricted to
 periods only when "blue" is true by using
 
- Hal$ camonitor 'test:channel' 'test:channel.{"sync":{"while":"blue"}}'
+ Hal$ camonitor 'test:channel' 'test:channel.{"while":"blue"}'
  ...
 
 =cut

modules/database/src/std/rec/boRecord.c

@@ -348,9 +348,9 @@ static long get_enum_strs(const DBADDR *paddr,struct dbr_enumStrs *pes)
     /*SETTING no_str=0 breaks channel access clients*/
     pes->no_str = 2;
     memset(pes->strs,'\0',sizeof(pes->strs));
-    strncpy(pes->strs[0],prec->znam,sizeof(pes->strs[0]));
+    strncpy(pes->strs[0],prec->znam,sizeof(prec->znam));
     if(*prec->znam!=0) pes->no_str=1;
-    strncpy(pes->strs[1],prec->onam,sizeof(pes->strs[1]));
+    strncpy(pes->strs[1],prec->onam,sizeof(prec->onam));
     if(*prec->onam!=0) pes->no_str=2;
     return(0);
 }

modules/database/src/std/rec/mbbiDirectRecord.c

@@ -51,7 +51,7 @@ static long special(DBADDR *, int);
 #define get_array_info NULL
 #define put_array_info NULL
 #define get_units NULL
-static long get_precision(const DBADDR *, long *);
+#define get_precision NULL
 #define get_enum_str NULL
 #define get_enum_strs NULL
 #define put_enum_str NULL
@@ -204,16 +204,6 @@ static long special(DBADDR *paddr, int after)
     }
 }
 
-static long get_precision(const DBADDR *paddr,long *precision)
-{
-    mbbiDirectRecord	*prec=(mbbiDirectRecord *)paddr->precord;
-    if(dbGetFieldIndex(paddr)==mbbiDirectRecordVAL)
-        *precision = prec->nobt;
-    else
-        recGblGetPrec(paddr,precision);
-    return 0;
-}
-
 static void monitor(mbbiDirectRecord *prec)
 {
     epicsUInt16 events = recGblResetAlarms(prec);

modules/database/src/std/rec/mbboDirectRecord.c

@@ -51,7 +51,7 @@ static long special(DBADDR *, int);
 #define get_array_info NULL
 #define put_array_info NULL
 #define get_units NULL
-static long get_precision(const DBADDR *, long *);
+#define get_precision NULL
 #define get_enum_str NULL
 #define get_enum_strs NULL
 #define put_enum_str NULL
@@ -313,16 +313,6 @@ static long special(DBADDR *paddr, int after)
     return 0;
 }
 
-static long get_precision(const DBADDR *paddr,long *precision)
-{
-    mbboDirectRecord	*prec=(mbboDirectRecord *)paddr->precord;
-    if(dbGetFieldIndex(paddr)==mbboDirectRecordVAL)
-        *precision = prec->nobt;
-    else
-        recGblGetPrec(paddr,precision);
-    return 0;
-}
-
 static void monitor(mbboDirectRecord *prec)
 {
     epicsUInt16 events = recGblResetAlarms(prec);

modules/database/src/std/rec/stateRecord.c

@@ -99,7 +99,7 @@ static void monitor(stateRecord *prec)
     monitor_mask = recGblResetAlarms(prec);
     if(strncmp(prec->oval,prec->val,sizeof(prec->val))) {
         db_post_events(prec,&(prec->val[0]),monitor_mask|DBE_VALUE|DBE_LOG);
-	strncpy(prec->oval,prec->val,sizeof(prec->oval));
+	strncpy(prec->oval,prec->val,sizeof(prec->val));
     }
     return;
 }

modules/database/src/std/rec/stringinRecord.c

@@ -121,7 +121,8 @@ static long init_record(struct dbCommon *pcommon, int pass)
         if (status)
             return status;
     }
-    strncpy(prec->oval, prec->val, sizeof(prec->oval));
+
+    strncpy(prec->oval, prec->val, sizeof(prec->val));
     return 0;
 }
 
@@ -182,7 +183,7 @@ static void monitor(stringinRecord *prec)
 
     if (strncmp(prec->oval, prec->val, sizeof(prec->val))) {
         monitor_mask |= DBE_VALUE | DBE_LOG;
-        strncpy(prec->oval, prec->val, sizeof(prec->oval));
+        strncpy(prec->oval, prec->val, sizeof(prec->val));
     }
 
     if (prec->mpst == stringinPOST_Always)

modules/database/src/std/rec/stringoutRecord.c

@@ -126,7 +126,8 @@ static long init_record(struct dbCommon *pcommon, int pass)
         if(status)
             return status;
     }
-    strncpy(prec->oval, prec->val, sizeof(prec->oval));
+
+    strncpy(prec->oval, prec->val, sizeof(prec->val));
     return 0;
 }
 
@@ -214,7 +215,7 @@ static void monitor(stringoutRecord *prec)
 
     if (strncmp(prec->oval, prec->val, sizeof(prec->val))) {
         monitor_mask |= DBE_VALUE | DBE_LOG;
-        strncpy(prec->oval, prec->val, sizeof(prec->oval));
+        strncpy(prec->oval, prec->val, sizeof(prec->val));
     }
 
     if (prec->mpst == stringoutPOST_Always)

modules/database/src/std/softIoc/Makefile

@@ -12,6 +12,8 @@ SRC_DIRS += $(STDDIR)/softIoc
 PROD_IOC_DEFAULT = softIoc
 PROD_IOC_iOS = -nil-
 
+PROD_LDFLAGS_vxWorks = --whole-archive
+
 DBD += base.dbd
 DBD += asSub.dbd
 DBD += softIoc.dbd

modules/database/test/ioc/dbtemplate/msi.plt

@@ -11,7 +11,7 @@
 use strict;
 use Test;
 
-BEGIN {plan tests => 12}
+BEGIN {plan tests => 9}
 
 # Check include/substitute command model
 ok(msi('-I .. ../t1-template.txt'),             slurp('../t1-result.txt'));
@@ -33,9 +33,16 @@ ok(msi('-S../t6-substitute.txt ../t6-template.txt'), slurp('../t6-result.txt'));
 
 # Output option -o and verbose option -V
 my $out = 't7-output.txt';
-unlink $out;
-msi("-I.. -V -o $out ../t1-template.txt");
-ok(slurp($out), slurp('../t7-result.txt'));
+my $count = 5; # Try up to 5 times...
+my $result;
+do {
+    unlink $out;
+    msi("-I.. -V -o $out ../t1-template.txt");
+    $result = slurp($out);
+    print "# msi output file empty, retrying\n"
+        if $result eq '';
+} while ($result eq '') && (--$count > 0);
+ok($result, slurp('../t7-result.txt'));
 
 # Dependency generation, include/substitute model
 ok(msi('-I.. -D -o t8.txt ../t1-template.txt'), slurp('../t8-result.txt'));
@@ -43,17 +50,6 @@ ok(msi('-I.. -D -o t8.txt ../t1-template.txt'), slurp('../t8-result.txt'));
 # Dependency generation, dbLoadTemplate format
 ok(msi('-I.. -D -ot9.txt -S ../t2-substitution.txt'), slurp('../t9-result.txt'));
 
-# Substitution file, variable format, with 0 variable definitions
-ok(msi('-I. -I.. -S ../t10-substitute.txt'), slurp('../t10-result.txt'));
-
-# Substitution file, pattern format, with 0 pattern definitions
-ok(msi('-I. -I.. -S ../t11-substitute.txt'), slurp('../t11-result.txt'));
-
-# Substitution file, environment variable macros in template filename
-my %envs = (TEST_NO => 12, PREFIX => 't');
-@ENV{ keys %envs } = values %envs;
-ok(msi('-I. -I.. -S ../t12-substitute.txt'), slurp('../t12-result.txt'));
-delete @ENV{ keys %envs };  # Not really needed
 
 # Test support routines
 
@@ -67,8 +63,21 @@ sub slurp {
 
 sub msi {
     my ($args) = @_;
-    my $nul = $^O eq 'MSWin32' ? 'NUL' : '/dev/null';
     my $msi = '@TOP@/bin/@ARCH@/msi';
-    $msi =~ tr(/)(\\) if $^O eq 'MSWin32';
-    return `$msi $args 2>$nul`;
+    $msi .= '.exe' if ($^O eq 'MSWin32') || ($^O eq 'cygwin');
+    my $result;
+    if ($args =~ m/-o / && $args !~ m/-D/) {
+        # An empty result is expected
+        $result = `$msi $args`;
+    }
+    else {
+        # Try up to 5 times, sometimes msi fails on Windows
+        my $count = 5;
+        do {
+            $result = `$msi $args`;
+            print "# result of '$msi $args' empty, retrying\n"
+                if $result eq '';
+        } while ($result eq '') && (--$count > 0);
+    }
+    return $result;
 }

modules/database/test/ioc/dbtemplate/t10-result.txt

@@ -1,4 +0,0 @@
-# comment line
-a=$(a)
-# comment line
-a=gbl

modules/database/test/ioc/dbtemplate/t10-substitute.txt

@@ -1,8 +0,0 @@
-file t10-template.txt {
-    {}
-}
-
-global { a=gbl }
-file t10-template.txt {
-    {}
-}

modules/database/test/ioc/dbtemplate/t10-template.txt

@@ -1,2 +0,0 @@
-# comment line
-a=$(a)

modules/database/test/ioc/dbtemplate/t11-result.txt

@@ -1,4 +0,0 @@
-# comment line
-a=$(a)
-# comment line
-a=gbl

modules/database/test/ioc/dbtemplate/t11-substitute.txt

@@ -1,10 +0,0 @@
-file t11-template.txt {
-    pattern {}
-    {}
-}
-
-global { a=gbl }
-file t11-template.txt {
-    pattern {}
-    {}
-}

modules/database/test/ioc/dbtemplate/t11-template.txt

@@ -1,2 +0,0 @@
-# comment line
-a=$(a)

modules/database/test/ioc/dbtemplate/t12-result.txt

@@ -1,2 +0,0 @@
-# comment line
-a=foo

modules/database/test/ioc/dbtemplate/t12-substitute.txt

@@ -1,3 +0,0 @@
-file $(PREFIX)$(TEST_NO)-template.txt {
-    { a=foo }
-}