Update version numbers for release

update release notes
add doxygen+gh-pages
2020-07-26 14:39:02 -07:00 · 2020-07-26 14:15:10 -07:00 · 2020-07-26 13:48:01 -07:00 · 2020-07-26 13:48:01 -07:00 · 2020-07-21 15:17:37 -05:00 · 2020-07-20 18:22:37 -05:00
117 changed files with 3095 additions and 1322 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-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,6 +26,3 @@
    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 -u
+set -e

 die() {
  echo "$1" >&2
--- 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,7 +55,7 @@ jobs:
  - dist: xenial

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

  - dist: trusty
    env: EXTRA="CMD_CXXFLAGS=-std=c++11"
@@ -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,10 +23,3 @@ 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 -g
+OPT_CFLAGS_YES = -O3
 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 -g
+OPT_CXXFLAGS_YES = -O3
 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 = 1
+EPICS_CA_DEVELOPMENT_FLAG = 0

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

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

 # 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,9 +161,7 @@ USE_POSIX_THREAD_PRIORITY_SCHEDULING = YES

 # Site version number, if set will append '-' and this string to the
 #  EPICS version number string that is reported by many tools.
-ifeq ($(INSTALL_LOCATION),$(EPICS_BASE))
-EPICS_SITE_VERSION=$(shell $(PERL) -MPOSIX -e 'print strftime "%Y-%m-%d", localtime')
-endif
+EPICS_SITE_VERSION =

 # 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,23 +86,6 @@ 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

@@ -133,7 +116,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
@@ -225,9 +208,9 @@ $(LOADABLE_SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)

 $(TESTPRODNAME) $(PRODNAME): $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)

-$(TESTPRODNAME) $(PRODNAME): %$(EXE):
+$(TESTPRODNAME) $(PRODNAME): %$(EXE): | $(INSTALL_LIB)
 	@$(RM) $@
-	$(DEBUGCMD) $(LINK.cpp)
+	$(LINK.cpp)
 	$(MT_EXE_COMMAND)

 %_ctdt$(OBJ): %_ctdt.c
@@ -328,6 +311,10 @@ $(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

@@ -403,7 +390,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
@@ -503,9 +490,11 @@ $(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
@@ -1,2 +0,0 @@
-# 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
@@ -1 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.linux-clang
--- a/configure/os/CONFIG.Common.SL5-x86
+++ b/configure/os/CONFIG.Common.SL5-x86
@@ -1,6 +0,0 @@
-# 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
@@ -1,4 +0,0 @@
-# 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
@@ -1,4 +0,0 @@
-# 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
@@ -1,2 +0,0 @@
-# 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
@@ -1 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.linux-clang
--- a/configure/os/CONFIG.Common.T2-ppc604
+++ b/configure/os/CONFIG.Common.T2-ppc604
@@ -1,8 +0,0 @@
-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
@@ -1,2 +0,0 @@
-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
@@ -1,5 +0,0 @@
-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
@@ -1,5 +0,0 @@
-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
@@ -1,2 +0,0 @@
-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
@@ -1,2 +0,0 @@
-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
@@ -1,5 +0,0 @@
-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
@@ -1,3 +0,0 @@
-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
@@ -1,3 +0,0 @@
-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
@@ -1,22 +0,0 @@
-# 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
@@ -1,14 +0,0 @@
-# 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
@@ -1,15 +0,0 @@
-# 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
@@ -1,21 +0,0 @@
-# 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
@@ -1,23 +0,0 @@
-# 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
@@ -1,5 +0,0 @@
-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
@@ -1,16 +0,0 @@
-# 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
@@ -1,15 +0,0 @@
-# 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
@@ -1,18 +0,0 @@
-# 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
@@ -1,41 +0,0 @@
-# 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,7 +14,6 @@ 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,12 +14,9 @@ ARCH_CLASS = ppc

 # Architecture specific build flags
 ARCH_DEP_CPPFLAGS = -DCPU=PPC604
-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))
-
+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))

 GNU_TARGET = powerpc-wrs-vxworks
--- a/configure/os/CONFIG.Common.yocto21-aarch64
+++ b/configure/os/CONFIG.Common.yocto21-aarch64
@@ -1,18 +0,0 @@
-# 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
@@ -1,3 +0,0 @@
-#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
@@ -1,2 +0,0 @@
-# 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
@@ -1,16 +0,0 @@
-# "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
@@ -1,16 +0,0 @@
-# "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
@@ -1,8 +0,0 @@
-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
@@ -1,8 +0,0 @@
-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
@@ -1,3 +0,0 @@
-#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
@@ -1,2 +0,0 @@
-# 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
@@ -1,3 +0,0 @@
-#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
@@ -1,2 +0,0 @@
-# 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
@@ -1,2 +0,0 @@
-#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
@@ -1,2 +0,0 @@
-# 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
@@ -1,3 +0,0 @@
-#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
@@ -1,2 +0,0 @@
-# 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
@@ -1,2 +0,0 @@
-# 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 = $(MSVC_DIR)link
+WINLINK = link

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

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

 #
 # Configure OS vendor C compiler
-CC = $(MSVC_DIR)cl
+CC = 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 = $(MSVC_DIR)cl -nologo -C -E
+CPP = cl -nologo -C -E

 # Configure OS vendor C++ compiler
 #
 # -EHsc - generate code for exceptions
 # -GR - generate code for run time type identification
 #
-CCC = $(MSVC_DIR)cl -EHsc -GR
+CCC = 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
@@ -1,2 +0,0 @@
-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,6 +9,3 @@
 # 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,81 +2,24 @@
 #
 # Site specific definitions for vxWorks target builds.

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

-VX_GNU_VERSION_7 = 4.8.1.11
+# 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


-# 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))
+# Sites may override the following path for a particular host
+# architecture by adding it to an appropriate
+# CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file.

 # 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
@@ -1,21 +0,0 @@
-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
@@ -1 +0,0 @@
-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
@@ -1,3 +0,0 @@
-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
@@ -1 +0,0 @@
-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
@@ -1,7 +0,0 @@
-# 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,46 +1,9 @@
-INSTALL_LOCATION=/usr/local/epics/base-$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)$(EPICS_PATCH_VSTRING)
+# CONFIG_SITE.linux-x86.Common
+#
+# Site override definitions for linux-x86 host builds
+#-------------------------------------------------------

-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
+# 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
--- a/configure/os/CONFIG_SITE.linux-x86_64.Common
+++ b/configure/os/CONFIG_SITE.linux-x86_64.Common
@@ -1,9 +1,9 @@
-include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
+# CONFIG_SITE.linux-x86_64.Common
+#
+# Site override definitions for linux-x86_64 host builds
+#-------------------------------------------------------

-GNU_HOST_ARCH_64=x86_64
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100

-# IOxOS IFC1211
-CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64
-
-# Zynq
-CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64
--- a/documentation/.gitignore
+++ b/documentation/.gitignore
@@ -0,0 +1,3 @@
+*.db
+epics-base.tag
+html/
--- a/documentation/Doxyfile@
+++ b/documentation/Doxyfile@
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -0,0 +1,33 @@
+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
+# Installation Instructions {#install}

 ## 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
+# EPICS 7.0 Release Notes    {#releasenotes}

 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,10 +13,33 @@ 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
+## Changes made on the 7.0 branch since 7.0.4.1

 <!-- 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

@@ -1329,6 +1352,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
@@ -1352,7 +1384,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
@@ -1368,7 +1399,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.
@@ -1616,8 +1647,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
+# Record Reference Documentation  {#recordrefmanual}

 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
@@ -0,0 +1,16 @@
+/**
+@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,9 +37,6 @@ 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,7 +78,6 @@ 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
@@ -1,66 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     National Laboratory.
-* Copyright (c) 2002 The Regents of the University of California, as
-*     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
-\*************************************************************************/
-
-/*  
- *
- *                              
- *                    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,7 +42,6 @@ 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
@@ -100,4 +99,3 @@ 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,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/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
@@ -1,9 +0,0 @@
-#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/rsrv/Makefile
+++ b/modules/database/src/ioc/rsrv/Makefile
@@ -16,7 +16,6 @@ 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,8 +12,6 @@ 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

-TESTPROD_vxWorks = dbTestHarness
-TESTPROD_RTEMS = dbTestHarness
+PROD_vxWorks = dbTestHarness
+PROD_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

-TESTPROD_vxWorks = filterTestHarness
-TESTPROD_RTEMS = filterTestHarness
+PROD_vxWorks = filterTestHarness
+PROD_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

-TESTPROD_vxWorks = linkTestHarness
-TESTPROD_RTEMS = linkTestHarness
+PROD_vxWorks = linkTestHarness
+PROD_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

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

 TESTSPEC_vxWorks = recordTestHarness.munch; epicsRunRecordTests
 TESTSPEC_RTEMS = recordTestHarness.boot; epicsRunRecordTests
--- a/modules/libcom/src/calc/postfix.c
+++ b/modules/libcom/src/calc/postfix.c
@@ -216,7 +216,6 @@ LIBCOM_API long
    int cond_count = 0;
    char * const pdest = pout;
    char *pnext;
-    const char* psrc_orig = psrc;

    if (psrc == NULL || *psrc == '\0' ||
        pout == NULL || perror == NULL) {
@@ -471,12 +470,8 @@ LIBCOM_API long
    *pout = END_EXPRESSION;

    if (cond_count != 0) {
-        fprintf(stderr, "Deprecated CALC \"%s\": %s\n",
-            psrc_orig, calcErrorStr(CALC_ERR_CONDITIONAL));
-/*
        *perror = CALC_ERR_CONDITIONAL;
        goto bad;
-*/
    }
    if (operand_needed || runtime_depth != 1) {
        *perror = CALC_ERR_INCOMPLETE;
--- 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", &result );
+    (void) sscanf( (char *) str, "%x", (unsigned *) &result );

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

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

    return ( result );
    }
--- a/modules/libcom/src/macLib/macCore.c
+++ b/modules/libcom/src/macLib/macCore.c
@@ -567,186 +567,6 @@ 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
 */
@@ -758,10 +578,6 @@ 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 )
@@ -881,7 +697,6 @@ 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,11 +24,7 @@
 #   error compiler/gcc/compilerSpecific.h is not for use with the clang compiler
 #endif

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

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

 #endif /* __cplusplus */

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

 /*
 * Unused marker
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael Davidsaver	aee99a5987	Update version numbers for release	2020-07-26 14:39:02 -07:00
Michael Davidsaver	809a1553bf	update release notes	2020-07-26 14:15:10 -07:00
Michael Davidsaver	8029a72fec	add doxygen+gh-pages	2020-07-26 13:48:01 -07:00
Michael Davidsaver	bcbaffc158	update submodules	2020-07-26 13:48:01 -07: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
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
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
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
				`@@ -1 +0,0 @@`
				`include $(CONFIG)/os/CONFIG.Common.linux-clang`
				`@@ -1 +0,0 @@`
				`include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common`