removed 'git describe' from EPICS version string, as it is now shown in Revision string

Merge branch '7.0' of https://git.launchpad.net/epics-base into PSI-7.0
new architecture nilrt7-armv7a (NI Linux Real Time) for ESI
2020-06-26 11:17:51 +02:00 · 2020-06-24 18:01:47 +02:00 · 2020-06-03 10:47:14 +02:00 · 2020-06-03 10:46:07 +02:00 · 2020-04-07 15:38:05 +02:00 · 2020-04-07 15:37:32 +02:00
111 changed files with 1273 additions and 3090 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -37,8 +37,6 @@ skip_commits:
 #   build matrix configuration    #
 #---------------------------------#

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

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

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

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

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

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

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

 #---------------------------------#
 #         debugging               #
--- a/.ci
+++ b/.ci
--- a/.ci-local/travis-fixup.sh
+++ b/.ci-local/travis-fixup.sh
@@ -1,19 +0,0 @@
-#!/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
@@ -2,7 +2,7 @@
 #
 # Make tar for git repo w/ one level of sub modules.
 #
-set -e
+set -e -u

 die() {
  echo "$1" >&2
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,6 @@ env:
  global:
    - SETUP_PATH=.ci-local:.ci
    - BASE=SELF
-    - EPICS_TEST_IMPRECISE_TIMING=YES

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

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

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

 # Define build jobs

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

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

  - dist: trusty
    env: EXTRA="CMD_CXXFLAGS=-std=c++11"
@@ -67,13 +63,15 @@ jobs:

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

 # Cross-compilations to Windows using MinGW and WINE

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

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

 # 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.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
@@ -57,10 +57,10 @@ 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=-DEV
 #EPICS_DEV_SNAPSHOT=-pre1
 #EPICS_DEV_SNAPSHOT=-pre1-DEV
-EPICS_DEV_SNAPSHOT=-rc1
+#EPICS_DEV_SNAPSHOT=-rc1
 #EPICS_DEV_SNAPSHOT=-rc1-DEV

 # No changes should be needed below here
--- a/configure/CONFIG_CA_VERSION
+++ b/configure/CONFIG_CA_VERSION
@@ -6,7 +6,7 @@ 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
@@ -6,7 +6,7 @@ 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
@@ -6,7 +6,7 @@ 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=-results.xml)
+JUNITFILES.t += $(TESTSCRIPTS.t:.t=.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): %-results.xml: %.tap
+$(JUNITFILES.t): %.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/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.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-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.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
+# compat-gcc-44-4.4
+# compat-glibc-headers-2.12-4
+# It was neccessary to install 32 bit compatibility libraries manually
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44
+
+TARGET_CPPFLAGS = -isystem /usr/lib/x86_64-redhat-linux6E/include
+TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib
+LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo
--- 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
+# compat-gcc-44-4.4
+# compat-glibc-headers-2.12-4
+# compat-glibc-2.12-4
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44
+
+TARGET_CPPFLAGS = -isystem /usr/lib/x86_64-redhat-linux6E/include
+TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib64
+LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo
--- 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,58 @@
 #
 # 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.
+# 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_MINOR_VERSION = $(basename $(patsubst $(VX_GNU_MAJOR_VERSION).%,%,$(VX_GNU_VERSION)))

-#VXWORKS_VERSION = 6.6
-#VXWORKS_VERSION = 6.7
-#VXWORKS_VERSION = 6.8
-VXWORKS_VERSION = 6.9
+# 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 = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))

-# Sites may override the following path for a particular host
-# architecture by adding it to an appropriate
-# CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file.
+VX_INCLUDE_DIRS_5 = $(VX_DIR)/target/h
+VX_INCLUDE_DIRS_6 = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
+GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
+TARGET_CPPFLAGS = -isystem $(VX_DIR)/target/h
+
+# vxWorks GNU directories
+
+GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
+GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
+GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
+
+# Operating system flags
+OP_SYS_CFLAGS += -fno-strict-aliasing
+
+# 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,42 @@
-# 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
+
+# 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/.gitignore
+++ b/documentation/.gitignore
@@ -1,3 +0,0 @@
-*.db
-epics-base.tag
-html/
--- a/documentation/Doxyfile@
+++ b/documentation/Doxyfile@
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -1,33 +0,0 @@
-TOP = ..
-include $(TOP)/configure/CONFIG
-
-ifdef T_A
-
-DOXYGEN=doxygen
-
-EXPAND = Doxyfile
-
-EXPAND_ME += EPICS_VERSION
-EXPAND_ME += EPICS_REVISION
-EXPAND_ME += EPICS_MODIFICATION
-EXPAND_ME += EPICS_PATCH_LEVEL
-
-ME = documentation/O.$(T_A)/html
-
-install: doxygen
-
-doxygen: Doxyfile
-	$(DOXYGEN)
-	rsync -av $(TOP)/html/ html/
-
-.PHONY: doxygen
-
-commit: doxygen
-	$(TOUCH) html/.nojekyll
-	(cd $(TOP) && $(CURDIR)/../commit-gh.sh $(ME)/ $(ME)/.nojekyll $(ME)/*.* $(ME)/*/*.*)
-
-.PHONY: commit
-
-endif # T_A
-
-include $(TOP)/configure/RULES
--- a/documentation/README.md
+++ b/documentation/README.md
@@ -1,4 +1,4 @@
-# Installation Instructions {#install}
+# Installation Instructions

 ## EPICS Base Release 7.0.3.1

--- a/documentation/RELEASE_NOTES.md
+++ b/documentation/RELEASE_NOTES.md
@@ -1,4 +1,4 @@
-# EPICS 7.0 Release Notes    {#releasenotes}
+# EPICS 7.0 Release Notes

 These release notes describe changes that have been made since the previous
 release of this series of EPICS Base. **Note that changes which were merged up
@@ -13,33 +13,10 @@ 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.1
+## Changes made on the 7.0 branch since 7.0.4

 <!-- Insert new items immediately below here ... -->

-## EPICS Release 7.0.4.1
-
-### Bug fixes
-
-The following launchpad bugs have fixes included in this release:
-
- [lp: 1884339](https://bugs.launchpad.net/epics-base/+bug/1884339), Inaccessible CA servers on Windows
-
-
-### Record Name Validation
-
-Historically, there have been very few restrictions on which characters
-may be present in record and alias names.  Base 3.14.12.3 added a warning
-for names containing space, single or double quote, period/dot, or
-dollar sign.
-
-```
-Bad character ' ' in record name "bad practice"
-```
-
-7.0.4.1 Turns this warning into an error, and adds a new warning
-if a record name begins with a minus, plus, left square bracket,
-or left curly bracket.

 ## EPICS Release 7.0.4

@@ -1352,15 +1329,6 @@ 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
@@ -1384,6 +1352,7 @@ 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
@@ -1399,7 +1368,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 junitfiles`) followed by
+they can read junittest output instead of TAP `make junitests`) 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.
@@ -1647,8 +1616,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/RecordReference.md
+++ b/documentation/RecordReference.md
@@ -1,4 +1,4 @@
-# Record Reference Documentation  {#recordrefmanual}
+# Record Reference Documentation

 The following documentation for the record types and menus include with Base was
 converted from the old EPICS Wiki pages and updated. This list only includes the
--- a/documentation/mainpage.dox
+++ b/documentation/mainpage.dox
@@ -1,16 +0,0 @@
-/**
-@mainpage EPICS Base
-
-Documentation index
-
-@ul
-@li @ref releasenotes
-@li @ref install
-@li @ref recordrefmanual
-@li <a href="CAref.html">Channel Access Reference Manual</a>
-@li <a href="filters.html">Server Side Filters Reference</a>
-@li <a href="msi.html">msi: Macro Substitution and Include Tool</a>
-@li <a href="links.html">JSON Link Types</a>
-@li <a href="CA.html">Perl 5 Interface to Channel Access</a>
-
-*/
--- 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 ? pfilenm : "<null>", lineno );
+            ca_message ( ca_status ), pfilenm, 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 archlibexp)
+  PERL_ARCHLIB  := $(shell $(PERL) ../perlConfig.pl archlib)
  PERL_h = $(PERL_ARCHLIB)/CORE/perl.h

-  EXTUTILS := $(shell $(PERL) ../perlConfig.pl privlibexp)/ExtUtils
-  PERLBIN := $(shell $(PERL) ../perlConfig.pl binexp)
+  EXTUTILS := $(shell $(PERL) ../perlConfig.pl privlib)/ExtUtils
+  PERLBIN := $(shell $(PERL) ../perlConfig.pl bin)
  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,11 +35,9 @@ 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',
@@ -88,7 +86,7 @@ if (@ARGV) {
    printRecord($_, @ARGV);
 } else {
    if (m/^ \s* ([]+:;<>0-9A-Za-z[-]+) (?:\. \w+)? \s* , \s* (\d+) \s* $/x) {
-        # Recognizes ",n" as an interest level, drops any ".FIELD" part
+        # Recognizes ",n" as an interest leve, drops any ".FIELD" part
        printRecord($1, $2);
    } else {
        # Drop any ".FIELD" part
@@ -237,9 +235,8 @@ sub printField {
        $outStr = sprintf('%-5s %.8f', $field, $fieldData);
    } elsif ( $dataType eq 'DBF_CHAR' ) {
        $outStr = sprintf('%-5s %d', $field, ord($fieldData));
-    } else {
-        # DBF_INT64, DBF_LONG, DBF_SHORT,
-        # DBF_UINT64, DBF_ULONG, DBF_USHORT, DBF_UCHAR,
+    }else {
+        # DBF_LONG, DBF_SHORT, DBF_UCHAR, DBF_ULONG, DBF_USHORT
        $outStr = sprintf('%-5s %d', $field, $fieldData);
    }

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

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

    eval { CA->pend_io($opt_w); };
    if ($@) {
        if ($@ =~ m/^ECA_TIMEOUT/) {
-            my $name = $chans[0]->name;
-            my $err = (@chans > 1) ? 'some fields' : "'$name'";
+            my $err = (@chans > 1) ? 'some PV(s)' : '"' . $chans[0]->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 {
@@ -293,12 +289,14 @@ sub caget {
    }

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

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

@@ -327,10 +325,9 @@ 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
-        next if $field eq 'DTYP' && !exists($device{$recType});
+        if ($field eq 'DTYP' && !(exists($device{$recType}))) { next; }

        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";
@@ -349,10 +346,15 @@ sub printRecord {
        my $field  = $fields_pr[$i];
        my $fToGet = $readlist[$i];
        my ($fType, $data, $base);
-        next if $timed_out{$fToGet};
-        $fType  = $ftypes[$i];
-        $base   = $bases[$i];
-        $data   = $callback_data{$fToGet};
+        if ($timed_out{$fToGet}) {
+            $fType = $fieldType{DBF_STRING};
+            $data  = '<timeout>';
+        }
+        else {
+            $fType  = $ftypes[$i];
+            $base   = $bases[$i];
+            $data   = $callback_data{$fToGet};
+        }
        $col = printField($field, $data, $fType, $base, $col);
    }
    print("\n");  # Final newline
@@ -385,8 +387,8 @@ sub printRecordList {
    if (exists($record{$type}) ) {
        print("Record type - $type\n");
        foreach my $fkey (sort keys %{$record{$type}}) {
-            printf('%-8s', $fkey);
-            printf("  interest = $record{$type}{$fkey}[$iIdx]");
+            printf('%-4s', $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,"%u", &statLevel) != 1)
+            if (sscanf(optarg,"%du", &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,"%lu", &reqElems) != 1)
+            if (sscanf(optarg,"%ld", &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,7 +437,6 @@ 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;
    }

@@ -451,7 +450,6 @@ 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;
        }

@@ -462,7 +460,6 @@ 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) {
@@ -489,7 +486,6 @@ 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) {
@@ -507,7 +503,6 @@ 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;
@@ -542,14 +537,12 @@ 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 */
@@ -563,7 +556,6 @@ 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;
    }

@@ -575,7 +567,6 @@ 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/dbChannel.c
+++ b/modules/database/src/ioc/db/dbChannel.c
@@ -603,10 +603,6 @@ 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/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",
-        (precord ? precord->name : "Unknown"),
+        (paddr ? 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"),
-        (precord ? precord->name : "Unknown"),
+        (paddr ? 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,14 +136,12 @@ static void allocTemp(void *pvoid)
 static void *popFirstTemp(void)
 {
    tempListNode        *ptempListNode;
-    void                *ptemp = NULL;
+    void                *ptemp;

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

@@ -479,16 +477,12 @@ 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 */
@@ -709,8 +703,6 @@ 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 *));
@@ -718,8 +710,6 @@ 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;
@@ -984,8 +974,6 @@ static void dbBreakBody(void)
        return;
    }
    pnewbrkTable = (brkTable *)popFirstTemp();
-    if(!pnewbrkTable)
-        return;
    number = ellCount(&tempList);
    if (number % 2) {
        yyerrorAbort("breaktable: Raw value missing");
@@ -1002,14 +990,10 @@ 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);
    }
@@ -1050,49 +1034,22 @@ 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(dbRecordNameValidate(name))
+    if (!*name) {
+        yyerrorAbort("dbRecordHead: Record name can't be empty");
        return;
+    }
+    badch = strpbrk(name, " \"'.$");
+    if (badch) {
+        epicsPrintf("Bad character '%c' in record name \"%s\"\n",
+            *badch, name);
+    }

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

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

-    if(dbRecordNameValidate(alias))
+    if (!*alias) {
+        yyerrorAbort("dbAlias: Alias name can't be empty");
        return;
-
+    }
    dbInitEntry(pdbbase, pdbEntry);
    if (dbFindRecord(pdbEntry, name)) {
        epicsPrintf("Alias \"%s\" refers to unknown record \"%s\"\n",
--- 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/softIoc/Makefile
+++ b/modules/database/src/std/softIoc/Makefile
@@ -12,6 +12,8 @@ SRC_DIRS += $(STDDIR)/softIoc
 PROD_IOC_DEFAULT = softIoc
 PROD_IOC_iOS = -nil-

+PROD_LDFLAGS_vxWorks = --whole-archive
+
 DBD += base.dbd
 DBD += asSub.dbd
 DBD += softIoc.dbd
--- a/modules/database/test/ioc/db/Makefile
+++ b/modules/database/test/ioc/db/Makefile
@@ -184,8 +184,8 @@ dbTestHarness_SRCS_RTEMS += rtemsTestHarness.c

 PROD_SRCS_RTEMS += rtemsTestData.c

-PROD_vxWorks = dbTestHarness
-PROD_RTEMS = dbTestHarness
+TESTPROD_vxWorks = dbTestHarness
+TESTPROD_RTEMS = dbTestHarness

 TESTSPEC_vxWorks = dbTestHarness.munch; epicsRunDbTests
 TESTSPEC_RTEMS = dbTestHarness.boot; epicsRunDbTests
--- a/modules/database/test/std/filters/Makefile
+++ b/modules/database/test/std/filters/Makefile
@@ -73,8 +73,8 @@ filterTestHarness_SRCS_RTEMS += rtemsTestHarness.c

 PROD_SRCS_RTEMS += rtemsTestData.c

-PROD_vxWorks = filterTestHarness
-PROD_RTEMS = filterTestHarness
+TESTPROD_vxWorks = filterTestHarness
+TESTPROD_RTEMS = filterTestHarness

 TESTSPEC_vxWorks = filterTestHarness.munch; epicsRunFilterTests
 TESTSPEC_RTEMS = filterTestHarness.boot; epicsRunFilterTests
--- a/modules/database/test/std/link/Makefile
+++ b/modules/database/test/std/link/Makefile
@@ -47,8 +47,8 @@ testHarness_SRCS += epicsRunLinkTests.c
 linkTestHarness_SRCS += $(testHarness_SRCS)
 linkTestHarness_SRCS_RTEMS += rtemsTestHarness.c

-PROD_vxWorks = linkTestHarness
-PROD_RTEMS = linkTestHarness
+TESTPROD_vxWorks = linkTestHarness
+TESTPROD_RTEMS = linkTestHarness

 TESTSPEC_vxWorks = linkTestHarness.munch; epicsRunLinkTests
 TESTSPEC_RTEMS = linkTestHarness.boot; epicsRunLinkTests
--- a/modules/database/test/std/rec/Makefile
+++ b/modules/database/test/std/rec/Makefile
@@ -175,8 +175,8 @@ recordTestHarness_SRCS_RTEMS += rtemsTestHarness.c

 PROD_SRCS_RTEMS += rtemsTestData.c

-PROD_vxWorks = recordTestHarness
-PROD_RTEMS = recordTestHarness
+TESTPROD_vxWorks = recordTestHarness
+TESTPROD_RTEMS = recordTestHarness

 TESTSPEC_vxWorks = recordTestHarness.munch; epicsRunRecordTests
 TESTSPEC_RTEMS = recordTestHarness.boot; epicsRunRecordTests
--- a/modules/libcom/src/flex/misc.c
+++ b/modules/libcom/src/flex/misc.c
@@ -438,7 +438,7 @@ int htoi(unsigned char *str)
 {
    int result;

-    (void) sscanf( (char *) str, "%x", (unsigned *) &result );
+    (void) sscanf( (char *) str, "%x", &result );

    return ( result );
    }
@@ -653,7 +653,7 @@ int otoi(Char *str)
 {
    int result;

-    (void) sscanf( (char *) str, "%o", (unsigned *) &result );
+    (void) sscanf( (char *) str, "%o", &result );

    return ( result );
    }
--- a/modules/libcom/src/macLib/macCore.c
+++ b/modules/libcom/src/macLib/macCore.c
@@ -567,6 +567,186 @@ static MAC_ENTRY *create( MAC_HANDLE *handle, const char *name, int special )
    return entry;
 }

+#define SUCCESS 0
+#define NOVALUE 1
+#define UNTERMINATED 2
+#define DIVZERO 3
+
+static int parseExpr( const char** pp, int* v, int level );
+
+/* Value is a number or an expression in () */
+static int parseValue( const char** pp, int* v )
+{
+    int status;
+    int val;
+    const char *p = *pp;
+    int neg = 0;
+
+    while (isspace((unsigned char)*p)) p++;
+    if (*p == '+' || *p == '-') neg = *p++ == '-';
+    while (isspace((unsigned char)*p)) p++;
+    if (*p == '(')
+    {
+        p++;
+        if ((status = parseExpr(&p, &val, 0)) != SUCCESS) return status;
+        if (*p++ != ')')
+        {
+            printf("macLib: missing ) after '%s'\n", *pp);
+            return UNTERMINATED;
+        }
+    }
+    else
+    {
+        char* e;
+        val = strtol(p, &e, 0);
+        if (e == p) return NOVALUE;
+        p = e;
+    }
+    if (neg) val = -val;
+    *pp = p;
+    *v = val;
+    return SUCCESS;
+}
+
+/* Expr is a sum or product of Values or a conditional */
+static int parseExpr( const char** pp, int* v, int level )
+{
+    const char *p = *pp;
+    int o = 0;
+    int val0, val1, val2;
+    int status = SUCCESS;
+    int stat1, stat2;
+
+    val0 = 0;
+    /* handle sums and differences */
+    do {
+        if ((stat1 = parseValue(&p, &val1)) != SUCCESS)
+        {
+            if (o && stat1 == NOVALUE)
+                printf ("macLib: missing operand after '%c'\n", o);
+            return stat1;
+        }
+        while (isspace((unsigned char)*p)) p++;
+        o = *p;
+        /* handle products and quotients */
+        while (o == '*' || o == '/' || o == '%')
+        {
+            p++;
+            if ((stat2 = parseValue(&p, &val2)) != SUCCESS)
+            {
+                if (stat2 == NOVALUE)
+                    printf ("macLib: missing operand after '%c'\n", o);
+                return stat2;
+            }
+            if (o == '*') val1 *= val2;
+            else if (val2 == 0)
+            {
+                status = DIVZERO;
+                val1 = 1;
+            }
+            else if (o == '/') val1 /= val2;
+            else val1 %= val2;
+            while (isspace((unsigned char)*p)) p++;
+            o = *p;
+        }
+        val0 += val1;
+    } while (o == '+' || o == '-');
+    
+    /* handle comparisons */
+    o = *p;
+    if (o == '<' || o == '>')
+    {
+        p++;
+        if ((stat1 = parseExpr(&p, &val1, 1)) != SUCCESS)
+        {
+            if (stat1 == NOVALUE)
+                printf ("macLib: missing expression after '%c'\n", o);
+            return stat1;
+        }
+        if (o == '<')
+            val0 = (val0 < val1);
+        else
+            val0 = (val0 > val1);
+    }
+
+    /* handle conditionals */
+    if (*p == '?' && level == 0)
+    {
+        p++;
+        while (isspace((unsigned char)*p)) p++;
+        if (*p != ':')
+        {
+            stat1 = parseExpr(&p, &val1, 0);
+        }
+        else
+        {
+            val1 = val0;
+            stat1 = status;
+        }
+        if (*p != ':')
+        {
+            printf("macLib: missing : after '%s'\n", *pp);
+            return UNTERMINATED;
+        }
+        p++;
+        stat2 = parseExpr(&p, &val2, 0);
+        status = val0 ? stat1 : stat2;
+        val0 = val0 ? val1 : val2;
+    }
+    
+    *v = val0;
+    *pp = p;
+    return status;
+}
+
+static MAC_ENTRY *evalExpr( MAC_HANDLE *handle, const char *expr )
+{
+    MAC_ENTRY *entry = NULL;
+    int status;
+    const char* p = expr;
+    int value;
+    char valuestr[40];
+    char format[20] = "%d";
+
+    while (isspace((unsigned char)*p)) p++;
+    if (*p == '%')
+    {
+        int i = 1;
+        p++;
+        while (i < sizeof(format) && strchr(" #-+0", *p))
+            format[i++] = *p++;
+        while (i < sizeof(format) && strchr("0123456789", *p))
+            format[i++] = *p++;
+        if (i < sizeof(format) && strchr("diouxXc", *p))
+        {
+            format[i++] = *p++;
+            format[i] = 0;
+        }
+        else
+            return NULL;
+    }
+    status = parseExpr(&p, &value, 0);
+    if (status == DIVZERO)
+        printf ("macLib: division by zero\n");
+    if (status != SUCCESS)
+        return NULL;
+    while (isspace((unsigned char)*p)) p++;
+    if (*p)
+    {
+        printf("macLib: rubbish at end of expression: %s\n", p);
+        return NULL;
+    }
+    sprintf(valuestr, format, value);
+    entry = create( handle, expr, TRUE );
+    if ( entry )
+    {
+        entry->type = "calculation";
+        if ( rawval( handle, entry, valuestr ) == NULL )
+            return NULL;
+    }
+    return entry;
+}
+
 /*
 * Look up macro entry with matching "special" attribute by name
 */
@@ -578,6 +758,10 @@ static MAC_ENTRY *lookup( MAC_HANDLE *handle, const char *name, int special )
        printf( "lookup-> level = %d, name = %s, special = %d\n",
                handle->level, name, special );

+    if ( (special == FALSE) ) {
+        entry = evalExpr( handle, name );
+        if (entry) return entry;
+    }
    /* search backwards so scoping works */
    for ( entry = last( handle ); entry != NULL; entry = previous( entry ) ) {
        if ( entry->special != special )
@@ -697,6 +881,7 @@ static void trans( MAC_HANDLE *handle, MAC_ENTRY *entry, int level,
    /* return immediately if raw value is NULL */
    if ( *rawval == NULL ) return;

+
    /* discard quotes and escapes if level is > 0 (i.e. if these aren't
       the user's quotes and escapes) */
    discard = ( level > 0 );
--- a/modules/libcom/src/osi/compiler/gcc/compilerSpecific.h
+++ b/modules/libcom/src/osi/compiler/gcc/compilerSpecific.h
@@ -24,7 +24,11 @@
 #   error compiler/gcc/compilerSpecific.h is not for use with the clang compiler
 #endif

-#define EPICS_ALWAYS_INLINE __inline__ __attribute__((always_inline))
+#if __GNUC__ > 2
+#  define EPICS_ALWAYS_INLINE __inline__ __attribute__((always_inline))
+#else
+#  define EPICS_ALWAYS_INLINE __inline__
+#endif

 /* Expands to a 'const char*' which describes the name of the current function scope */
 #define EPICS_FUNCTION __PRETTY_FUNCTION__
@@ -41,7 +45,9 @@
 /*
 * CXX_PLACEMENT_DELETE - defined if compiler supports placement delete
 */
-#define CXX_PLACEMENT_DELETE
+#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 96 )
+#   define CXX_PLACEMENT_DELETE
+#endif

 #endif /* __cplusplus */

@@ -53,7 +59,9 @@
 /*
 * Deprecation marker
 */
-#define EPICS_DEPRECATED __attribute__((deprecated))
+#if  (__GNUC__ > 2)
+#   define EPICS_DEPRECATED __attribute__((deprecated))
+#endif

 /*
 * Unused marker
--- a/modules/libcom/src/osi/os/RTEMS/osdMessageQueue.c
+++ b/modules/libcom/src/osi/os/RTEMS/osdMessageQueue.c
@@ -0,0 +1,250 @@
+/*************************************************************************\
+* 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.
+\*************************************************************************/
+/*
+ *      Author  W. Eric Norum
+ *              norume@aps.anl.gov
+ *              630 252 4793
+ */
+
+/*
+ * We want to access information which is
+ * normally hidden from application programs.
+ */
+#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ 1
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <rtems.h>
+#include <rtems/error.h>
+#include "epicsMessageQueue.h"
+#include "errlog.h"
+
+LIBCOM_API epicsMessageQueueId epicsStdCall
+epicsMessageQueueCreate(unsigned int capacity, unsigned int maximumMessageSize)
+{
+    rtems_status_code sc;
+    epicsMessageQueueId id = calloc(1, sizeof(*id));
+    rtems_interrupt_level level;
+    static char c1 = 'a';
+    static char c2 = 'a';
+    static char c3 = 'a';
+
+    if(!id)
+        return NULL;
+
+    sc = rtems_message_queue_create (rtems_build_name ('Q', c3, c2, c1),
+        capacity,
+        maximumMessageSize,
+        RTEMS_FIFO|RTEMS_LOCAL,
+        &id->id);
+    if (sc != RTEMS_SUCCESSFUL) {
+        free(id);
+        errlogPrintf ("Can't create message queue: %s\n", rtems_status_text (sc));
+        return NULL;
+    }
+    id->maxSize = maximumMessageSize;
+    id->localBuf = NULL;
+    rtems_interrupt_disable (level);
+    if (c1 == 'z') {
+        if (c2 == 'z') {
+            if (c3 == 'z') {
+                c3 = 'a';
+            }
+            else {
+                c3++;
+            }
+            c2 = 'a';
+        }
+        else {
+            c2++;
+        }
+        c1 = 'a';
+    }
+    else {
+        c1++;
+    }
+    rtems_interrupt_enable (level);
+    return id;
+}
+
+static rtems_status_code rtems_message_queue_send_timeout(
+    rtems_id id,
+    void *buffer,
+    uint32_t size,
+    rtems_interval timeout)
+{
+  Message_queue_Control    *the_message_queue;
+  Objects_Locations         location;
+  CORE_message_queue_Status msg_status;
+
+  the_message_queue = _Message_queue_Get( id, &location );
+  switch ( location )
+  {
+    case OBJECTS_ERROR:
+      return RTEMS_INVALID_ID;
+
+    case OBJECTS_LOCAL:
+      msg_status = _CORE_message_queue_Send(
+        &the_message_queue->message_queue,
+        buffer,
+        size,
+        id,
+        NULL,
+        1,
+        timeout
+      );
+
+      _Thread_Enable_dispatch();
+
+      /*
+       *  If we had to block, then this is where the task returns
+       *  after it wakes up.  The returned status is correct for
+       *  non-blocking operations but if we blocked, then we need
+       *  to look at the status in our TCB.
+       */
+
+      if ( msg_status == CORE_MESSAGE_QUEUE_STATUS_UNSATISFIED_WAIT )
+        msg_status = _Thread_Executing->Wait.return_code;
+      return _Message_queue_Translate_core_message_queue_return_code( msg_status );
+  }
+  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
+}
+
+LIBCOM_API int epicsStdCall epicsMessageQueueSend(
+    epicsMessageQueueId id,
+    void *message,
+    unsigned int messageSize)
+{
+    if (rtems_message_queue_send_timeout(id->id, message, messageSize, RTEMS_NO_TIMEOUT) == RTEMS_SUCCESSFUL)
+        return 0;
+    else
+        return -1;
+}
+
+LIBCOM_API int epicsStdCall epicsMessageQueueSendWithTimeout(
+    epicsMessageQueueId id,
+    void *message,
+    unsigned int messageSize,
+    double timeout)
+{
+    rtems_interval delay;
+    extern double rtemsTicksPerSecond_double;
+
+    /*
+     * Convert time to ticks
+     */
+    if (timeout <= 0.0)
+        return epicsMessageQueueTrySend(id, message, messageSize);
+    delay = (int)(timeout * rtemsTicksPerSecond_double);
+    if (delay == 0)
+        delay++;
+    if (rtems_message_queue_send_timeout(id->id, message, messageSize, delay) == RTEMS_SUCCESSFUL)
+        return 0;
+    else
+        return -1;
+}
+
+static int receiveMessage(
+    epicsMessageQueueId id,
+    void *buffer,
+    uint32_t size,
+    uint32_t wait,
+    rtems_interval delay)
+{
+    size_t rsize;
+    rtems_status_code sc;
+
+    if (size < id->maxSize) {
+        if (id->localBuf == NULL) {
+            id->localBuf = malloc(id->maxSize);
+            if (id->localBuf == NULL)
+                return -1;
+        }
+        rsize = receiveMessage(id, id->localBuf, id->maxSize, wait, delay);
+        if (rsize > size)
+            return -1;
+        memcpy(buffer, id->localBuf, rsize);
+    }
+    else {
+        sc = rtems_message_queue_receive(id->id, buffer, &rsize, wait, delay);
+        if (sc != RTEMS_SUCCESSFUL)
+            return -1;
+    }
+    return rsize;
+}
+
+LIBCOM_API int epicsStdCall epicsMessageQueueTryReceive(
+    epicsMessageQueueId id,
+    void *message,
+    unsigned int size)
+{
+    return receiveMessage(id, message, size, RTEMS_NO_WAIT, 0);
+}
+
+LIBCOM_API int epicsStdCall epicsMessageQueueReceive(
+    epicsMessageQueueId id,
+    void *message,
+    unsigned int size)
+{
+    return receiveMessage(id, message, size, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
+}
+
+LIBCOM_API int epicsStdCall epicsMessageQueueReceiveWithTimeout(
+    epicsMessageQueueId id,
+    void *message,
+    unsigned int size,
+    double timeout)
+{
+    rtems_interval delay;
+    uint32_t wait;
+    extern double rtemsTicksPerSecond_double;
+
+    /*
+     * Convert time to ticks
+     */
+    if (timeout <= 0.0) {
+        wait = RTEMS_NO_WAIT;
+        delay = 0;
+    }
+    else {
+        wait = RTEMS_WAIT;
+        delay = (int)(timeout * rtemsTicksPerSecond_double);
+        if (delay == 0)
+            delay++;
+    }
+    return receiveMessage(id, message, size, wait, delay);
+}
+
+LIBCOM_API int epicsStdCall epicsMessageQueuePending(
+            epicsMessageQueueId id)
+{
+    uint32_t count;
+    rtems_status_code sc;
+
+    sc = rtems_message_queue_get_number_pending(id->id, &count);
+    if (sc != RTEMS_SUCCESSFUL) {
+        errlogPrintf("Message queue %x get number pending failed: %s\n",
+                                                        (unsigned int)id,
+                                                        rtems_status_text(sc));
+        return -1;
+    }
+    return count;
+}
+
+LIBCOM_API void epicsStdCall epicsMessageQueueShow(
+            epicsMessageQueueId id,
+                int level)
+{
+    int pending = epicsMessageQueuePending(id);
+    if (pending >= 0)
+        printf ("Message queue %lx -- Pending: %d\n", (unsigned long)id, pending);
+}
--- a/modules/libcom/src/osi/os/RTEMS/osdMessageQueue.h
+++ b/modules/libcom/src/osi/os/RTEMS/osdMessageQueue.h
@@ -0,0 +1,29 @@
+/*************************************************************************\
+* 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.
+\*************************************************************************/
+/*
+ *      Author  W. Eric Norum
+ *              norume@aps.anl.gov
+ *              630 252 4793
+ */
+
+/*
+ * Very thin shims around RTEMS routines
+ */
+#include <rtems.h>
+
+struct epicsMessageQueueOSD {
+    rtems_id     id;
+    unsigned int maxSize;
+    void        *localBuf;
+
+};
+#define epicsMessageQueueDestroy(q) (rtems_message_queue_delete((q)->id))
+
+#define epicsMessageQueueTrySend(q,m,l) (rtems_message_queue_send((q)->id, (m), (l)) == RTEMS_SUCCESSFUL ? 0 : -1)
--- a/modules/libcom/src/osi/os/default/osdNetIntf.c
+++ b/modules/libcom/src/osi/os/default/osdNetIntf.c
@@ -211,7 +211,7 @@ LIBCOM_API void epicsStdCall osiSockDiscoverBroadcastAddresses
                pNewNode->addr.sa = pIfreqList->ifr_broadaddr;
                ifDepenDebugPrintf ( ( "found broadcast addr = %x\n", ntohl ( baddr.ia.sin_addr.s_addr ) ) );
            } else {
-                ifDepenDebugPrintf ( ( "Ignoring broadcast addr = %x\n", ntohl ( baddr.ia.sin_addr.s_addr ) ) );
+                ifDepenDebugPrintf ( ( "Ignoring broadcast addr = \n", ntohl ( baddr.ia.sin_addr.s_addr ) ) );
                free ( pNewNode );
                continue;
            }
--- a/modules/libcom/src/osi/os/default/osdThreadHooks.c
+++ b/modules/libcom/src/osi/os/default/osdThreadHooks.c
@@ -71,7 +71,6 @@ LIBCOM_API int epicsThreadHookAdd(EPICS_THREAD_HOOK_ROUTINE hook)
        return 0;
    }
    fprintf(stderr, "epicsThreadHookAdd: Locking problem\n");
-    free(pHook);
    return -1;
 }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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
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
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`