bugfix for older compilers: have all declarations before instructions

Add -v (verbose) flag to softIoc
Only display the startup steps taken if -v was given. Show each step *before* running it, so error messages follow it.
2020-11-16 17:58:01 +01:00 · 2020-11-16 17:44:51 +01:00 · 2020-11-16 17:44:21 +01:00 · 2020-11-16 17:44:01 +01:00 · 2020-11-16 17:41:08 +01:00 · 2020-11-16 17:34:20 +01:00
151 changed files with 1825 additions and 813 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -37,6 +37,8 @@ skip_commits:
 #   build matrix configuration    #
 #---------------------------------#

+image: Visual Studio 2015
+
 # Build Configurations: dll/static, regular/debug
 configuration:
  - dynamic
@@ -49,6 +51,7 @@ environment:
  # common / default variables for all jobs
  SETUP_PATH: .ci-local:.ci
  BASE: SELF
+  EPICS_TEST_IMPRECISE_TIMING: YES

  matrix:
  - CMP: vs2019
@@ -59,7 +62,7 @@ environment:
  - CMP: vs2013
  - CMP: vs2012
  - CMP: vs2010
-  - CMP: mingw
+  - CMP: gcc

 # Platform: processor architecture
 platform:
@@ -89,17 +92,17 @@ matrix:

 install:
  - cmd: git submodule update --init --recursive
-  - cmd: python .ci/appveyor/do.py prepare
+  - cmd: python .ci/cue.py prepare

 build_script:
-  - cmd: python .ci/appveyor/do.py build
+  - cmd: python .ci/cue.py build

 test_script:
-  - cmd: python .ci/appveyor/do.py test
+  - cmd: python .ci/cue.py test

 on_finish:
  - ps: Get-ChildItem *.tap -Recurse -Force | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
-  - cmd: python .ci/appveyor/do.py build test-results -s
+  - cmd: python .ci/cue.py build test-results -s

 #---------------------------------#
 #         debugging               #
--- a/.ci
+++ b/.ci
--- a/.ci-local/travis-fixup.sh
+++ b/.ci-local/travis-fixup.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e -u -x
+
+env|grep TRAVIS
+
+[ "$TRAVIS_OS_NAME" = "linux" ] || exit 0
+
+# Ensure there is an interface with a (correct) broadcast address
+# eg. 'trusty' VMs have interface broadcast address mis-configured
+# (why oh why do people insist on setting this explicitly?)
+
+sudo ip tuntap add dev tap42 mode tap
+
+sudo ip addr add 192.168.240.1/24 broadcast + dev tap42
+
+sudo ip link set dev tap42 up
+
+# note that this device will be UP but not RUNNING
+# so java will see it as not UP since java confuses UP and RUNNING
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,3 +26,6 @@
    path = .ci
    url = https://github.com/epics-base/ci-scripts
    branch = master
+[submodule "modules/pcas"]
+    path = modules/pcas
+    url = https://github.com/epics-modules/pcas
--- a/.tools/make-tar.sh
+++ b/.tools/make-tar.sh
@@ -1,22 +1,26 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Make tar for git repo w/ one level of sub modules.
 #
-set -e
+set -e -u

 die() {
  echo "$1" >&2
  exit 1
 }

-TOPREV="$1"
-FINALTAR="$2"
-PREFIX="$3"
+maybedie() {
+  if [ "$DEVMODE" ]; then
+    echo "Warning: $1" >&2
+  else
+    echo "Error: $1" >&2
+    exit 1
+  fi
+}

-if ! [ "$TOPREV" ]
-then
+usage() {
   cat <<EOF >&2
-usage: $0 <rev> [<outfile> [<prefix>]]
+usage: $0 [-v] [-s] <rev> [<outfile> [<prefix>]]

  <rev> may be any git revision spec. (tag, branch, or commit id).

@@ -24,9 +28,33 @@ usage: $0 <rev> [<outfile> [<prefix>]]
  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>/".
+
+  Options:
+
+    -v   Enable verbose prints
+    -d   Enable permissive developer mode
 EOF
   exit 1
-fi
+}
+
+export DEVMODE=
+
+while getopts "vd" OPT
+do
+    case "$OPT" in
+    v) set -x;;
+    d) DEVMODE=1;;
+    ?) echo "Unknown option"
+       usage;;
+    esac
+done
+shift $(($OPTIND - 1))
+
+TOPREV="$1"
+FINALTAR="$2"
+PREFIX="${3:-}"
+
+[ "$TOPREV" ] || usage

 case "$FINALTAR" in
 "")
@@ -59,16 +87,13 @@ case "$PREFIX" in
 esac

 # Check for both <tag> and R<tag>
-if [ "$TOPREV" = "HEAD" ]
-then
-  true
-elif ! [ `git tag -l $TOPREV` ]
+if ! [ `git tag -l $TOPREV` ]
 then
  if [ `git tag -l R$TOPREV` ]
  then
    TOPREV="R$TOPREV"
  else
-    die "No tags exist '$TOPREV' or 'R$TOPREV'"
+    maybedie "No tags exist '$TOPREV' or 'R$TOPREV'"
  fi
 fi

@@ -89,11 +114,17 @@ git archive --prefix=$PREFIX $TOPREV | tar -C "$TDIR"/tar -x
 #
 # sub-modules appear in tree as eg.:
 #  160000 commit c3a6cfcf0dad4a4eeecf59b474710d06ff3eb68a  modules/ca
-git ls-tree -r $TOPREV | awk '/^[0-9]+ commit / {print $3, $4}' | \
+git ls-tree -r $TOPREV | \
+  awk '/^[0-9]+ commit / && $4 != ".ci" {print $3, $4}' | \
 while read HASH MODDIR
 do
    echo "Visiting $HASH $MODDIR"
-    git -C $MODDIR archive --prefix=${PREFIX}${MODDIR}/ $HASH | tar -C "$TDIR"/tar -x
+    if [ -e $MODDIR/.git ]
+    then
+        git -C $MODDIR archive --prefix=${PREFIX}${MODDIR}/ $HASH | tar -C "$TDIR"/tar -x
+    else
+        maybedie "  Submodule not checked out."
+    fi
 done

 # make a list of files copied and filter out undesirables
@@ -105,13 +136,17 @@ sed -i -e 's|^\./||' "$TDIR"/list.1

 # Exclude files
 sed \
-  -e '/\/\.\?ci\//d' \
+  -e '/\/\.ci\//d' \
+  -e '/\/\.ci-local\//d' \
  -e '/\/\.tools\//d' \
  -e '/\/jenkins\//d' \
  -e '/\/\.git/d' \
+  -e '/\/\.hgtags$/d' \
+  -e '/\/\.cproject$/d' \
  -e '/\/\.project$/d' \
  -e '/\/\.travis\.yml$/d' \
  -e '/\/\.appveyor\.yml$/d' \
+  -e '/\/\.readthedocs\.yml$/d' \
  "$TDIR"/list.1 > "$TDIR"/list.2

 if ! diff -U 0 "$TDIR"/list.1 "$TDIR"/list.2
@@ -129,5 +164,5 @@ tar -t $TAROPT -f "$FINALTAR" > "$TDIR"/list.3
 # make sure we haven't picked up anything extra
 if ! diff -u "$TDIR"/list.2 "$TDIR"/list.3
 then
-    echo "Oops! Tarfile diff against plan shown above"
+    die "Oops! Tarfile diff against plan shown above"
 fi
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ env:
  global:
    - SETUP_PATH=.ci-local:.ci
    - BASE=SELF
+    - EPICS_TEST_IMPRECISE_TIMING=YES

 addons:
  apt:
@@ -35,10 +36,13 @@ addons:
    update: true

 install:
-  - ./.ci/travis/prepare.sh
+  - ./.ci-local/travis-fixup.sh
+  - python .ci/cue.py prepare

 script:
-  - ./.ci/travis/build.sh
+  - python .ci/cue.py build
+  - python .ci/cue.py test
+  - python .ci/cue.py test-results

 # Define build jobs

@@ -51,10 +55,10 @@ jobs:
  - dist: xenial

  - dist: bionic
-    env: EXTRA="CMD_CXXFLAGS=-std=c++11"
+    env: BCFG=static EXTRA="CMD_CXXFLAGS=-std=c++11"

  - dist: trusty
-    env: STATIC=YES EXTRA="CMD_CXXFLAGS=-std=c++11"
+    env: EXTRA="CMD_CXXFLAGS=-std=c++11"

  - dist: bionic
    compiler: clang
@@ -63,15 +67,13 @@ jobs:

  - dist: trusty
    compiler: clang
-    env: STATIC=YES
+    env: BCFG=static

 # Cross-compilations to Windows using MinGW and WINE

-  - env: WINE=32 TEST=NO STATIC=YES
-    compiler: mingw
+  - env: WINE=32 TEST=NO BCFG=static

-  - env: WINE=32 TEST=NO STATIC=NO
-    compiler: mingw
+  - env: WINE=32 TEST=NO

 # Cross-compilation to RTEMS

--- a/7
+++ b/7
@@ -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)
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -58,12 +58,8 @@ include $(CONFIG)/CONFIG_BASE_VERSION
 include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).Common
 -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).Common

-# Parse configure/RELEASE
-# except when building Base itself, where this file is empty,
-# and would error in src/tools/ anyway.
-ifndef BASE_TOP
+# Parse configure/RELEASE to find all upstream modules
 RELEASE_TOPS := $(shell $(CONVERTRELEASE) -T $(TOP) releaseTops)
-endif

 ifdef T_A

--- a/configure/CONFIG.gnuCommon
+++ b/configure/CONFIG.gnuCommon
@@ -34,7 +34,7 @@ CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
 CODE_CFLAGS += $(ASAN_FLAGS_$(ENABLE_ASAN))
 WARN_CFLAGS_YES = -Wall
 WARN_CFLAGS_NO = -w
-OPT_CFLAGS_YES = -O3
+OPT_CFLAGS_YES = -O3 -g
 OPT_CFLAGS_NO = -g

 PROF_CXXFLAGS_YES = -p
@@ -43,7 +43,7 @@ CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
 CODE_CXXFLAGS += $(ASAN_FLAGS_$(ENABLE_ASAN))
 WARN_CXXFLAGS_YES = -Wall
 WARN_CXXFLAGS_NO = -w
-OPT_CXXFLAGS_YES = -O3
+OPT_CXXFLAGS_YES = -O3 -g
 OPT_CXXFLAGS_NO = -g

 CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
--- a/configure/CONFIG_BASE_VERSION
+++ b/configure/CONFIG_BASE_VERSION
@@ -52,12 +52,12 @@ EPICS_MODIFICATION = 4

 # 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
+EPICS_PATCH_LEVEL = 1

 # Immediately after an official release the EPICS_PATCH_LEVEL is incremented
 # and the -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=-rc1
--- a/configure/CONFIG_CA_VERSION
+++ b/configure/CONFIG_CA_VERSION
@@ -2,11 +2,11 @@

 EPICS_CA_MAJOR_VERSION = 4
 EPICS_CA_MINOR_VERSION = 13
-EPICS_CA_MAINTENANCE_VERSION = 6
+EPICS_CA_MAINTENANCE_VERSION = 7

 # Development flag, set to zero for release versions

-EPICS_CA_DEVELOPMENT_FLAG = 0
+EPICS_CA_DEVELOPMENT_FLAG = 1

 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1
--- a/configure/CONFIG_DATABASE_VERSION
+++ b/configure/CONFIG_DATABASE_VERSION
@@ -2,11 +2,11 @@

 EPICS_DATABASE_MAJOR_VERSION = 3
 EPICS_DATABASE_MINOR_VERSION = 18
-EPICS_DATABASE_MAINTENANCE_VERSION = 0
+EPICS_DATABASE_MAINTENANCE_VERSION = 1

 # Development flag, set to zero for release versions

-EPICS_DATABASE_DEVELOPMENT_FLAG = 0
+EPICS_DATABASE_DEVELOPMENT_FLAG = 1

 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1
--- a/configure/CONFIG_LIBCOM_VERSION
+++ b/configure/CONFIG_LIBCOM_VERSION
@@ -2,11 +2,11 @@

 EPICS_LIBCOM_MAJOR_VERSION = 3
 EPICS_LIBCOM_MINOR_VERSION = 18
-EPICS_LIBCOM_MAINTENANCE_VERSION = 0
+EPICS_LIBCOM_MAINTENANCE_VERSION = 1

 # Development flag, set to zero for release versions

-EPICS_LIBCOM_DEVELOPMENT_FLAG = 0
+EPICS_LIBCOM_DEVELOPMENT_FLAG = 1

 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -161,7 +161,9 @@ 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 =
+ifeq ($(INSTALL_LOCATION),$(EPICS_BASE))
+EPICS_SITE_VERSION=$(shell $(PERL) -MPOSIX -e 'print strftime "%Y-%m-%d", localtime')
+endif

 # For GNU compiler, use pipes rather than temporary files for
 #  communication between the various stages of compilation.
--- a/configure/RULES_BUILD
+++ b/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

@@ -116,7 +133,7 @@ ifneq (,$(filter $(T_A), $(EPICS_HOST_ARCH) $(CROSS_COMPILER_RUNTEST_ARCHS)))
 RUNTESTS_ENABLED = YES
 TESTSCRIPTS.t = $(filter %.t, $(TESTSCRIPTS))
 TAPFILES.t += $(TESTSCRIPTS.t:.t=.tap)
-JUNITFILES.t += $(TESTSCRIPTS.t:.t=.xml)
+JUNITFILES.t += $(TESTSCRIPTS.t:.t=-results.xml)
 TAPFILES += $(TAPFILES.t)
 JUNITFILES += $(JUNITFILES.t)
 endif
@@ -208,9 +225,9 @@ $(LOADABLE_SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)

 $(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
@@ -311,10 +328,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

@@ -390,7 +403,7 @@ ifdef RUNTESTS_ENABLED
 	$(PERL) $< -tap > $@
 endif

-$(JUNITFILES.t): %.xml: %.tap
+$(JUNITFILES.t): %-results.xml: %.tap
 	$(TAPTOJUNIT) --puretap --output $@ --input $< $*

 # If there's a perl test script (.plt) available, use it
@@ -490,11 +503,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 $@"
--- a/configure/RULES_MODULES
+++ b/configure/RULES_MODULES
@@ -50,9 +50,11 @@ realclean:
 # Append all our live submodule failure files
 FAILURE_FILES = $(addsuffix /$(TEST_FAILURE_FILENAME), $(LIVE_SUBMODULES))

+define combine_failure_files
+	@$(TOUCH) $(FAILURE_FILES)
+	@$(CAT) $(FAILURE_FILES) >> $(TEST_FAILURE_FILE)
+endef
 runtests: | $(addsuffix $(DIVIDER)runtests, $(LIVE_SUBMODULES))
-	@$(TOUCH) $(FAILURE_FILES)
-	@$(CAT) $(FAILURE_FILES) >> $(TEST_FAILURE_FILE)
+	$(if $(FAILURE_FILES), $(combine_failure_files))
 test-results: | $(addsuffix $(DIVIDER)test-results, $(LIVE_SUBMODULES))
-	@$(TOUCH) $(FAILURE_FILES)
-	@$(CAT) $(FAILURE_FILES) >> $(TEST_FAILURE_FILE)
+	$(if $(FAILURE_FILES), $(combine_failure_files))
--- a/configure/RULES_TOP
+++ b/configure/RULES_TOP
@@ -33,7 +33,7 @@ UNINSTALL_DIRS += $(INSTALL_INCLUDE) $(INSTALL_TEMPLATES) $(DIRECTORY_TARGETS)
 ifneq ($(INSTALL_LOCATION),$(TOP))
  UNINSTALL_DIRS += $(INSTALL_CONFIG)
 endif
-uninstallDirs:
+uninstallDirs: | clean
 	$(RMDIR) $(UNINSTALL_DIRS)

  # Remove the bin and lib directories if they have no sub-directories
@@ -41,12 +41,12 @@ uninstallDirs:
 EMPTY_INSTALL_DIRS = \
    $(if $(wildcard $(INSTALL_LOCATION_BIN)/*),,$(INSTALL_LOCATION_BIN)) \
    $(if $(wildcard $(INSTALL_LOCATION_LIB)/*),,$(INSTALL_LOCATION_LIB))
-uninstall: archuninstall uninstallDirs
+uninstall: archuninstall uninstallDirs | clean
 	$(RMDIR) $(EMPTY_INSTALL_DIRS)

 archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))

-uninstall$(DIVIDER)%:
+uninstall$(DIVIDER)%: | clean
 	$(RMDIR) $(addsuffix /$(subst uninstall$(DIVIDER),,$@), \
 	    $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB))

--- a/configure/os/CONFIG.Common.RHEL7-x86_64
+++ b/configure/os/CONFIG.Common.RHEL7-x86_64
@@ -0,0 +1,2 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
--- a/configure/os/CONFIG.Common.RHEL7-x86_64-clang
+++ b/configure/os/CONFIG.Common.RHEL7-x86_64-clang
@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang
--- a/configure/os/CONFIG.Common.SL5-x86
+++ b/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
--- a/configure/os/CONFIG.Common.SL5-x86_64
+++ b/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
--- a/configure/os/CONFIG.Common.SL6-x86
+++ b/configure/os/CONFIG.Common.SL6-x86
@@ -0,0 +1,4 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+ARCH_DEP_CFLAGS += -march=i686
--- a/configure/os/CONFIG.Common.SL6-x86_64
+++ b/configure/os/CONFIG.Common.SL6-x86_64
@@ -0,0 +1,2 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
--- a/configure/os/CONFIG.Common.SL6-x86_64-clang
+++ b/configure/os/CONFIG.Common.SL6-x86_64-clang
@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang
--- a/configure/os/CONFIG.Common.T2-ppc604
+++ b/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
--- a/configure/os/CONFIG.Common.V62-ppc604
+++ b/configure/os/CONFIG.Common.V62-ppc604
@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.2
--- a/configure/os/CONFIG.Common.V63-ppc603
+++ b/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
--- a/configure/os/CONFIG.Common.V63-ppc604
+++ b/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
--- a/configure/os/CONFIG.Common.V66-ppc603
+++ b/configure/os/CONFIG.Common.V66-ppc603
@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long
+VXWORKS_VERSION = 6.6
--- a/configure/os/CONFIG.Common.V66-ppc604
+++ b/configure/os/CONFIG.Common.V66-ppc604
@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.6
--- a/configure/os/CONFIG.Common.V67-ppc604
+++ b/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>'
--- a/configure/os/CONFIG.Common.V69-ppc32
+++ b/configure/os/CONFIG.Common.V69-ppc32
@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc32
+VXWORKS_VERSION = 6.9
+export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
--- a/configure/os/CONFIG.Common.V69-ppc604
+++ b/configure/os/CONFIG.Common.V69-ppc604
@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.9
+export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
--- a/configure/os/CONFIG.Common.eldk42-ppc4xxFP
+++ b/configure/os/CONFIG.Common.eldk42-ppc4xxFP
@@ -0,0 +1,22 @@
+# 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
--- a/configure/os/CONFIG.Common.eldk51-ppc4xxSF
+++ b/configure/os/CONFIG.Common.eldk51-ppc4xxSF
@@ -0,0 +1,14 @@
+# Virtex FPGA embedded Processor with ELDK 5.1
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+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)
--- a/configure/os/CONFIG.Common.eldk52-e500v2
+++ b/configure/os/CONFIG.Common.eldk52-e500v2
@@ -0,0 +1,15 @@
+# IOxOS IFC1210 with ELDK 5.2
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+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 =
--- a/configure/os/CONFIG.Common.eldk53-ppc4xxFP
+++ b/configure/os/CONFIG.Common.eldk53-ppc4xxFP
@@ -0,0 +1,21 @@
+# DeltaTau PowerPMAC with ELDK 5.3
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+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
--- a/configure/os/CONFIG.Common.fslqoriq20-e6500_64
+++ b/configure/os/CONFIG.Common.fslqoriq20-e6500_64
@@ -0,0 +1,23 @@
+# IOxOS IFC1211 with Freescale QorIQ 2.0 toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+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
--- a/configure/os/CONFIG.Common.linux-clang
+++ b/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++
--- a/configure/os/CONFIG.Common.moxa42-armv6l
+++ b/configure/os/CONFIG.Common.moxa42-armv6l
@@ -0,0 +1,16 @@
+# 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
--- a/configure/os/CONFIG.Common.mvl40-xscale_be
+++ b/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
--- a/configure/os/CONFIG.Common.nilrt7-armv7a
+++ b/configure/os/CONFIG.Common.nilrt7-armv7a
@@ -0,0 +1,18 @@
+# National Instruments CompactRIO running LabView RT 19.5.1
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = arm
+
+GNU_TARGET = arm-linux-gnu
+
+SYSROOT = /opt/LabVIEW-RT-19.5.1/arm/sysroots/armv7a-vfp-neon-nilrt-linux-gnueabi
+
+ARCH_DEP_CPPFLAGS += -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon
+ARCH_DEP_CPPFLAGS += --sysroot=$(SYSROOT)
+ARCH_DEP_CPPFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi/
+ARCH_DEP_CPPFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/
+ARCH_DEP_LDFLAGS  += --sysroot=$(SYSROOT)
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
--- a/configure/os/CONFIG.Common.raspbian-arm
+++ b/configure/os/CONFIG.Common.raspbian-arm
@@ -0,0 +1,41 @@
+# 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/
+
+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)
--- a/configure/os/CONFIG.Common.vxWorks-ppc32
+++ b/configure/os/CONFIG.Common.vxWorks-ppc32
@@ -14,6 +14,7 @@ ARCH_CLASS = ppc

 # Architecture specific build flags
 ARCH_DEP_CPPFLAGS = -DCPU=PPC32
+ARCH_DEP_CPPFLAGS = -DCPU=PPC604
 ARCH_DEP_CFLAGS = -mstrict-align

 GNU_TARGET = powerpc-wrs-vxworks
--- a/configure/os/CONFIG.Common.vxWorks-ppc603
+++ b/configure/os/CONFIG.Common.vxWorks-ppc603
@@ -13,7 +13,7 @@ CMPLR_SUFFIX = ppc
 ARCH_CLASS = ppc

 # Architecture specific build flags
-ARCH_DEP_CPPFLAGS = -DCPU=PPC603  
+ARCH_DEP_CPPFLAGS = -DCPU=PPC603
 ARCH_DEP_CFLAGS = -mcpu=603 -mstrict-align

 GNU_TARGET = powerpc-wrs-vxworks
--- a/configure/os/CONFIG.Common.vxWorks-ppc604
+++ b/configure/os/CONFIG.Common.vxWorks-ppc604
@@ -14,9 +14,12 @@ ARCH_CLASS = ppc

 # Architecture specific build flags
 ARCH_DEP_CPPFLAGS = -DCPU=PPC604
-ARCH_DEP_CFLAGS_2 = -mcpu=604 -mstrict-align -mno-implicit-fp
-ARCH_DEP_CFLAGS_3 = -mcpu=604 -mstrict-align -mno-implicit-fp
-ARCH_DEP_CFLAGS_4 = -mcpu=604 -mstrict-align -fno-implicit-fp
-ARCH_DEP_CFLAGS = $(ARCH_DEP_CFLAGS_$(VX_GNU_MAJOR_VERSION))
+ARCH_DEP_CFLAGS   = -mcpu=604 -mstrict-align
+
+CODE_CFLAGS_2 = -mno-implicit-fp
+CODE_CFLAGS_3 = -mno-implicit-fp
+CODE_CFLAGS_4 = -fno-implicit-fp
+CODE_CFLAGS += $(CODE_CFLAGS_$(VX_GNU_MAJOR_VERSION))
+

 GNU_TARGET = powerpc-wrs-vxworks
--- a/configure/os/CONFIG.Common.yocto21-aarch64
+++ b/configure/os/CONFIG.Common.yocto21-aarch64
@@ -0,0 +1,18 @@
+# XILINX Zynq with Yocto 2.1 / Petalinux toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+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)
--- a/configure/os/CONFIG.RHEL7-x86_64.Common
+++ b/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
--- a/configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64
+++ b/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
--- a/configure/os/CONFIG.RHEL7-x86_64.SL6-x86
+++ b/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.7
+# compat-gcc-44-4.4.7
+# compat-glibc-headers-2.12
+# 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 = -B /usr/lib/x86_64-redhat-linux6E/lib
+LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo
--- a/configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64
+++ b/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.7
+# compat-gcc-44-4.4.7
+# compat-glibc-headers-2.12
+# compat-glibc-2.12
+#-------------------------------------------------------
+
+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 = -B /usr/lib/x86_64-redhat-linux6E/lib64
+LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo
--- a/configure/os/CONFIG.RHEL7-x86_64.win32-x86
+++ b/configure/os/CONFIG.RHEL7-x86_64.win32-x86
@@ -0,0 +1,8 @@
+include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
+
+PATH_FILTER = $(subst /,/,$(1))
+
+# Silence the tr1 namespace deprecation warnings
+USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
+
+MSVC_DIR = /opt/wine-msvc-2017/bin/x86/
--- a/configure/os/CONFIG.RHEL7-x86_64.windows-x64
+++ b/configure/os/CONFIG.RHEL7-x86_64.windows-x64
@@ -0,0 +1,8 @@
+include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
+
+PATH_FILTER = $(subst /,/,$(1))
+
+# Silence the tr1 namespace deprecation warnings
+USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
+
+MSVC_DIR = /opt/wine-msvc-2017/bin/x64/
--- a/configure/os/CONFIG.SL5-x86.Common
+++ b/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
--- a/configure/os/CONFIG.SL5-x86.SL5-x86
+++ b/configure/os/CONFIG.SL5-x86.SL5-x86
@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
--- a/configure/os/CONFIG.SL5-x86_64.Common
+++ b/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
--- a/configure/os/CONFIG.SL5-x86_64.SL5-x86_64
+++ b/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
--- a/configure/os/CONFIG.SL6-x86.Common
+++ b/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
--- a/configure/os/CONFIG.SL6-x86.SL6-x86
+++ b/configure/os/CONFIG.SL6-x86.SL6-x86
@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
--- a/configure/os/CONFIG.SL6-x86_64.Common
+++ b/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
--- a/configure/os/CONFIG.SL6-x86_64.SL6-x86
+++ b/configure/os/CONFIG.SL6-x86_64.SL6-x86
@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
--- a/configure/os/CONFIG.SL6-x86_64.SL6-x86_64
+++ b/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
--- a/configure/os/CONFIG.win32-x86.win32-x86
+++ b/configure/os/CONFIG.win32-x86.win32-x86
@@ -14,15 +14,15 @@ OPT_WHOLE_PROGRAM = YES

 #-------------------------------------------------------

-WINLINK = link
+WINLINK = $(MSVC_DIR)link

-RCCMD = rc -l 0x409 $(INCLUDES) -fo $@ $<
+RCCMD = $(MSVC_DIR)rc -l 0x409 $(INCLUDES) -fo $@ $<

-ARCMD = lib -nologo -verbose -out:$@ $(LIB_OPT_LDFLAGS) $(LIBRARY_LD_OBJS)
+ARCMD = $(MSVC_DIR)lib -nologo -verbose -out:$@ $(LIB_OPT_LDFLAGS) $(LIBRARY_LD_OBJS)

 #
 # Configure OS vendor C compiler
-CC = cl
+CC = $(MSVC_DIR)cl

 # Override CONFIG.gnuCommon settings for cross builds.
 GNU = NO
@@ -75,14 +75,14 @@ STATIC_CFLAGS_YES= -MT$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS)
 STATIC_CFLAGS_NO= -MD$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS) -DEPICS_CALL_DLL

 # OS vendor c preprocessor
-CPP = cl -nologo -C -E
+CPP = $(MSVC_DIR)cl -nologo -C -E

 # Configure OS vendor C++ compiler
 #
 # -EHsc - generate code for exceptions
 # -GR - generate code for run time type identification
 #
-CCC = cl -EHsc -GR
+CCC = $(MSVC_DIR)cl -EHsc -GR

 # Other compiler flags, used for CPP, C and C++
 #
--- a/configure/os/CONFIG_SITE.Common.UnixCommon
+++ b/configure/os/CONFIG_SITE.Common.UnixCommon
@@ -0,0 +1,2 @@
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
--- a/configure/os/CONFIG_SITE.Common.linuxCommon
+++ b/configure/os/CONFIG_SITE.Common.linuxCommon
@@ -9,3 +9,6 @@
 # loaded into RAM when the binary is loaded.
 OPT_CFLAGS_YES += -g
 OPT_CXXFLAGS_YES += -g
+
+COMMANDLINE_LIBRARY = READLINE
+CODE_CPPFLAGS += -fno-strict-aliasing
--- a/configure/os/CONFIG_SITE.Common.vxWorksCommon
+++ b/configure/os/CONFIG_SITE.Common.vxWorksCommon
@@ -2,24 +2,81 @@
 #
 # Site specific definitions for vxWorks target builds.

-# Compiler options can vary with the vxWorks version number, so we
-# need to know that.  Do not include any third-level digits.
+#### Fixes for CONFIG.Common.vxWorksCommon  #######

-# Note: vxWorks 5.4.x and 5.5.x (Tornado 2.x) are not supported.
-# VxWorks 6.0 through 6.5 use older, untested versions of GCC.
-
-#VXWORKS_VERSION = 6.6
-#VXWORKS_VERSION = 6.7
-#VXWORKS_VERSION = 6.8
-VXWORKS_VERSION = 6.9
+VX_GNU_VERSION_7 = 4.8.1.11


-# Sites may override the following path for a particular host
-# architecture by adding it to an appropriate
-# CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file.
+# 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 = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
+VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_MAJOR_VERSION))
+VX_GNU_MAJOR_VERSION = $(firstword $(subst ., ,$(VX_GNU_VERSION)))
+VX_GNU_MINOR_VERSION = $(word 2,$(subst ., ,$(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))
+
+# vxWorks directory definitions
+VX_DIR_5 = $(WIND_BASE)
+VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
+VX_DIR_7 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/pkgs/os
+VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
+
+VX_INCLUDE_DIRS_5  = $(VX_DIR)/target/h
+VX_INCLUDE_DIRS_6  = $(VX_DIR)/target/h
+VX_INCLUDE_DIRS_6 += $(VX_DIR)/target/h/wrn/coreip
+VX_INCLUDE_DIRS_7  = $(VX_DIR)/core/kernel-1.2.8.0/h
+VX_INCLUDE_DIRS_7 += $(VX_DIR)/lang-lib/libc-1.0.0.1/libc-kernel-1.0.8.0/h
+VX_INCLUDE_DIRS_7 += $(VX_DIR)/utils/ostools-1.0.5.0/h
+VX_INCLUDE_DIRS_7 += $(VX_DIR)/utils/ostools-1.0.5.0/shareh
+VX_INCLUDE_DIRS_7 += $(VX_DIR)/arch/ppc-1.3.4.0/kernel/base/h/
+VX_INCLUDE_DIRS_7 += $(VX_DIR)/arch/ppc-1.3.4.0/kernel/60x/h/arch/ppc/
+VX_INCLUDE_DIRS_7 += $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/samples/prebuilt_projects/vsb_vxsim_linux/krnl/h/public
+GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
+
+TARGET_CPPFLAGS_5 = -isystem $(VX_DIR)/target/h
+TARGET_CPPFLAGS_6 = -isystem $(VX_DIR)/target/h
+TARGET_CPPFLAGS_7 = -isystem $(VX_DIR)/core/kernel-1.2.8.0/h -D_VSB_CONFIG_FILE='<$(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/samples/prebuilt_projects/vsb_vxsim_linux/h/config/vsbConfig.h>'
+TARGET_CPPFLAGS = $(TARGET_CPPFLAGS_$(VXWORKS_MAJOR_VERSION))
+
+# vxWorks GNU directories
+
+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_7 = $(WIND_BASE)/compilers/gnu-$(VX_GNU_VERSION)/$(WIND_HOST_TYPE)
+GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
+
+# Operating system flags
+OP_SYS_CFLAGS += -fno-strict-aliasing
+
+OP_SYS_INCLUDE_CPPFLAGS_5 += -include $(VX_DIR)/target/h/vxWorks.h
+OP_SYS_INCLUDE_CPPFLAGS_6 += -include $(VX_DIR)/target/h/vxWorks.h
+OP_SYS_INCLUDE_CPPFLAGS_7 += -include vxWorks.h
+OP_SYS_INCLUDE_CPPFLAGS = $(OP_SYS_INCLUDE_CPPFLAGS_$(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))

 # WIND_BASE is where you installed the Wind River software.
+WIND_BASE = /afs/psi.ch/project/vxworks/VxWorks$(VXWORKS_VERSION)
+
+#--------------------------------------------------
+# 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))

-#WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
-WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
-#WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
--- a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common
+++ b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common
@@ -0,0 +1,21 @@
+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
+
+# WINE MSVC
+CROSS_COMPILER_TARGET_ARCHS += win32-x86 windows-x64
+
+# NI Linux Real-Time 7.x
+# requires RPM gcc-c++-arm-linux-gnu
+CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a
+
--- a/configure/os/CONFIG_SITE.SL5-x86.Common
+++ b/configure/os/CONFIG_SITE.SL5-x86.Common
@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
--- a/configure/os/CONFIG_SITE.SL5-x86_64.Common
+++ b/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
--- a/configure/os/CONFIG_SITE.SL6-x86.Common
+++ b/configure/os/CONFIG_SITE.SL6-x86.Common
@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
--- a/configure/os/CONFIG_SITE.SL6-x86_64.Common
+++ b/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
--- a/configure/os/CONFIG_SITE.linux-x86.Common
+++ b/configure/os/CONFIG_SITE.linux-x86.Common
@@ -1,9 +1,46 @@
-# 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_PATCH_VSTRING)

-# 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
+
+# vxWorks 6.9 for MVxxxx boards
+CROSS_COMPILER_TARGET_ARCHS += V69-ppc604
+CROSS_COMPILER_TARGET_ARCHS += V69-ppc32
+
+# 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
--- a/configure/os/CONFIG_SITE.linux-x86_64.Common
+++ b/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
--- a/documentation/RELEASE_NOTES.md
+++ b/documentation/RELEASE_NOTES.md
@@ -11,6 +11,13 @@ release.
 The PVA submodules each have their own individual sets of release notes which
 should also be read to understand what has changed since earlier releases.

+**This version of EPICS has not been released yet.**
+
+## Changes made on the 7.0 branch since 7.0.4
+
+<!-- Insert new items immediately below here ... -->
+
+
 ## EPICS Release 7.0.4

 ### Bug fixes
@@ -1322,6 +1329,15 @@ header and removed the need for dbScan.c to reach into the internals of its
 # Changes incorporated from the 3.15 branch


+## Changes made on the 3.15 branch since 3.15.8
+
+### Change to the `junitfiles` self-test build target
+
+The names of the generated junit xml test output files have been changed
+from `<testname>.xml` to `<testname>-results.xml`, to allow better
+distinction from other xml files. (I.e., for easy wildcard matching.)
+
+
 ## Changes made between 3.15.7 and 3.15.8

 ### Bug fixes
@@ -1345,7 +1361,6 @@ The following launchpad bugs have fixes included in this release:
 - [lp: 1868486](https://bugs.launchpad.net/epics-base/+bug/1868486),
  epicsMessageQueue lost messages

-
 ### Improvements to the self-test build targets

 This release contains changes that make it possible to integrate another test
@@ -1361,7 +1376,7 @@ results; previously the `-k` flag to make was needed and even that didn't always
 work.

 Continuous Integration systems are recommended to run `make tapfiles` (or if
-they can read junittest output instead of TAP `make junitests`) followed by
+they can read junittest output instead of TAP `make junitfiles`) followed by
 `make -s test-results` to display the results of the tests. If multiple CPUs are
 available the `-j` flag can be used to run tests in parallel, giving the maximum
 jobs that should be allowed so `make -j4 tapfiles` for a system with 4 CPUs say.
@@ -1609,8 +1624,8 @@ cases. This fixes
 Some documentation has been added to the `dbdToHtml.pl` script
 explaining how Perl POD (Plain Old Documentation) markup can be added to
 `.dbd` files to generate HTML documentation for the record types. To see
-these instructions, run `perl bin/<host>/dbdToHtml.pl -H`
-or `perldoc bin/<host>/dbdToHtml.pl`.
+these instructions, run `perl bin/<host>/dbdToHtml.pl -H`
+or `perldoc bin/<host>/dbdToHtml.pl`.

 ### Fix problem with numeric soft events

--- a/documentation/ReleaseChecklist.html
+++ b/documentation/ReleaseChecklist.html
@@ -147,17 +147,17 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
      <td>Tag the module in Git, using these tag conventions:
        <ul>
          <li>
-            <tt>R7.0.3.2-pre<i>n</i></tt>
+            <tt>R7.0.4.1-pre<i>n</i></tt>
            &mdash; pre-release tag
            </li>
          <li>
-            <tt>R7.0.3.2-rc<i>n</i></tt>
+            <tt>R7.0.4.1-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.2-rc1' R7.0.3.2-rc1
+          git tag -m 'ANJ: Tagged for 7.0.4.1-rc1' R7.0.4.1-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
@@ -171,11 +171,11 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
        files and directories that are only used for continuous integration:
        <blockquote><tt>
          cd base-7.0<br />
-          ./.tools/make-tar.sh R7.0.3.2-rc1 base-7.0.3.2-rc1.tar.gz base-7.0.3.2-rc1/
+          ./.tools/make-tar.sh R7.0.4.1-rc1 base-7.0.4.1-rc1.tar.gz base-7.0.4.1-rc1/
          </tt></blockquote>
        Create a GPG signature file of the tarfile as follows:
        <blockquote><tt>
-          gpg --armor --sign --detach-sig base-7.0.3.2-rc1.tar.gz
+          gpg --armor --sign --detach-sig base-7.0.4.1-rc1.tar.gz
          </tt></blockquote>
        </td>
      </tr>
@@ -298,7 +298,7 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>

          <li>Tag the module:
            <blockquote><tt>
-              git tag -m 'ANJ: Tag for EPICS 7.0.3.2' &lt;module-version&gt;
+              git tag -m 'ANJ: Tag for EPICS 7.0.4.1' &lt;module-version&gt;
              </tt></blockquote>
            </li>

@@ -355,7 +355,7 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
      <td>Tag the epics-base module in Git:
        <blockquote><tt>
          cd base-7.0<br />
-          git tag -m 'ANJ: Tagged for 7.0.3.2' R7.0.3.2
+          git tag -m 'ANJ: Tagged for release' R7.0.4.1
          </tt></blockquote>
        <p>Don't push these commits or the new tag to the Launchpad repository
          yet.</p>
@@ -387,12 +387,12 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
        files and directories that are only used for continuous integration:
        <blockquote><tt>
          cd base-7.0<br />
-          ./.tools/make-tar.sh R7.0.3.2 ../base-7.0.3.2.tar.gz base-7.0.3.2/
+          ./.tools/make-tar.sh R7.0.4.1 ../base-7.0.4.1.tar.gz base-7.0.4.1/
          </tt></blockquote>
        Create a GPG signature file of the tarfile as follows:
        <blockquote><tt>
          cd ..<br />
-          gpg --armor --sign --detach-sig base-7.0.3.2.tar.gz
+          gpg --armor --sign --detach-sig base-7.0.4.1.tar.gz
          </tt></blockquote>
        </td>
      </tr>
@@ -457,7 +457,7 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
      <td>Upload the tar file and its <tt>.asc</tt> signature file to the
        epics-controls web-server.
        <blockquote><tt>
-          scp base-7.0.3.2.tar.gz base-7.0.3.2.tar.gz.asc epics-controls:download/base<br />
+          scp base-7.0.4.1.tar.gz base-7.0.4.1.tar.gz.asc epics-controls:download/base<br />
          </tt></blockquote>
        </td>
      </tr>
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -37,6 +37,9 @@ 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

--- a/modules/ca/src/client/Makefile
+++ b/modules/ca/src/client/Makefile
@@ -78,6 +78,7 @@ LIBSRCS += comQueSend.cpp
 LIBSRCS += comBuf.cpp
 LIBSRCS += hostNameCache.cpp
 LIBSRCS += msgForMultiplyDefinedPV.cpp
+LIBSRCS_vxWorks += templateInstances.cpp

 API_HEADER = libCaAPI.h
 ca_API = libCa
--- a/modules/ca/src/client/access.cpp
+++ b/modules/ca/src/client/access.cpp
@@ -603,7 +603,7 @@ void epicsStdCall ca_signal_formated ( long ca_status, const char *pfilenm,
    }
    else {
        fprintf ( stderr, "CA exception in thread w/o CA ctx: status=%s file=%s line=%d: \n",
-            ca_message ( ca_status ), pfilenm, lineno );
+            ca_message ( ca_status ), pfilenm ? pfilenm : "<null>", lineno );
        if ( pFormat ) {
            vfprintf ( stderr, pFormat, theArgs );
        }
--- a/modules/ca/src/client/templateInstances.cpp
+++ b/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 & );
--- a/modules/ca/src/perl/Makefile
+++ b/modules/ca/src/perl/Makefile
@@ -13,11 +13,11 @@ ifdef T_A
  PERL_ARCHNAME = $(shell $(PERL) ../perlConfig.pl archname)
  PERL_ARCHPATH := $(PERL_VERSION)/$(PERL_ARCHNAME)

-  PERL_ARCHLIB  := $(shell $(PERL) ../perlConfig.pl archlib)
+  PERL_ARCHLIB  := $(shell $(PERL) ../perlConfig.pl archlibexp)
  PERL_h = $(PERL_ARCHLIB)/CORE/perl.h

-  EXTUTILS := $(shell $(PERL) ../perlConfig.pl privlib)/ExtUtils
-  PERLBIN := $(shell $(PERL) ../perlConfig.pl bin)
+  EXTUTILS := $(shell $(PERL) ../perlConfig.pl privlibexp)/ExtUtils
+  PERLBIN := $(shell $(PERL) ../perlConfig.pl binexp)
  XSUBPP := $(firstword $(wildcard $(PERLBIN)/xsubpp $(EXTUTILS)/xsubpp))

 # Special settings for Darwin:
--- a/modules/ca/src/perl/capr.pl
+++ b/modules/ca/src/perl/capr.pl
@@ -35,9 +35,11 @@ my %fieldType = (
    DBF_DOUBLE   => 'DBF_FLOAT',
    DBF_FLOAT    => 'DBF_FLOAT',
    DBF_LONG     => 'DBF_LONG',
+    DBF_INT64    => 'DBF_FLOAT',
    DBF_SHORT    => 'DBF_LONG',
    DBF_ULONG    => 'DBF_LONG',
    DBF_USHORT   => 'DBF_LONG',
+    DBF_UINT64   => 'DBF_FLOAT',
    DBF_DEVICE   => 'DBF_STRING',
    DBF_ENUM     => 'DBF_STRING',
    DBF_FWDLINK  => 'DBF_STRING',
@@ -86,7 +88,7 @@ if (@ARGV) {
    printRecord($_, @ARGV);
 } else {
    if (m/^ \s* ([]+:;<>0-9A-Za-z[-]+) (?:\. \w+)? \s* , \s* (\d+) \s* $/x) {
-        # Recognizes ",n" as an interest leve, drops any ".FIELD" part
+        # Recognizes ",n" as an interest level, drops any ".FIELD" part
        printRecord($1, $2);
    } else {
        # Drop any ".FIELD" part
@@ -235,8 +237,9 @@ sub printField {
        $outStr = sprintf('%-5s %.8f', $field, $fieldData);
    } elsif ( $dataType eq 'DBF_CHAR' ) {
        $outStr = sprintf('%-5s %d', $field, ord($fieldData));
-    }else {
-        # DBF_LONG, DBF_SHORT, DBF_UCHAR, DBF_ULONG, DBF_USHORT
+    } else {
+        # DBF_INT64, DBF_LONG, DBF_SHORT,
+        # DBF_UINT64, DBF_ULONG, DBF_USHORT, DBF_UCHAR,
        $outStr = sprintf('%-5s %d', $field, $fieldData);
    }

@@ -270,17 +273,18 @@ sub printField {
 sub caget {
    my @chans = map { CA->new($_); } @_;

-    #clear results;
+    #clear any previous results;
    %callback_data = ();
    %timed_out = ();

    eval { CA->pend_io($opt_w); };
    if ($@) {
        if ($@ =~ m/^ECA_TIMEOUT/) {
-            my $err = (@chans > 1) ? 'some PV(s)' : '"' . $chans[0]->name . '"';
+            my $name = $chans[0]->name;
+            my $err = (@chans > 1) ? 'some fields' : "'$name'";
            print "Channel connect timed out: $err not found.\n";
            foreach my $chan (@chans) {
-                $timed_out{$chan->name} = $chan->is_connected;
+                $timed_out{$chan->name} = !$chan->is_connected;
            }
            @chans = grep { $_->is_connected } @chans;
        } else {
@@ -289,14 +293,12 @@ sub caget {
    }

    map {
-        my $type;
-        $type = $_->field_type;
-        $_->get_callback(\&caget_callback, $type);
+        $_->get_callback(\&caget_callback, $_->field_type);
    } @chans;

-    my $fields_read = @chans;
-    $callback_incomplete = @chans;
-    CA->pend_event(0.1) while $callback_incomplete;
+    my $fields_read = $callback_incomplete = @chans;
+    CA->pend_event(0.1)
+        while $callback_incomplete;
    return $fields_read;
 }

@@ -325,9 +327,10 @@ sub printRecord {
    my @bases = ();     #bases, from parser
    foreach my $field (sort keys %{$record{$recType}}) {
        # Skip DTYP field if this rec type doesn't have device support defined
-        if ($field eq 'DTYP' && !(exists($device{$recType}))) { next; }
+        next if $field eq 'DTYP' && !exists($device{$recType});

        my ($fType, $fInterest, $base) = getFieldParams($recType, $field);
+        # FIXME: Support waveform.VAL fields etc.
        unless( $fType eq 'DBF_NOACCESS' ) {
            if ($interest >= $fInterest ) {
                my $fToGet = "$name.$field";
@@ -346,15 +349,10 @@ sub printRecord {
        my $field  = $fields_pr[$i];
        my $fToGet = $readlist[$i];
        my ($fType, $data, $base);
-        if ($timed_out{$fToGet}) {
-            $fType = $fieldType{DBF_STRING};
-            $data  = '<timeout>';
-        }
-        else {
-            $fType  = $ftypes[$i];
-            $base   = $bases[$i];
-            $data   = $callback_data{$fToGet};
-        }
+        next if $timed_out{$fToGet};
+        $fType  = $ftypes[$i];
+        $base   = $bases[$i];
+        $data   = $callback_data{$fToGet};
        $col = printField($field, $data, $fType, $base, $col);
    }
    print("\n");  # Final newline
@@ -387,8 +385,8 @@ sub printRecordList {
    if (exists($record{$type}) ) {
        print("Record type - $type\n");
        foreach my $fkey (sort keys %{$record{$type}}) {
-            printf('%-4s', $fkey);
-            printf("    interest = $record{$type}{$fkey}[$iIdx]");
+            printf('%-8s', $fkey);
+            printf("  interest = $record{$type}{$fkey}[$iIdx]");
            printf("    type = %-12s ",$record{$type}{$fkey}[$tIdx]);
            print ("    base = $record{$type}{$fkey}[$bIdx]\n");
        }
--- a/modules/ca/src/tools/cainfo.c
+++ b/modules/ca/src/tools/cainfo.c
@@ -157,7 +157,7 @@ int main (int argc, char *argv[])
            }
            break;
        case 's':               /* ca_client_status interest level */
-            if (sscanf(optarg,"%du", &statLevel) != 1)
+            if (sscanf(optarg,"%u", &statLevel) != 1)
            {
                fprintf(stderr, "'%s' is not a valid interest level "
                        "- ignored. ('cainfo -h' for help.)\n", optarg);
--- a/modules/ca/src/tools/camonitor.c
+++ b/modules/ca/src/tools/camonitor.c
@@ -258,7 +258,7 @@ int main (int argc, char *argv[])
            }
            break;
        case '#':               /* Array count */
-            if (sscanf(optarg,"%ld", &reqElems) != 1)
+            if (sscanf(optarg,"%lu", &reqElems) != 1)
            {
                fprintf(stderr, "'%s' is not a valid array element count "
                        "- ignored. ('camonitor -h' for help.)\n", optarg);
--- a/modules/ca/src/tools/caput.c
+++ b/modules/ca/src/tools/caput.c
@@ -437,6 +437,7 @@ int main (int argc, char *argv[])
    dbuf = calloc (count, sizeof(double));
    if(!sbuf || !dbuf) {
        fprintf(stderr, "Memory allocation failed\n");
+        free(sbuf); free(dbuf);
        return 1;
    }

@@ -450,6 +451,7 @@ int main (int argc, char *argv[])
        result = ca_pend_io(caTimeout);
        if (result == ECA_TIMEOUT) {
            fprintf(stderr, "Read operation timed out: ENUM data was not read.\n");
+            free(sbuf); free(dbuf);
            return 1;
        }

@@ -460,6 +462,7 @@ int main (int argc, char *argv[])
                if (*(argv+optind+i) == pend) { /* Conversion didn't work */
                    fprintf(stderr, "Enum index value '%s' is not a number.\n",
                            *(argv+optind+i));
+                    free(sbuf); free(dbuf);
                    return 1;
                }
                if (dbuf[i] >= bufGrEnum.no_str) {
@@ -486,6 +489,7 @@ int main (int argc, char *argv[])
                    dbuf[i] = epicsStrtod(sbuf[i], &pend);
                    if (sbuf[i] == pend || enumAsString) {
                        fprintf(stderr, "Enum string value '%s' invalid.\n", sbuf[i]);
+                        free(sbuf); free(dbuf);
                        return 1;
                    }
                    if (dbuf[i] >= bufGrEnum.no_str) {
@@ -503,6 +507,7 @@ int main (int argc, char *argv[])
            ebuf = calloc(len, sizeof(char));
            if(!ebuf) {
                fprintf(stderr, "Memory allocation failed\n");
+                free(sbuf); free(dbuf); free(ebuf);
                return 1;
            }
            count = epicsStrnRawFromEscaped(ebuf, len, cbuf, len-1) + 1;
@@ -537,12 +542,14 @@ int main (int argc, char *argv[])
    }
    if (result != ECA_NORMAL) {
        fprintf(stderr, "Error from put operation: %s\n", ca_message(result));
+        free(sbuf); free(dbuf); free(ebuf);
        return 1;
    }

    result = ca_pend_io(caTimeout);
    if (result == ECA_TIMEOUT) {
        fprintf(stderr, "Write operation timed out: Data was not written.\n");
+        free(sbuf); free(dbuf); free(ebuf);
        return 1;
    }
    if (request == callback) {   /* Also wait for callbacks */
@@ -556,6 +563,7 @@ int main (int argc, char *argv[])

    if (result != ECA_NORMAL) {
        fprintf(stderr, "Error occured writing data: %s\n", ca_message(result));
+        free(sbuf); free(dbuf); free(ebuf);
        return 1;
    }

@@ -567,6 +575,7 @@ int main (int argc, char *argv[])

                                /* Shut down Channel Access */
    ca_context_destroy();
+    free(sbuf); free(dbuf); free(ebuf);

    return result;
 }
--- a/modules/database/src/ioc/db/Makefile
+++ b/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
@@ -99,3 +100,4 @@ dbCore_SRCS += chfPlugin.c
 dbCore_SRCS += dbState.c
 dbCore_SRCS += dbUnitTest.c
 dbCore_SRCS += dbServer.c
+dbCore_SRCS_vxWorks += templateInstances.cpp
--- a/modules/database/src/ioc/db/dbAccess.c
+++ b/modules/database/src/ioc/db/dbAccess.c
@@ -736,6 +736,8 @@ long dbValueSize(short dbr_type)
        sizeof(epicsFloat64),        /* DOUBLE       */
        sizeof(epicsEnum16)};        /* ENUM         */

+    if(dbr_type>=NELEMENTS(size))
+        return 0;
    return(size[dbr_type]);
 }

@@ -796,15 +798,12 @@ int dbLoadRecords(const char* file, const char* subs)
 static long getLinkValue(DBADDR *paddr, short dbrType,
    char *pbuf, long *nRequest)
 {
-    dbCommon *precord = paddr->precord;
-    dbFldDes *pfldDes = paddr->pfldDes;
    /* size of pbuf storage in bytes, including space for trailing nil */
    int maxlen;
    DBENTRY dbEntry;
-    long status;
    long nReq = nRequest ? *nRequest : 1;

-    /* dbFindRecord() below will always succeed as we have a
+    /* below will always succeed as we have a
     * valid DBADDR, so no point to check again.
     * Request for zero elements always succeeds
     */
@@ -830,10 +829,8 @@ static long getLinkValue(DBADDR *paddr, short dbrType,
        return S_db_badDbrtype;
    }

-    dbInitEntry(pdbbase, &dbEntry);
-    status = dbFindRecord(&dbEntry, precord->name);
-    if (!status) status = dbFindField(&dbEntry, pfldDes->name);
-    if (!status) {
+    dbInitEntryFromAddr(paddr, &dbEntry);
+    {
        const char *rtnString = dbGetString(&dbEntry);

        strncpy(pbuf, rtnString, maxlen-1);
@@ -843,7 +840,7 @@ static long getLinkValue(DBADDR *paddr, short dbrType,
        if(nRequest) *nRequest = nReq;
    }
    dbFinishEntry(&dbEntry);
-    return status;
+    return 0;
 }

 static long getAttrValue(DBADDR *paddr, short dbrType,
--- a/modules/database/src/ioc/db/dbCa.c
+++ b/modules/database/src/ioc/db/dbCa.c
@@ -52,6 +52,9 @@
 #include "recGbl.h"
 #include "recSup.h"

+/* from dbAccessDefs.h which can't be included here */
+#define S_db_badDbrtype (M_dbAccess| 3)
+
 /* defined in dbContext.cpp
 * Setup local CA access
 */
@@ -457,6 +460,9 @@ long dbCaPutLinkCallback(struct link *plink,short dbrType,
    long   status = 0;
    short  link_action = 0;

+    if(INVALID_DB_REQ(dbrType))
+        return S_db_badDbrtype;
+
    assert(pca);
    /* put the new value in */
    epicsMutexMustLock(pca->lock);
--- a/modules/database/src/ioc/db/dbChannel.c
+++ b/modules/database/src/ioc/db/dbChannel.c
@@ -603,6 +603,10 @@ long dbChannelOpen(dbChannel *chan)
    probe.no_elements = dbChannelElements(chan);
    probe.field_size  = dbChannelFieldSize(chan);
    probe.sevr = NO_ALARM;
+    probe.stat = NO_ALARM;
+    probe.time.secPastEpoch = 0;
+    probe.time.nsec = 0;
+
    p = probe;

    /*
--- a/modules/database/src/ioc/db/dbCommon.dbd.pod
+++ b/modules/database/src/ioc/db/dbCommon.dbd.pod
@@ -382,7 +382,7 @@ The B<DPVT> field is is for private use of the device support modules.
 		prompt("DSET address")
 		special(SPC_NOMOD)
 		interest(4)
-        extra("unambiguous_dset                *dset")
+		extra("unambiguous_dset    *dset")
 	}
 	field(DPVT,DBF_NOACCESS) {
 		prompt("Device Private")
@@ -491,7 +491,7 @@ field which is then used to acquire a timestamp.
 		prompt("Break Point")
 		special(SPC_NOMOD)
 		interest(1)
-		extra("char                bkpt")
+		extra("epicsUInt8          bkpt")
 	}
 	field(UDF,DBF_UCHAR) {
 		prompt("Undefined")
--- a/modules/database/src/ioc/db/dbConvertJSON.c
+++ b/modules/database/src/ioc/db/dbConvertJSON.c
@@ -159,6 +159,9 @@ long dbPutConvertJSON(const char *json, short dbrType,
    size_t jlen = strlen(json);
    long status;

+    if(INVALID_DB_REQ(dbrType))
+        return S_db_badDbrtype;
+
    parser->depth = 0;
    parser->dbrType = dbrType;
    parser->dbrSize = dbValueSize(dbrType);
--- a/modules/database/src/ioc/db/dbEvent.c
+++ b/modules/database/src/ioc/db/dbEvent.c
@@ -1047,7 +1047,11 @@ static void event_task (void *pParm)
    epicsEventDestroy(evUser->pflush_sem);
    epicsMutexDestroy(evUser->lock);

-    freeListFree(dbevEventUserFreeList, evUser);
+    if (dbevEventUserFreeList)
+        freeListFree(dbevEventUserFreeList, evUser);
+    else
+        fprintf(stderr, "%s exiting but dbevEventUserFreeList already NULL\n",
+                __FUNCTION__);

    taskwdRemove(epicsThreadGetIdSelf());

--- a/modules/database/src/ioc/db/dbScan.c
+++ b/modules/database/src/ioc/db/dbScan.c
@@ -1075,13 +1075,10 @@ static void addToList(struct dbCommon *precord, scan_list *psl)
    pse->pscan_list = psl;
    ptemp = (scan_element *)ellLast(&psl->list);
    while (ptemp) {
-        if (ptemp->precord->phas <= precord->phas) {
-            ellInsert(&psl->list, &ptemp->node, &pse->node);
-            break;
-        }
+        if (ptemp->precord->phas <= precord->phas) break;
        ptemp = (scan_element *)ellPrevious(&ptemp->node);
    }
-    if (ptemp == NULL) ellAdd(&psl->list, (void *)pse);
+    ellInsert(&psl->list, (ptemp ? &ptemp->node : NULL), &pse->node);
    psl->modified = TRUE;
    epicsMutexUnlock(psl->lock);
 }
@@ -1107,7 +1104,7 @@ static void deleteFromList(struct dbCommon *precord, scan_list *psl)
        return;
    }
    pse->pscan_list = NULL;
-    ellDelete(&psl->list, (void *)pse);
+    ellDelete(&psl->list, &pse->node);
    psl->modified = TRUE;
    epicsMutexUnlock(psl->lock);
 }
--- a/modules/database/src/ioc/db/recGbl.c
+++ b/modules/database/src/ioc/db/recGbl.c
@@ -69,7 +69,7 @@ void recGblDbaddrError(long status, const struct dbAddr *paddr,
    errPrintf(status,0,0,
        "PV: %s.%s "
        "error detected in routine: %s\n",
-        (paddr ? precord->name : "Unknown"),
+        (precord ? precord->name : "Unknown"),
        (pdbFldDes ? pdbFldDes->name : ""),
        (pmessage ? pmessage : "Unknown"));
    return;
@@ -106,7 +106,7 @@ void recGblRecSupError(long status, const struct dbAddr *paddr,
        " %s\n",
        (psupport_name ? psupport_name : "Unknown"),
        (pdbRecordType ? pdbRecordType->name : "Unknown"),
-        (paddr ? precord->name : "Unknown"),
+        (precord ? precord->name : "Unknown"),
        (pdbFldDes ? pdbFldDes->name : ""),
        (pmessage ? pmessage : ""));
    return;
--- a/modules/database/src/ioc/db/templateInstances.cpp
+++ b/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 >;
--- a/modules/database/src/ioc/dbStatic/dbLexRoutines.c
+++ b/modules/database/src/ioc/dbStatic/dbLexRoutines.c
@@ -136,12 +136,14 @@ static void allocTemp(void *pvoid)
 static void *popFirstTemp(void)
 {
    tempListNode        *ptempListNode;
-    void                *ptemp;
+    void                *ptemp = NULL;

    ptempListNode = (tempListNode *)ellFirst(&tempList);
-    ptemp = ptempListNode->item;
-    ellDelete(&tempList,(ELLNODE *)ptempListNode);
-    freeListFree(freeListPvt,ptempListNode);
+    if(ptempListNode) {
+        ptemp = ptempListNode->item;
+        ellDelete(&tempList,(ELLNODE *)ptempListNode);
+        freeListFree(freeListPvt,ptempListNode);
+    }
    return(ptemp);
 }

@@ -477,12 +479,16 @@ static void dbMenuBody(void)
        return;
    }
    pnewMenu = (dbMenu *)popFirstTemp();
+    if(!pnewMenu)
+        return;
    pnewMenu->nChoice = nChoice = ellCount(&tempList)/2;
    pnewMenu->papChoiceName = dbCalloc(pnewMenu->nChoice,sizeof(char *));
    pnewMenu->papChoiceValue = dbCalloc(pnewMenu->nChoice,sizeof(char *));
    for(i=0; i<nChoice; i++) {
        pnewMenu->papChoiceName[i] = (char *)popFirstTemp();
        pnewMenu->papChoiceValue[i] = (char *)popFirstTemp();
+        if(!pnewMenu->papChoiceName[i] || !pnewMenu->papChoiceValue[i])
+            return;
    }
    if(ellCount(&tempList)) yyerrorAbort("dbMenuBody: tempList not empty");
    /* Add menu in sorted order */
@@ -703,6 +709,8 @@ static void dbRecordtypeBody(void)
        return;
    }
    pdbRecordType= (dbRecordType *)popFirstTemp();
+    if(!pdbRecordType)
+        return;
    pdbRecordType->no_fields = no_fields = ellCount(&tempList);
    pdbRecordType->papFldDes = dbCalloc(no_fields,sizeof(dbFldDes *));
    pdbRecordType->papsortFldName = dbCalloc(no_fields,sizeof(char *));
@@ -710,6 +718,8 @@ static void dbRecordtypeBody(void)
    no_prompt = no_links = 0;
    for(i=0; i<no_fields; i++) {
        pdbFldDes = (dbFldDes *)popFirstTemp();
+        if(!pdbFldDes)
+            return;
        pdbFldDes->pdbRecordType = pdbRecordType;
        pdbFldDes->indRecordType = i;
        pdbRecordType->papFldDes[i] = pdbFldDes;
@@ -974,6 +984,8 @@ static void dbBreakBody(void)
        return;
    }
    pnewbrkTable = (brkTable *)popFirstTemp();
+    if(!pnewbrkTable)
+        return;
    number = ellCount(&tempList);
    if (number % 2) {
        yyerrorAbort("breaktable: Raw value missing");
@@ -990,10 +1002,14 @@ static void dbBreakBody(void)
        char    *str;

        str = (char *)popFirstTemp();
+        if(!str)
+            return;
        (void) epicsScanDouble(str, &paBrkInt[i].raw);
        free(str);

        str = (char *)popFirstTemp();
+        if(!str)
+            return;
        (void) epicsScanDouble(str, &paBrkInt[i].eng);
        free(str);
    }
@@ -1034,22 +1050,49 @@ static void dbBreakBody(void)
    }
    pgphentry->userPvt = pnewbrkTable;
 }
-
+
+static
+int dbRecordNameValidate(const char *name)
+{
+    size_t i=0u;
+    const char *pos = name;
+
+    if (!*name) {
+        yyerrorAbort("Error: Record/Alias name can't be empty");
+        return 1;
+    }
+
+    for(; *pos; i++, pos++) {
+        char c = *pos;
+        if(i==0) {
+            /* first character restrictions */
+            if(c=='-' || c=='+' || c=='[' || c=='{') {
+                errlogPrintf("Warning: Record/Alias name '%s' should not begin with '%c'\n", name, c);
+            }
+        }
+        /* any character restrictions */
+        if(c < ' ') {
+            errlogPrintf("Warning: Record/Alias name '%s' should not contain non-printable 0x%02u\n",
+                         name, (unsigned)c);
+
+        } else if(c==' ' || c=='\t' || c=='"' || c=='\'' || c=='.' || c=='$') {
+            epicsPrintf("Error: Bad character '%c' in Record/Alias name \"%s\"\n",
+                c, name);
+            yyerrorAbort(NULL);
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
 static void dbRecordHead(char *recordType, char *name, int visible)
 {
-    char *badch;
    DBENTRY *pdbentry;
    long status;

-    if (!*name) {
-        yyerrorAbort("dbRecordHead: Record name can't be empty");
+    if(dbRecordNameValidate(name))
        return;
-    }
-    badch = strpbrk(name, " \"'.$");
-    if (badch) {
-        epicsPrintf("Bad character '%c' in record name \"%s\"\n",
-            *badch, name);
-    }

    pdbentry = dbAllocEntry(pdbbase);
    if (ellCount(&tempList))
@@ -1180,10 +1223,9 @@ static void dbRecordAlias(char *name)
    tempListNode *ptempListNode;
    long status;

-    if (!*name) {
-        yyerrorAbort("dbRecordAlias: Alias name can't be empty");
+    if(dbRecordNameValidate(name))
        return;
-    }
+
    if (duplicate) return;
    ptempListNode = (tempListNode *)ellFirst(&tempList);
    pdbentry = ptempListNode->item;
@@ -1201,10 +1243,9 @@ static void dbAlias(char *name, char *alias)
    DBENTRY dbEntry;
    DBENTRY *pdbEntry = &dbEntry;

-    if (!*alias) {
-        yyerrorAbort("dbAlias: Alias name can't be empty");
+    if(dbRecordNameValidate(alias))
        return;
-    }
+
    dbInitEntry(pdbbase, pdbEntry);
    if (dbFindRecord(pdbEntry, name)) {
        epicsPrintf("Alias \"%s\" refers to unknown record \"%s\"\n",
--- a/modules/database/src/ioc/dbStatic/dbStaticLib.c
+++ b/modules/database/src/ioc/dbStatic/dbStaticLib.c
@@ -2330,8 +2330,7 @@ long dbParseLink(const char *str, short ftype, dbLinkInfo *pinfo)
    }

    /* Link may be an array constant */
-    if (pstr[0] == '[' && pstr[len-1] == ']' &&
-        (strchr(pstr, ',') || strchr(pstr, '"'))) {
+    if (pstr[0] == '[' && pstr[len-1] == ']') {
        pinfo->ltype = CONSTANT;
        return 0;
    }
--- a/modules/database/src/ioc/rsrv/Makefile
+++ b/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

--- a/modules/database/src/std/link/lnkCalc.c
+++ b/modules/database/src/std/link/lnkCalc.c
@@ -553,7 +553,12 @@ static long lnkCalc_getValue(struct link *plink, short dbrType, void *pbuffer,
    dbCommon *prec = plink->precord;
    int i;
    long status;
-    FASTCONVERT conv = dbFastPutConvertRoutine[DBR_DOUBLE][dbrType];
+    FASTCONVERT conv;
+
+    if(INVALID_DB_REQ(dbrType))
+        return S_db_badDbrtype;
+
+    conv = dbFastPutConvertRoutine[DBR_DOUBLE][dbrType];

    /* Any link errors will trigger a LINK/INVALID alarm in the child link */
    for (i = 0; i < clink->nArgs; i++) {
@@ -624,7 +629,12 @@ static long lnkCalc_putValue(struct link *plink, short dbrType,
    dbCommon *prec = plink->precord;
    int i;
    long status;
-    FASTCONVERT conv = dbFastGetConvertRoutine[dbrType][DBR_DOUBLE];
+    FASTCONVERT conv;
+
+    if(INVALID_DB_REQ(dbrType))
+        return S_db_badDbrtype;
+
+    conv = dbFastGetConvertRoutine[dbrType][DBR_DOUBLE];

    /* Any link errors will trigger a LINK/INVALID alarm in the child link */
    for (i = 0; i < clink->nArgs; i++) {
--- a/modules/database/src/std/link/lnkConst.c
+++ b/modules/database/src/std/link/lnkConst.c
@@ -361,6 +361,9 @@ static long lnkConst_loadScalar(struct link *plink, short dbrType, void *pbuffer
    const_link *clink = CONTAINER(plink->value.json.jlink, const_link, jlink);
    long status;

+    if(INVALID_DB_REQ(dbrType))
+        return S_db_badDbrtype;
+
    switch (clink->type) {
    case si64:
        if (clink->jlink.debug)
@@ -451,12 +454,17 @@ static long lnkConst_loadArray(struct link *plink, short dbrType, void *pbuffer,
        long *pnReq)
 {
    const_link *clink = CONTAINER(plink->value.json.jlink, const_link, jlink);
-    short dbrSize = dbValueSize(dbrType);
+    short dbrSize;
    char *pdest = pbuffer;
    int nElems = clink->nElems;
    FASTCONVERT conv;
    long status;

+    if(INVALID_DB_REQ(dbrType))
+        return S_db_badDbrtype;
+
+    dbrSize = dbValueSize(dbrType);
+
    if (nElems > *pnReq)
        nElems = *pnReq;

@@ -480,8 +488,17 @@ static long lnkConst_loadArray(struct link *plink, short dbrType, void *pbuffer,
    case sc40:
        if (clink->jlink.debug)
            printf("   sc40 '%s'\n", clink->value.scalar_string);
-        status = dbFastPutConvertRoutine[DBF_STRING][dbrType]
-            (clink->value.scalar_string, pbuffer, NULL);
+        if (dbrType != DBF_CHAR) {
+            status = dbFastPutConvertRoutine[DBF_STRING][dbrType]
+                (clink->value.scalar_string, pbuffer, NULL);
+        }
+        else {
+            /* Long string conversion */
+            strncpy(pbuffer, clink->value.scalar_string, *pnReq);
+            ((char *)pbuffer)[*pnReq] = 0;
+            nElems = strlen(pbuffer) + 1;
+            status = 0;
+        }
        break;

    case ai64:
--- a/modules/database/src/std/link/lnkState.c
+++ b/modules/database/src/std/link/lnkState.c
@@ -142,7 +142,12 @@ static long lnkState_getValue(struct link *plink, short dbrType, void *pbuffer,
 {
    state_link *slink = CONTAINER(plink->value.json.jlink,
        struct state_link, jlink);
-    FASTCONVERT conv = dbFastPutConvertRoutine[DBR_SHORT][dbrType];
+    FASTCONVERT conv;
+
+    if(INVALID_DB_REQ(dbrType))
+        return S_db_badDbrtype;
+
+    conv = dbFastPutConvertRoutine[DBR_SHORT][dbrType];

    slink->val = slink->invert ^ dbStateGet(slink->state);
    return conv(&slink->val, pbuffer, NULL);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dirk Zimoch	d795dd76a6	bugfix for older compilers: have all declarations before instructions	2020-11-16 17:58:01 +01:00
Andrew Johnson	45924d28e0	Add -v (verbose) flag to softIoc Only display the startup steps taken if -v was given. Show each step before running it, so error messages follow it.	2020-11-16 17:44:51 +01:00
Andrew Johnson	b1d0a0d036	Build: Do clean before uninstall actions (if requested)	2020-11-16 17:44:21 +01:00
Andrew Johnson	45e9cf9a94	Warn about NULL dbevEventUserFreeList	2020-11-16 17:44:01 +01:00
Andrew Johnson	a8dcff2f0d	Merge fix-wrong-order-phas fixes from 3.15 branch	2020-11-16 17:41:08 +01:00
Dirk Zimoch	53a7d25923	allow constant links with numeric 1 element arrays like [42]	2020-11-16 17:34:20 +01:00
Ralph Lange	c701e7e98e	Redo `d3d40689` that was lost in upmerging	2020-11-16 17:33:25 +01:00
Michael Davidsaver	bf8e097756	compat IPPORT_USERRESERVED musl libc doesn't define IPPORT_USERRESERVED	2020-11-16 17:32:29 +01:00
Andrew Johnson	837a2bbdde	const init a char array from a string value Conflicts: documentation/RELEASE_NOTES.md	2020-11-16 17:31:08 +01:00
Andrew Johnson	6fb361a965	Fix Cygwin TCP_NODELAY issue from Paul Chu & Freddie Conflicts: documentation/RELEASE_NOTES.md	2020-11-16 17:27:56 +01:00
Dirk Zimoch	1db2cba81d	Merge commit '10d472202dc2bf1fa5c569d2a14d460e95030564' into PSI-7.0 This is before PVA is modified	2020-11-16 17:06:22 +01:00
Dirk Zimoch	ce43a67cbd	re-add removed .ci submodule	2020-11-13 10:07:34 +01:00
Dirk Zimoch	7ac8f056ed	added missing header for close() in VxWorks 6.3	2020-11-12 11:21:26 +01:00
Dirk Zimoch	d157e96aac	remove compiler warning	2020-11-12 10:59:54 +01:00
Dirk Zimoch	1d1e3e9527	calc backward compatibility: allow incomplete conditional	2020-11-12 10:54:11 +01:00
Andrew Johnson	10d472202d	Fix some ca/perl builds Use the pre-expanded Perl configuration variables. Conda builds of Perl need these (and a fix to the Perl config files, see https://github.com/conda/conda/issues/8425 for details).	2020-07-21 15:17:37 -05:00
Andrew Johnson	f99bb637b9	ca: Minor cleanups in capr.pl	2020-07-20 18:22:37 -05:00
Andrew Johnson	c55a95fc98	ca: Support DBF_INT64 and DBF_UINT64 in capr.pl	2020-07-20 18:21:46 -05:00
Andrew Johnson	7d9746003b	ca: Fix capr.pl to handle missing fields properly When using an EPICS 7 softIoc.dbd file with a PV from an older version of Base which didn't have all the fields, our attempts to read those fields will time out, but the internal logic was buggy. Don't try to print the values of timed out fields at all. The user will still see a warning about connection timeouts at the top.	2020-07-20 18:20:45 -05:00
Ralph Lange	7d2e352f6a	Merge changes from 3.15 branch into 7.0 - merged 3.15 branch up to `bf7a1605` # Conflicts: # modules/database/src/ioc/db/dbChannel.c	2020-07-15 11:46:45 +02:00
Dirk Zimoch	48d37e6b45	drop support for 32 bit SL6	2020-07-06 14:02:04 +02:00
Dirk Zimoch	5d03f20831	build for VxWorks 6.9	2020-07-06 14:00:15 +02:00
Dirk Zimoch	9e72edb544	fix comment and linker flag	2020-07-06 10:56:02 +02:00
Andrew Johnson	5c03f8ba79	Simplify epicsMessageQueueTest using joinable threads Fixes issues with thread shutdown	2020-07-02 16:17:04 -05:00
Andrew Johnson	1eeac6da2f	Switch RTEMS to the default osdMessageQueue	2020-07-02 16:14:08 -05:00
Michael Davidsaver	d4781bca28	Merge branch 'recnames' into 7.0 * recnames: validate alias names as well yet more record name validation Further record name validation popFirstTemp() may return NULL fix crash on bad record name Extend record name validation	2020-06-30 19:54:43 -07:00
Michael Davidsaver	32ff3b2ed9	update ci-scripts 3.0	2020-06-29 20:08:13 -07:00
Michael Davidsaver	25681eca4c	ci: set EPICS_TEST_IMPRECISE_TIMING	2020-06-29 20:07:06 -07:00
Michael Davidsaver	dcee015f71	validate alias names as well	2020-06-29 14:44:04 -07:00
Michael Davidsaver	fddd65ccb1	yet more record name validation	2020-06-29 11:33:21 -07:00
Michael Davidsaver	7f9fefc2a4	Further record name validation	2020-06-26 13:22:11 -07:00
Dirk Zimoch	4476c71f62	removed 'git describe' from EPICS version string, as it is now shown in Revision string	2020-06-26 11:17:51 +02:00
Dirk Zimoch	e9471b3072	Merge branch '7.0' of https://git.launchpad.net/epics-base into PSI-7.0	2020-06-24 18:01:47 +02:00
Ralph Lange	bf7a1605c6	Name generated junitfiles '<testname>-results.xml' - following an idea by Freddie Akeroyd, to allow better distinction from other xml files	2020-06-23 13:47:33 +02:00
Ralph Lange	0fbfc74182	Fix missing deletion in `97b29129` from 'fix/misc' - fixes `97b29129` that was replacing two assert() statements without removing the original (offending) lines	2020-06-23 11:23:57 +02:00
Michael Davidsaver	b34aa594c8	popFirstTemp() may return NULL This indicates an earlier error, which should already been printed.	2020-06-22 12:09:26 -07:00
Michael Davidsaver	3124d972bf	fix crash on bad record name	2020-06-22 12:09:26 -07:00
Michael Davidsaver	49889d8549	Extend record name validation Begin enforcing earlier check (and tab). Add new warning for record names beginning with numeric or '{'.	2020-06-22 12:09:26 -07:00
Michael Davidsaver	a4bdee82c3	travis fixup networking	2020-06-20 23:11:12 -07:00
Michael Davidsaver	4160610885	libCom: test osdSockAddrReuse Ensure that epicsSocketEnableAddressReuseDuringTimeWaitState() and epicsSocketEnableAddressUseForDatagramFanout() have the desired effects.	2020-06-20 12:01:40 -07:00
Michael Davidsaver	19146a597b	WIN32: fix epicsSocketEnableAddressReuseDuringTimeWaitState()	2020-06-19 20:17:14 -07:00
Michael Davidsaver	4eb8ea33ea	make-tar add -v and -d arguments Add -d developer mode to permit export of branches and raw revisions. Switch to bash for builtin getopts	2020-06-19 20:17:14 -07:00
Michael Davidsaver	1e425159ed	travis mixup STATIC=YES Ensure that trusty isn't only tested with STATIC=YES, and others only STATIC=NO.	2020-06-19 20:17:14 -07:00
Andrew Johnson	9259e40483	Perl scripts: leading tabs => spaces, rm trailing spaces	2020-06-17 16:00:31 -05:00
Andrew Johnson	b8f0fd4cdb	Make BKPT field an epicsUInt8 for consistency It was the last 'char' field in dbCommon and the Base record types.	2020-06-12 17:11:34 -05:00
Ralph Lange	b248023eb2	Merge Ralph's 'fix/misc' branch into 3.15 (closes #77)	2020-06-10 18:39:22 +02:00
Ralph Lange	92374b2be2	libcom/osi: fix potential leak in vxWorks/osdThread.c (found by sonar/cppcheck)	2020-06-10 14:26:40 +02:00
Ralph Lange	579fc9d0c7	libcom/osi: fix potential leak in default/osdThreadHooks.c (found by sonar/cppcheck)	2020-06-10 14:26:40 +02:00
Ralph Lange	cd47bbf99b	libcom/osi: fix debug printf() in default/osdNetIntf.c (found by sonar/cppcheck)	2020-06-10 14:26:40 +02:00
Ralph Lange	d3d40689c8	libcom/osi: fix dangerous usage of strncat (WIN32) (found by sonar/cppcheck)	2020-06-10 14:26:40 +02:00
Ralph Lange	d5eb055bb7	libcom/flex: fix sscanf() argument types (code smell found by sonar/cppcheck)	2020-06-10 14:26:40 +02:00
Ralph Lange	97b29129af	libcom/test: don't modify operand in assert() statement (code smell found by sonar/cppcheck)	2020-06-10 14:26:40 +02:00
Ralph Lange	801710b8c7	db: fix possible null pointer dereference (found by sonar/cppcheck)	2020-06-10 14:26:40 +02:00
Ralph Lange	30f5c3b301	db: fix incomplete initialization in dbChannelOpen() (found by sonar/cppcheck)	2020-06-10 14:26:40 +02:00
Ralph Lange	69d4c238e7	ca/tools: free() all allocated buffers (found by sonar/cppcheck)	2020-06-09 15:52:14 +02:00
Ralph Lange	7d1ff1411f	ca/tools: fix type errors in option parsing (found by sonar/cppcheck)	2020-06-09 15:51:35 +02:00
Ralph Lange	f0e143b907	ca/client: fix possible null pointer dereference (found by sonar/cppcheck)	2020-06-09 15:48:33 +02:00
Andrew Johnson	545550dd9a	convertRelease: Restore $Bin to @INC This is needed when convertRelease.pl gets run before the EPICS::Path and EPICS::Release modules are installed, and after 'make uninstall' has deleted the lib/perl directory.	2020-06-05 12:51:54 -05:00
Andrew Johnson	eb060e7fcd	RULES_MODULES: Fix runtests with no submodules	2020-06-05 10:23:07 -05:00
Dirk Zimoch	4082cb27c3	new architecture nilrt7-armv7a (NI Linux Real Time) for ESI	2020-06-03 10:47:14 +02:00
Dirk Zimoch	88cdffddb6	Merge branch '7.0' release 7.4.0.1 into PSI-7.0 Conflicts: .gitmodules modules/database/src/ioc/db/Makefile modules/libcom/test/epicsAtomicTest.cpp modules/pvAccess modules/pvData modules/pvDatabase modules/pva2pva	2020-06-03 10:46:07 +02:00
Michael Davidsaver	786c4c2ca2	Revert "dbRecordtypeFieldItem() avoid excess strcmp()" This reverts commit `48eb4ff4ac`.	2020-06-02 11:26:07 -07:00
Michael Davidsaver	48eb4ff4ac	dbRecordtypeFieldItem() avoid excess strcmp() only one is going to match.	2020-06-02 07:55:22 -07:00
Michael Davidsaver	6c914d19c3	db: validate dbrType	2020-06-02 07:55:22 -07:00
Michael Davidsaver	d6f8e9038c	getLinkValue() use dbInitEntryFromAddr() Called from dbGet(). Optimize hash table lookup and bsearch of array to O(0) assignment.	2020-06-02 07:55:22 -07:00
Michael Davidsaver	5917990908	dbPutGetTest test plain array field	2020-06-02 07:55:22 -07:00
Michael Davidsaver	eeb198db15	change arrRecord cvt_dbaddr() to behave like waveformRecord et al.	2020-06-02 07:55:22 -07:00
Andrew Johnson	1fec685eed	Merge new stuff after the 7.0.4 release work	2020-05-28 21:23:44 -05:00
Andrew Johnson	0bfe0eda0c	Update the things to skip in make-tar.sh	2020-05-28 21:18:28 -05:00
Michael Davidsaver	6188d3fdaf	update doc comments	2020-05-28 16:26:56 -07:00
Andrew Johnson	cd07888149	Set next development versions	2020-05-28 18:25:32 -05:00
Michael Davidsaver	688bc3247c	missing include	2020-05-28 16:07:50 -07:00
Dirk Zimoch	b27d1416b5	install location with patch level	2020-04-07 15:38:05 +02:00
Dirk Zimoch	ab97b5fe54	Bring back VxWorks 5 compatibility	2020-04-07 15:37:32 +02:00
Dirk Zimoch	bbaa207603	Merge remote-tracking branch 'remotes/xiaoqiang/wine_msvc' into PSI-7.0	2020-04-06 14:00:56 +02:00
Xiaoqiang Wang	605937bbac	use the msvc from a new location	2020-04-06 11:05:04 +02:00
Xiaoqiang Wang	594fcb9a0d	CXXFLAGS from CONFIG_win32-x86.Common	2020-04-03 15:10:46 +02:00
Xiaoqiang Wang	e033c0cfb2	use MSVC via WINE to compile for windows	2020-04-01 14:44:38 +02:00
Xiaoqiang Wang	53ebbab941	use MSVC_DIR to pick up MSVC toolchains	2020-04-01 14:42:18 +02:00
Dirk Zimoch	86adc529ef	Merge remote-tracking branch 'origin' into PSI-7.0 Conflicts: configure/os/CONFIG_SITE.Common.linuxCommon modules/libcom/src/log/iocLog.c modules/libcom/src/log/logClient.c modules/pvAccess modules/pvData modules/pvDatabase	2020-02-06 17:28:40 +01:00
Dirk Zimoch	3a774d37f8	call shell to get EPICS_SITE_VERSION only when compiling EPICS base	2019-09-20 09:02:35 +02:00
Dirk Zimoch	5f6b1e2b16	(Re-)connect only when there is something to send. This avoids constant useless disconnect/connect cycles if the server (or firewall) keeps closing the connection.	2019-09-04 10:14:05 +02:00
Dirk Zimoch	584caf54b2	don't use space in version string	2019-09-03 09:17:38 +02:00
Dirk Zimoch	d602c1cdcb	detect when server closes connection. can only be done reliably with recv, not with send	2019-09-02 17:47:43 +02:00
Dirk Zimoch	12ce14b6e5	no need to delay startup only because log server is currently not available	2019-09-02 17:47:43 +02:00
Dirk Zimoch	e02709b3a4	send pending log messages directly after connecting	2019-09-02 17:47:43 +02:00
Dirk Zimoch	b19709039d	avoid needless memmove calls	2019-09-02 17:47:42 +02:00
Dirk Zimoch	3c4ffbf267	elimitate duplicate code in logClient	2019-09-02 17:47:42 +02:00
Dirk Zimoch	4942da0c88	do not discard unsent messages when log server has closed connection, instead try to send them after reconnect	2019-09-02 17:47:42 +02:00
Dirk Zimoch	5f547257ac	speed up logRestart thread termination at exit	2019-09-02 17:47:42 +02:00
Dirk Zimoch	1b99366887	don't send errlog on all logClients	2019-09-02 17:47:42 +02:00
Dirk Zimoch	871af36ac5	move -fno-strict-aliasing flag to central place for all Linux version	2019-09-02 16:44:53 +02:00
Dirk Zimoch	0ad6d2aec9	typo in comment	2019-09-02 13:53:21 +02:00
Dirk Zimoch	8837d2f275	use perl instead of date in EPICS_SITE_VERSION because of Windows	2019-09-02 10:49:44 +02:00
Dirk Zimoch	09a17127a9	make xxxTestHarness TESTPRODs instead of PRODs	2019-09-02 10:47:43 +02:00
Dirk Zimoch	3699c5bc4c	fix strict-aliasing warnings	2019-08-26 15:50:07 +02:00
Dirk Zimoch	157b0867fa	removed unused vxWorks version defaults	2019-08-14 14:06:05 +02:00
Dirk Zimoch	56529964f3	always use -g for non-vxWorks gnu compiler	2019-08-14 13:55:07 +02:00
Dirk Zimoch	c28e240fce	clear whitespace	2019-08-14 11:39:30 +02:00
Dirk Zimoch	b04b2dab22	fix astac crash	2019-08-13 15:13:54 +02:00
Dirk Zimoch	8edcd7b07f	use READLINE as default for all Linux systems	2019-08-09 16:21:08 +02:00
Dirk Zimoch	ca78451122	move PSI specifics out to CONFIG_SITE. files	2019-08-09 13:33:41 +02:00
Dirk Zimoch	4cc44e3dce	cleanup spaces	2019-08-09 13:32:49 +02:00
Dirk Zimoch	e81d3a1d7d	remove strict-aliasing warnings in RHEL7	2019-08-09 11:34:50 +02:00
Dirk Zimoch	53dd61b80a	merged with R7.0.3	2019-08-09 11:31:43 +02:00
Dirk Zimoch	5b754d320f	fix posix epicsThreadSleepQuantum() implementation not to return 0.01 on Linux	2019-07-24 14:17:25 +02:00
Dirk Zimoch	2be2658cfc	added modules/pcas	2019-07-22 17:12:22 +02:00
Dirk Zimoch	2b157096e6	merge branch '7.0' into 'PSI-7.0'	2019-07-22 15:44:08 +02:00
Dirk Zimoch	71eaddfd84	Merge branch 'refs/heads/PSI-7.0.1' into PSI-7.0	2019-07-22 15:36:33 +02:00
Dirk Zimoch	5589deb3ad	make sure softIoc for vxWorks contains all functions	2019-07-22 15:17:18 +02:00
Dirk Zimoch	0bb80e373b	add simple calculations to macros	2019-05-10 14:44:17 +02:00
Dirk Zimoch	4acdd83984	also build pcas	2019-05-10 11:13:23 +02:00
Dirk Zimoch	d12d38f970	re-enable -fno-strict-aliasing for vxWorks	2019-05-10 11:08:48 +02:00
Dirk Zimoch	74d9749255	fix install location	2019-05-10 11:07:50 +02:00
Dirk Zimoch	3276ada78a	build for DeltaTau with ELDK-5.3 for newer C++ compiler	2019-05-08 17:32:50 +02:00
Dirk Zimoch	de378eec34	also build pcas	2019-04-03 15:14:34 +02:00
Dirk Zimoch	dbb2d875fb	undo commit `2206934` which introduces a MKDIR rule that conflicts with driver/makefile	2019-04-03 15:13:00 +02:00
Dirk Zimoch	c7f966a1f5	fix install location	2019-04-03 15:10:28 +02:00
Dirk Zimoch	7889dda6f8	merged with upstream	2019-02-20 10:51:02 +01:00
Dirk Zimoch	a2ccf3b631	add raspberryPi and skip unused vxWorks archs	2018-10-31 15:23:05 +01:00
Dirk Zimoch	57db34b303	Merge branch 'FixShellCommands' into PSI-7.0	2018-10-24 09:25:44 +02:00
Dirk Zimoch	4f790758af	no PVA for mvl40-xscale_be	2018-10-23 10:01:13 +02:00
Dirk Zimoch	ce9dfc6bb4	need some .o files, but there aren't many any more	2018-10-18 16:20:45 +02:00
Dirk Zimoch	4f40ad1927	build for mvl40-xscale_be (without PVA)configure/os/CONFIG.Common.mvl40-xscale_be	2018-10-18 16:20:13 +02:00
Dirk Zimoch	a42a4010d6	skip building with clang on old SL6 to avoid problems with cross build from RHEL7	2018-10-11 13:20:59 +02:00
Dirk Zimoch	a2aa17fafc	some drivers complain about strict-aliasing	2018-10-11 08:36:35 +02:00
Dirk Zimoch	5bf2784db2	add -fno-strict-aliasing for those archs which complain about anyscalar.h	2018-10-05 10:43:08 +02:00
Dirk Zimoch	7a4e7b7600	add tar and copysrc make rules	2018-10-03 17:13:13 +02:00
Dirk Zimoch	70aa23513f	use -isystem option to find correct headers for cross compiling for old Linux host versions	2018-10-03 16:47:57 +02:00
Dirk Zimoch	71ded2f25f	install dbCaPvt.h needed by devIocStats/ioccar	2018-10-03 16:43:32 +02:00
Dirk Zimoch	11103351b2	add build year-month to version string	2018-10-03 16:38:53 +02:00
Dirk Zimoch	146a413977	add -isystem to avoid system headers in .d files (does not work for vxWorks 5)	2018-10-03 13:48:09 +02:00
Dirk Zimoch	4e44550f62	Merge branch 'FixShellCommands' into PSI-7.0	2018-09-28 11:41:52 +02:00
Dirk Zimoch	9952470486	Merge branch 'FixShellCommands' into PSI-7.0	2018-09-27 13:58:23 +02:00
Dirk Zimoch	02d30dedbc	install server.h for misc module	2018-09-26 16:10:30 +02:00
Dirk Zimoch	5ed0fe52a0	Merge branch '7.0' into PSI-7.0	2018-09-26 11:45:19 +02:00
Dirk Zimoch	42b1f774da	add PSI configuration	2018-09-25 11:13:08 +02:00
Dirk Zimoch	7738b68320	fix missing template instances for old vxWorks (uses -fno-implicit-templates)	2018-09-24 18:00:53 +02:00
Dirk Zimoch	1199fabe90	Fix strange compiler errors with gcc 2.96: using <namespace::function>; seems not to work but using namespace <namespace>; works Also 'add' only works with explicit namespace. Why?	2018-09-21 16:21:13 +02:00
Dirk Zimoch	1aefc5f2f0	re-enable building vxWorks 5	2018-09-21 16:20:17 +02:00
Dirk Zimoch	6f666c6c22	Add mechanism to skip modules for selected architectures	2018-09-21 15:50:06 +02:00
				`@@ -0,0 +1 @@`
				`include $(CONFIG)/os/CONFIG.Common.linux-clang`
				`@@ -0,0 +1 @@`
				`include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common`