re-enable hex numbers in hardware links

Only the lower 32 bit used to be compared.
https://bugs.launchpad.net/epics-base/+bug/1938459

.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

Makefile

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

configure/CONFIG_SITE

@@ -157,7 +157,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.

configure/RULES_BUILD

@@ -100,6 +100,23 @@ include $(CONFIG)/RULES_FILE_TYPE
 
 include $(CONFIG)/RULES.Db
 
+#---------------------------------------------------------------
+# Do not build anything if current path matches SKIP_BUILDS
+
+ifneq (,$(strip $(SKIP_BUILDS)))
+CURRENT_MODULE=$(subst modules/,,$(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
 
@@ -226,7 +243,7 @@ $(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)
 	$(MT_EXE_COMMAND)
@@ -329,10 +346,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
 

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

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

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

configure/os/CONFIG.Common.RHEL8-x86_64

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

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

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

configure/os/CONFIG.Common.SL6-x86

@@ -0,0 +1,7 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+ARCH_DEP_CFLAGS += -march=i686
+
+# have no full C++11
+STD_CXXFLAGS = -std=c++0x

configure/os/CONFIG.Common.SL6-x86_64

@@ -0,0 +1,5 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+# have no full C++11
+STD_CXXFLAGS = -std=c++0x

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

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

configure/os/CONFIG.Common.T2-ppc604

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

configure/os/CONFIG.Common.V62-ppc604

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

configure/os/CONFIG.Common.V63-ppc603

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

configure/os/CONFIG.Common.V63-ppc604

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

configure/os/CONFIG.Common.V64-ppc604

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

configure/os/CONFIG.Common.V66-ppc603

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

configure/os/CONFIG.Common.V66-ppc604

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

configure/os/CONFIG.Common.V67-ppc604

@@ -0,0 +1,8 @@
+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>'
+
+# compiler tries to access license server (even though no license isneeded)
+export LM_LICENSE_FILE=37000@lic-windriver.psi.ch

configure/os/CONFIG.Common.V69-ppc32

@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc32
+VXWORKS_VERSION = 6.9
+export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib

configure/os/CONFIG.Common.V69-ppc604

@@ -0,0 +1,6 @@
+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
+
+# -fno-implicit-fp causes error: "unable to find a register to spill in class 'FLOAT_REGS'"
+ARCH_DEP_CFLAGS =  -mcpu=604 -mstrict-align

configure/os/CONFIG.Common.deb10-x86_64

@@ -0,0 +1,20 @@
+# DeltaTau PowerPMAC with gcc
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = x86_64
+
+LDLIBS_SHARED_YES=LDLIBS
+
+SDK = gcc
+SDK_DIR  = /opt/xgcc/gcc-8.3.0-deb10
+GNU_ARCH = x86_64-deb10-linux-gnu
+SDKTARGETSYSROOT=$(SDK_DIR)/$(GNU_ARCH)/sys-root/
+GNU_DIR = $(SDK_DIR)
+GNU_BIN = $(GNU_DIR)/bin/
+GNU_TARGET_INCLUDE_DIR =
+GNU_TARGET=x86_64-deb10-linux-gnu
+
+ARCH_DEP_CPPFLAGS =
+AS=$(GNU_BIN)/$(GNU_TARGET)-as

configure/os/CONFIG.Common.eldk42-ppc4xxFP

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

configure/os/CONFIG.Common.eldk51-ppc4xxSF

@@ -0,0 +1,17 @@
+# 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)
+
+# have no full C++11
+STD_CXXFLAGS = -std=c++0x

configure/os/CONFIG.Common.eldk52-e500v2

@@ -0,0 +1,18 @@
+# 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 =
+
+# have no full C++11
+STD_CXXFLAGS = -std=c++0x

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

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

configure/os/CONFIG.Common.gcc8-ppc4xxFP

@@ -0,0 +1,21 @@
+# DeltaTau PowerPMAC with gcc
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = gcc
+SDK_DIR = /opt/xgcc/gcc-8.5.0
+GNU_ARCH = powerpc-ppmac-linux-gnu
+SDKTARGETSYSROOT=$(SDK_DIR)/$(GNU_ARCH)/sys-root/
+GNU_DIR = $(SDK_DIR)
+GNU_BIN = $(GNU_DIR)/bin/
+GNU_TARGET_INCLUDE_DIR =
+GNU_TARGET=powerpc-ppmac-linux-gnu
+
+ARCH_DEP_CPPFLAGS =  -m32 -mcpu=440fp -mhard-float
+ARCH_DEP_LDFLAGS+=-Wl,-rpath,/opt/xgcc/gcc-8.5.0/$(GNU_ARCH)/lib
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SDKTARGETSYSROOT)/lib/powerpc-linux-gnu/
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SDKTARGETSYSROOT)/usr/lib/powerpc-linux-gnu/
+AS=$(GNU_BIN)/$(GNU_TARGET)-as

configure/os/CONFIG.Common.linux-clang

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

configure/os/CONFIG.Common.moxa42-armv6l

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

configure/os/CONFIG.Common.mvl40-xscale_be

@@ -0,0 +1,18 @@
+# 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
+
+# have no C++11
+STD_CXXFLAGS =
+
+# Cannot build PVA because of missing boost support
+SKIP_BUILDS = pv% normativeTypes

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

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)

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)

configure/os/CONFIG.RHEL7-x86_64.Common

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

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

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

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

@@ -0,0 +1,6 @@
+# "cross compile" for older Linux version (32 bit)
+# It was neccessary to install 32 bit compatibility libraries manually
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.RHEL7-x86_64.SL6-x86_64
+TARGET_LDFLAGS = -B /usr/lib/x86_64-redhat-linux6E/lib

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

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

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

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
+
+PATH_FILTER = $(subst /,/,$(1))
+
+PATH := /opt/wine-msvc-2017/bin/x86:$(PATH)

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

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
+
+PATH_FILTER = $(subst /,/,$(1))
+
+PATH := /opt/wine-msvc-2017/bin/x64:$(PATH)

configure/os/CONFIG.RHEL8-x86_64.Common

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

configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64

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

configure/os/CONFIG.RHEL8-x86_64.win32-x86

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
+
+PATH_FILTER = $(subst /,/,$(1))
+
+PATH := /opt/wine-msvc-2017/bin/x86:$(PATH)

configure/os/CONFIG.RHEL8-x86_64.windows-x64

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
+
+PATH_FILTER = $(subst /,/,$(1))
+
+PATH := /opt/wine-msvc-2017/bin/x64:$(PATH)

configure/os/CONFIG.SL6-x86.Common

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

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

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

configure/os/CONFIG.SL6-x86_64.Common

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

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

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

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

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

configure/os/CONFIG_SITE.Common.UnixCommon

@@ -0,0 +1,2 @@
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)

configure/os/CONFIG_SITE.Common.deb10-x86_64

@@ -0,0 +1,2 @@
+# Debian 10
+COMMANDLINE_LIBRARY=READLINE_NCURSES

configure/os/CONFIG_SITE.Common.gcc8-ppc4xxFP

@@ -0,0 +1,2 @@
+# DeltaTau PowerPMAC with gcc
+COMMANDLINE_LIBRARY=READLINE

configure/os/CONFIG_SITE.Common.linuxCommon

@@ -8,3 +8,7 @@
 # They must be set in the host+target specific file instead:
 #   CONFIG_SITE.<linux-arch>.<linux-arch>
 
+COMMANDLINE_LIBRARY = READLINE
+CODE_CPPFLAGS += -fno-strict-aliasing
+USR_CXXFLAGS += $(STD_CXXFLAGS)
+STD_CXXFLAGS = -std=c++11

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -18,8 +18,82 @@ VXWORKS_VERSION = 6.9
 # architecture by adding it to an appropriate
 # CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file.
 
+#### Fixes for CONFIG.Common.vxWorksCommon  #######
+
+VX_GNU_VERSION_7 = 4.8.1.11
+
+
+# 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))
+
+OP_SYS_LDFLAGS += $(OP_SYS_LDFLAGS_$@)
+OP_SYS_LDFLAGS_softIoc = -whole-archive
+OP_SYS_LDFLAGS_softIocPVA = -whole-archive
+
+# code flags
+CODE_CXXFLAGS =
+
 # WIND_BASE is where you installed the Wind River software.
 
 #WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
-WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
+#WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
 #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
+WIND_BASE = /afs/psi.ch/project/vxworks/VxWorks$(VXWORKS_VERSION)
+
+#--------------------------------------------------
+# 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))

configure/os/CONFIG_SITE.RHEL7-x86_64.Common

@@ -0,0 +1,28 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
+
+# Improved error checking with clang
+CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang
+CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64-clang
+
+# Build for old SL6 64 bit
+CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64
+CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86_64
+
+# Build for old SL6 32 bit
+CROSS_COMPILER_TARGET_ARCHS += SL6-x86
+CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86
+
+# Cross compilers that don't work on SL6 hosts
+
+# Debian 10
+CROSS_COMPILER_TARGET_ARCHS += deb10-x86_64
+
+# Newer DeltaTau PowerPMAC
+CROSS_COMPILER_TARGET_ARCHS += gcc8-ppc4xxFP
+
+# NI Linux Real-Time 7.x
+# requires RPM gcc-c++-arm-linux-gnu
+CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a
+
+# Windows cross builds using Wine
+CROSS_COMPILER_TARGET_ARCHS += win32-x86 windows-x64

configure/os/CONFIG_SITE.RHEL8-x86_64.Common

@@ -0,0 +1,21 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
+
+# Improved error checking with clang
+CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64-clang
+
+# Build for old RHEL7 64 bit
+#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64
+
+# 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
+
+# NI Linux Real-Time 7.x
+# requires RPM gcc-c++-arm-linux-gnu
+# not available yet for RHEL8
+#CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a
+
+# Windows cross builds using Wine
+CROSS_COMPILER_TARGET_ARCHS += win32-x86 windows-x64

configure/os/CONFIG_SITE.SL6-x86.Common

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

configure/os/CONFIG_SITE.SL6-x86_64.Common

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

configure/os/CONFIG_SITE.linux-x86.Common

@@ -5,3 +5,51 @@
 
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-ppc32
 #CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386-qemu
+
+INSTALL_LOCATION=/usr/local/epics/base-$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
+
+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
+CROSS_COMPILER_TARGET_ARCHS += V64-ppc604
+# (No PVA because of old compiler)
+CROSS_COMPILER_TARGET_ARCHS += V62-ppc604
+
+# Raspberry Pi
+CROSS_COMPILER_TARGET_ARCHS += raspbian-arm

configure/os/CONFIG_SITE.linux-x86_64.Common

@@ -7,3 +7,12 @@
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
 #CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100
 
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
+
+GNU_HOST_ARCH_64=x86_64
+
+# IOxOS IFC1211
+CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64
+
+# Zynq
+CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64

documentation/RELEASE_NOTES.md

@@ -133,6 +133,33 @@ make INSTALL_LOCATION=/tmp/build FINAL_LOCATION=/usr/lib/epics
 `FINAL_LOCATION` is now correctly used in systemd and sysv init scripts
 `caRepeater.service`, `S99caRepeater`, and `S99logServer`.
 
+### epicsEnvShow accepts glob pattern
+
+The optional argument to epicsEnvShow can now be a glob pattern.
+
+### New function `epicsStrnGlobMatch()`
+
+The function `epicsStrnGlobMatch(char* str, size_t len, char* pattern)`
+works exactly the same as `epicsStrGlobMatch()` but takes an additional
+length arguments which limits the number of characters of `str` to match.
+
+### Glob pattern allowed in `var` command
+
+When used with one argument, the `var` command can be used with a glob pattern
+for printing matching variables.
+
+### Fix for input links marked "special"
+
+The calcout record (and a number of synApps record types) marks its input
+link fields with the attribute `special(SPC_MOD)` and provides code in
+the record's `special()` routine to reinitialize the related value field
+whenever the input link field is set to a numeric constant. Unfortunately the
+changes to the link handling code broke this behaviour (reported as Launchpad
+[bug #1824277](https://bugs.launchpad.net/epics-base/+bug/1824277))
+back in the Base 3.16.1 release. This issue has been fixed in Base, although
+external record types may require some fixing to ensure they are correctly
+checking for and initializing the link in their `special()` routine.
+
 ### IOCsh sets `${PWD}`
 
 IOC shell will now ensure `${PWD}` is set on startup,
@@ -222,6 +249,33 @@ that the variables referenced by output pointers are initialized.
 ```
 
 
+### Timeouts for Unit Test Programs
+
+The unit test programs that are run by the `make runtests` or `make tapfiles`
+commands get executed by a `.t` wrapper script which is normally generated by
+the EPICS `makeTestfile.pl` program. Those generated wrapper scripts now
+impose a time-limit on the test program they execute, and will kill it if it
+runs for longer than 500 seconds (8 minutes 20) without exiting. That
+time-limit can be changed for any such test by modifying the Makefile which
+creates and runs the `.t` wrapper script.
+
+Setting the environment variable `EPICS_UNITTEST_TIMEOUT` to the desired
+number of seconds while the Makefile is generating the test script changes the
+timeout in that script. For example:
+
+```
+  TESTSCRIPTS_HOST += hourLongTest.t
+  hourLongTest.t: export EPICS_UNITTEST_TIMEOUT=3600
+```
+
+When selecting such a timeout remember that different Continuous Integration
+systems such as GitHub Actions and Appveyor run on processors with different
+speeds, so allow enough head-room for slower systems to complete the test.
+
+Test programs written directly in Perl as a `.plt` script should implement a
+similar timeout for themselves. The "netget" test in Base does this in a way
+that works on Windows as well as Unix-like hosts.
+
 ### Timeouts for Unit Test Programs
 
 The unit test programs that are run by the `make runtests` or `make tapfiles`

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
 

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

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

@@ -331,6 +331,7 @@ long dbb(const char *record_name)
      if (pnode->ex_sem == NULL) {
         printf("   BKPT> Out of memory\n");
         dbScanUnlock(precord);
+        free(pnode);
         epicsMutexUnlock(bkpt_stack_sem);
         return(1);
      }

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

@@ -234,7 +234,7 @@ static const iocshArg dbtgfArg0 = { "record name",iocshArgString};
 static const iocshArg * const dbtgfArgs[1] = {&dbtgfArg0};
 static const iocshFuncDef dbtgfFuncDef = {"dbtgf",1,dbtgfArgs,
                                           "Database Test Get Field.\n"
-                                          "Get field with different DBR_* types"};
+                                          "Get field with different DBR_* types\n"};
 static void dbtgfCallFunc(const iocshArgBuf *args) { dbtgf(args[0].sval);}
 
 /* dbtpf */
@@ -283,7 +283,7 @@ static const iocshArg * const dbtpnArgs[2] = {&dbtpnArg0,&dbtpnArg1};
 static const iocshFuncDef dbtpnFuncDef = {"dbtpn",2,dbtpnArgs,
                                           "Database Put Notify\n"
                                           "Without value, begin async. processing and get\n"
-                                          "With value, begin put, process, and get"};
+                                          "With value, begin put, process, and get\n"};
 static void dbtpnCallFunc(const iocshArgBuf *args)
 { dbtpn(args[0].sval,args[1].sval);}
 

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

@@ -613,8 +613,10 @@ long dbtpn(char *pname, char *pvalue)
     ptpnInfo = dbCalloc(1, sizeof(tpnInfo));
     ptpnInfo->ppn = ppn;
     ptpnInfo->callbackDone = epicsEventCreate(epicsEventEmpty);
-    strncpy(ptpnInfo->buffer, pvalue, 80);
-    ptpnInfo->buffer[79] = 0;
+    if (pvalue) {
+        strncpy(ptpnInfo->buffer, pvalue, sizeof(ptpnInfo->buffer));
+        ptpnInfo->buffer[sizeof(ptpnInfo->buffer)-1] = 0;
+    }
 
     ppn->usrPvt = ptpnInfo;
     epicsThreadCreate("dbtpn", epicsThreadPriorityHigh,

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

@@ -318,7 +318,7 @@ void recGblGetTimeStampSimm(void *pvoid, const epicsEnum16 simm, struct link *si
     } else {
         if (simm != menuSimmNO) {
             if (siol && !dbLinkIsConstant(siol)) {
-                if (dbGetTimeStamp(siol, &prec->time))
+                if (dbGetTimeStampTag(siol, &prec->time, &prec->utag))
                     errlogPrintf("recGblGetTimeStampSimm: dbGetTimeStamp (sim mode) failed, %s.SIOL = %s\n",
                         prec->name, siol->value.pv_link.pvname);
                 return;

modules/database/src/ioc/dbStatic/dbStaticLib.c

@@ -2274,8 +2274,8 @@ long dbParseLink(const char *str, short ftype, dbLinkInfo *pinfo)
             len -= (parm - pstr);
         }
 
-        /* generalized extraction of ID charactor and integer pairs (eg. "#C15 S14") */
-        ret = sscanf(pinfo->target, "# %c%d %c%d %c%d %c%d %c%d %c",
+        /* generalized extraction of ID character and integer pairs (eg. "#C15 S14") */
+        ret = sscanf(pinfo->target, "# %c%i %c%i %c%i %c%i %c%i %c",
                      &pinfo->hwid[0], &pinfo->hwnums[0],
                      &pinfo->hwid[1], &pinfo->hwnums[1],
                      &pinfo->hwid[2], &pinfo->hwnums[2],

modules/database/src/ioc/rsrv/Makefile

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

modules/database/src/std/dev/devSiSoftCallback.c

@@ -108,6 +108,7 @@ static long add_record(dbCommon *pcommon)
 
         recGblRecordError(status, (void *)prec,
             "devSiSoftCallback (add_record) linked record not found");
+        free(pdevPvt);
         return status;
     }
 

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

@@ -359,16 +359,16 @@ static void checkAlarms(int64inRecord *prec, epicsTimeStamp *timeLast)
 }
 
 /* DELTA calculates the absolute difference between its arguments
- * expressed as an unsigned 32-bit integer */
+ * expressed as an unsigned 64-bit integer */
 #define DELTA(last, val) \
-    ((epicsUInt32) ((last) > (val) ? (last) - (val) : (val) - (last)))
+    ((epicsUInt64) ((last) > (val) ? (last) - (val) : (val) - (last)))
 
 static void monitor(int64inRecord *prec)
 {
     unsigned short monitor_mask = recGblResetAlarms(prec);
 
     if (prec->mdel < 0 ||
-        DELTA(prec->mlst, prec->val) > (epicsUInt32) prec->mdel) {
+        DELTA(prec->mlst, prec->val) > (epicsUInt64) prec->mdel) {
         /* post events for value change */
         monitor_mask |= DBE_VALUE;
         /* update last value monitored */
@@ -376,7 +376,7 @@ static void monitor(int64inRecord *prec)
     }
 
     if (prec->adel < 0 ||
-        DELTA(prec->alst, prec->val) > (epicsUInt32) prec->adel) {
+        DELTA(prec->alst, prec->val) > (epicsUInt64) prec->adel) {
         /* post events for archive value change */
         monitor_mask |= DBE_LOG;
         /* update last archive value monitored */

modules/database/src/std/rec/mbboDirectRecord.dbd.pod

@@ -99,6 +99,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
         prompt("Word")
         promptgroup("50 - Output")
         asl(ASL0)
+        special(SPC_RESET)
         pp(TRUE)
     }
     field(OMSL,DBF_MENU) {

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

@@ -139,6 +139,7 @@ static long process(struct dbCommon *pcommon)
     if (!pact && prec->pact)
         return 0;
 
+    prec->pact = TRUE;
     prec->udf = FALSE;
     recGblGetTimeStampSimm(prec, prec->simm, &prec->siol);
 

modules/database/test/std/rec/regressCalcout.db

@@ -0,0 +1,27 @@
+record(calcout, "cout") {
+    field(INPA, "99")
+    field(INPB, "99")
+    field(INPC, "99")
+    field(INPD, "99")
+}
+record(ai, "ain") {
+    field(DTYP, "Async Soft Channel")
+}
+record(bi, "bin") {
+    field(DTYP, "Async Soft Channel")
+}
+record(int64in, "iin") {
+    field(DTYP, "Async Soft Channel")
+}
+record(longin, "lin") {
+    field(DTYP, "Async Soft Channel")
+}
+record(mbbi, "min") {
+    field(DTYP, "Async Soft Channel")
+}
+record(mbbiDirect, "din") {
+    field(DTYP, "Async Soft Channel")
+}
+record(stringin, "sin") {
+    field(DTYP, "Async Soft Channel")
+}

modules/database/test/std/rec/regressTest.c

@@ -134,15 +134,63 @@ void testCADisconn(void)
     testdbPutFieldFail(-1, "ai:disconn.PROC", DBF_LONG, 1);
     testdbGetFieldEqual("ai:disconn.SEVR", DBF_LONG, INVALID_ALARM);
     testdbGetFieldEqual("ai:disconn.STAT", DBF_LONG, LINK_ALARM);
+
+    testIocShutdownOk();
+    testdbCleanup();
+}
+
+/* lp:1824277 Regression in calcout, setting links at runtime */
+static void
+testSpecialLinks(void)
+{
+    testDiag("In testSpecialLinks()");
+
+    startRegressTestIoc("regressCalcout.db");
+
+    testdbPutFieldOk("cout.INPA", DBF_STRING, "10");
+    testdbGetFieldEqual("cout.A", DBF_LONG, 10);
+    testdbGetFieldEqual("cout.INAV", DBF_LONG, calcoutINAV_CON);
+    testdbPutFieldOk("cout.A", DBF_LONG, 15);
+    testdbPutFieldOk("cout.INPB", DBF_STRING, "{\"const\":20}");
+    testdbGetFieldEqual("cout.B", DBF_LONG, 20);
+    testdbGetFieldEqual("cout.INBV", DBF_LONG, calcoutINAV_CON);
+    testdbPutFieldOk("cout.B", DBF_LONG, 25);
+    testdbPutFieldOk("cout.INPC", DBF_STRING, "cout.A");
+    testdbGetFieldEqual("cout.C", DBF_LONG, 99);
+    testdbGetFieldEqual("cout.INCV", DBF_LONG, calcoutINAV_LOC);
+    testdbPutFieldOk("cout.INPD", DBF_STRING, "no-such-pv");
+    testdbGetFieldEqual("cout.D", DBF_LONG, 99);
+    testdbGetFieldEqual("cout.INDV", DBF_LONG, calcoutINAV_EXT_NC);
+
+    eltc(0);
+    testdbPutFieldOk("ain.INP", DBF_STRING, "cout");
+    testdbPutFieldFail(S_db_badField, "ain.INP", DBF_STRING, "{\"const\":1}");
+    testdbPutFieldOk("bin.INP", DBF_STRING, "cout");
+    testdbPutFieldFail(S_db_badField, "bin.INP", DBF_STRING, "{\"const\":1}");
+    testdbPutFieldOk("iin.INP", DBF_STRING, "cout");
+    testdbPutFieldFail(S_db_badField, "iin.INP", DBF_STRING, "{\"const\":1}");
+    testdbPutFieldOk("lin.INP", DBF_STRING, "cout");
+    testdbPutFieldFail(S_db_badField, "lin.INP", DBF_STRING, "{\"const\":1}");
+    testdbPutFieldOk("min.INP", DBF_STRING, "cout");
+    testdbPutFieldFail(S_db_badField, "min.INP", DBF_STRING, "{\"const\":1}");
+    testdbPutFieldOk("din.INP", DBF_STRING, "cout");
+    testdbPutFieldFail(S_db_badField, "din.INP", DBF_STRING, "{\"const\":1}");
+    testdbPutFieldOk("sin.INP", DBF_STRING, "cout");
+    testdbPutFieldFail(S_db_badField, "sin.INP", DBF_STRING, "{\"const\":1}");
+    eltc(1);
+
+    testIocShutdownOk();
+    testdbCleanup();
 }
 
 
 MAIN(regressTest)
 {
-    testPlan(34);
+    testPlan(62);
     testArrayLength1();
     testHexConstantLinks();
     testLinkMS();
     testCADisconn();
+    testSpecialLinks();
     return testDone();
 }

modules/libcom/src/calc/postfix.c

@@ -221,6 +221,7 @@ 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) {
@@ -427,10 +428,12 @@ LIBCOM_API long
                 pstacktop--;
             }
 
+/*
             if (cond_count != 0) {
                 *perror = CALC_ERR_CONDITIONAL;
                 goto bad;
             }
+*/
             if (runtime_depth > 1) {
                 *perror = CALC_ERR_TOOMANY;
                 goto bad;
@@ -475,8 +478,12 @@ 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;

modules/libcom/src/env/envDefs.h

@@ -76,6 +76,7 @@ LIBCOM_API extern const ENV_PARAM EPICS_IOC_LOG_FILE_COMMAND;
 LIBCOM_API extern const ENV_PARAM IOCSH_PS1;
 LIBCOM_API extern const ENV_PARAM IOCSH_HISTSIZE;
 LIBCOM_API extern const ENV_PARAM IOCSH_HISTEDIT_DISABLE;
+LIBCOM_API extern const ENV_PARAM EPICS_MUTEX_USE_PRIORITY_INHERITANCE;
 LIBCOM_API extern const ENV_PARAM *env_param_list[];
 
 struct in_addr;

modules/libcom/src/freeList/freeList.h

@@ -41,4 +41,3 @@ LIBCOM_API size_t epicsStdCall freeListItemsAvail(void *pvt);
 #endif
 
 #endif /*INCfreeListh*/
- 

modules/libcom/src/log/iocLogServer.c

@@ -113,6 +113,7 @@ int main(void)
 
     pserver->pfdctx = (void *) fdmgr_init();
     if (!pserver->pfdctx) {
+        free(pserver);
         fprintf(stderr, "iocLogServer: %s\n", strerror(errno));
         return IOCLS_ERROR;
     }

modules/libcom/src/macLib/macCore.c

@@ -568,6 +568,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
  */
@@ -579,6 +759,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 )
@@ -698,6 +882,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 );

modules/libcom/src/osi/compiler/gcc/compilerSpecific.h

@@ -25,7 +25,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__
@@ -42,7 +46,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 */
 
@@ -54,7 +60,9 @@
 /*
  * Deprecation marker
  */
-#define EPICS_DEPRECATED __attribute__((deprecated))
+#if  (__GNUC__ > 2)
+#   define EPICS_DEPRECATED __attribute__((deprecated))
+#endif
 
 /*
  * Unused marker

modules/libcom/src/osi/os/posix/osdElfFindAddr.c

@@ -639,7 +639,7 @@ epicsFindAddr(void *addr, epicsSymbol *sym_p)
 
     if ( nearest.raw && ( (idx = ARR(c,nearest,0,st_name)) < es->strMap->max ) ) {
         sym_p->s_nam = strtab + idx;
-        sym_p->s_val = (char*) ARR(c, nearest, 0, st_value) + es->addr;
+        sym_p->s_val = (char*)(size_t) ARR(c, nearest, 0, st_value) + es->addr;
     }
 
     return 0;

modules/libcom/src/osi/os/posix/osdMutex.c

@@ -23,26 +23,29 @@
 #include <errno.h>
 #include <unistd.h>
 #include <pthread.h>
+#include <ctype.h>
 
 #define EPICS_PRIVATE_API
 
 #include "epicsMutex.h"
 #include "osdPosixMutexPriv.h"
+#include "epicsThread.h"
 #include "cantProceed.h"
 #include "epicsTime.h"
 #include "errlog.h"
 #include "epicsStdio.h"
 #include "epicsAssert.h"
+#include "envDefs.h"
 
 #define checkStatus(status,message) \
     if((status)) { \
-        errlogPrintf("epicsMutex %s failed: error %s\n", \
-            (message), strerror((status))); \
+        errlogPrintf("%s: epicsMutex %s failed: error %s\n", \
+            epicsThreadGetNameSelf(), (message), strerror((status))); \
     }
 #define checkStatusQuit(status,message,method) \
     if(status) { \
-        errlogPrintf("epicsMutex %s failed: error %s\n", \
-            (message), strerror((status))); \
+        errlogPrintf("%s: epicsMutex %s failed: error %s\n", \
+            epicsThreadGetNameSelf(), (message), strerror((status))); \
         cantProceed((method)); \
     }
 
@@ -68,21 +71,27 @@ static void globalAttrInit()
     status = pthread_mutexattr_settype(&globalAttrRecursive, PTHREAD_MUTEX_RECURSIVE);
     checkStatusQuit(status, "pthread_mutexattr_settype(&globalAttrRecursive, PTHREAD_MUTEX_RECURSIVE)", "globalAttrInit");
 #if defined _POSIX_THREAD_PRIO_INHERIT
-    status = pthread_mutexattr_setprotocol(&globalAttrDefault, PTHREAD_PRIO_INHERIT);
-    if (errVerbose) checkStatus(status, "pthread_mutexattr_setprotocol(&globalAttrDefault, PTHREAD_PRIO_INHERIT)");
-    status = pthread_mutexattr_setprotocol(&globalAttrRecursive, PTHREAD_PRIO_INHERIT);
-    if (errVerbose) checkStatus(status, "pthread_mutexattr_setprotocol(&globalAttrRecursive, PTHREAD_PRIO_INHERIT)");
-    if (status == 0) {
-        /* Can we really use PTHREAD_PRIO_INHERIT? */
-        pthread_mutex_t temp;
-        status = pthread_mutex_init(&temp, &globalAttrRecursive);
-        if (errVerbose) checkStatus(status, "pthread_mutex_init(&temp, &globalAttrRecursive)");
-        if (status != 0) {
-            /* No, PTHREAD_PRIO_INHERIT does not work, fall back to PTHREAD_PRIO_NONE */;
-            pthread_mutexattr_setprotocol(&globalAttrDefault, PTHREAD_PRIO_NONE);
-            pthread_mutexattr_setprotocol(&globalAttrRecursive, PTHREAD_PRIO_NONE);
-        } else {
-            pthread_mutex_destroy(&temp);
+    {
+        const char *p = envGetConfigParamPtr(&EPICS_MUTEX_USE_PRIORITY_INHERITANCE);
+        char c = p ? toupper(p[0]) : 'N';
+        if ( 'T' == c || 'Y' == c || '1' == c ) {
+            status = pthread_mutexattr_setprotocol(&globalAttrDefault, PTHREAD_PRIO_INHERIT);
+            if (errVerbose) checkStatus(status, "pthread_mutexattr_setprotocol(&globalAttrDefault, PTHREAD_PRIO_INHERIT)");
+            status = pthread_mutexattr_setprotocol(&globalAttrRecursive, PTHREAD_PRIO_INHERIT);
+            if (errVerbose) checkStatus(status, "pthread_mutexattr_setprotocol(&globalAttrRecursive, PTHREAD_PRIO_INHERIT)");
+            if (status == 0) {
+                /* Can we really use PTHREAD_PRIO_INHERIT? */
+                pthread_mutex_t temp;
+                status = pthread_mutex_init(&temp, &globalAttrRecursive);
+                if (errVerbose) checkStatus(status, "pthread_mutex_init(&temp, &globalAttrRecursive)");
+                if (status != 0) {
+                    /* No, PTHREAD_PRIO_INHERIT does not work, fall back to PTHREAD_PRIO_NONE */;
+                    pthread_mutexattr_setprotocol(&globalAttrDefault, PTHREAD_PRIO_NONE);
+                    pthread_mutexattr_setprotocol(&globalAttrRecursive, PTHREAD_PRIO_NONE);
+                } else {
+                    pthread_mutex_destroy(&temp);
+                }
+            }
         }
     }
 #endif
@@ -144,7 +153,7 @@ void epicsMutexOsdDestroy(struct epicsMutexOSD * pmutex)
     int status;
 
     status = pthread_mutex_destroy(&pmutex->lock);
-    checkStatus(status, "pthread_mutex_destroy");
+    checkStatusQuit(status, "pthread_mutex_destroy", "epicsMutexOsdDestroy");
     free(pmutex);
 }
 
@@ -153,7 +162,7 @@ void epicsMutexOsdUnlock(struct epicsMutexOSD * pmutex)
     int status;
 
     status = pthread_mutex_unlock(&pmutex->lock);
-    checkStatus(status, "pthread_mutex_unlock epicsMutexOsdUnlock");
+    checkStatusQuit(status, "pthread_mutex_unlock", "epicsMutexOsdUnlock");
 }
 
 epicsMutexLockStatus epicsMutexOsdLock(struct epicsMutexOSD * pmutex)

modules/libcom/src/osi/os/posix/osdThread.c

@@ -956,8 +956,10 @@ LIBCOM_API epicsThreadPrivateId epicsStdCall epicsThreadPrivateCreate(void)
         return NULL;
     status = pthread_key_create(key,0);
     checkStatus(status,"pthread_key_create epicsThreadPrivateCreate");
-    if(status)
+    if(status) {
+        free(key);
         return NULL;
+    }
     return((epicsThreadPrivateId)key);
 }
 
@@ -994,11 +996,13 @@ LIBCOM_API void epicsStdCall *epicsThreadPrivateGet(epicsThreadPrivateId id)
 
 LIBCOM_API double epicsStdCall epicsThreadSleepQuantum ()
 {
-    double hz;
-    hz = sysconf ( _SC_CLK_TCK );
-    if(hz<=0)
-        return 0.0;
-    return 1.0 / hz;
+#ifdef CLOCK_REALTIME
+    struct timespec res;
+    if (clock_getres(CLOCK_REALTIME, &res) == 0)
+        return res.tv_sec + 1e-9 * res.tv_nsec;
+    else
+#endif
+    return 1e-3;
 }
 
 LIBCOM_API int epicsThreadGetCPUs(void)

modules/libcom/src/osi/os/vxWorks/osdThread.c

@@ -50,6 +50,11 @@
   #define ALLOT_JOIN(tid)
 #endif
 
+#ifndef _WRS_VXWORKS_MAJOR
+/* vxWorks 5 */
+#include <private/taskLibP.h>
+#define taskCreate taskCreat
+#endif
 
 LIBCOM_API void osdThreadHooksRun(epicsThreadId id);
 

modules/libcom/test/epicsAtomicTest.cpp

@@ -13,6 +13,8 @@
 #include "epicsUnitTest.h"
 #include "testMain.h"
 
+using namespace epics::atomic;
+
 namespace {
 
 template < class T >
@@ -57,7 +59,7 @@ static void add ( void *arg )
     using epics::atomic::increment;
     TestDataAddSub < T > * const pTestData =
         reinterpret_cast < TestDataAddSub < T > * > ( arg );
-    add ( pTestData->m_testValue, TestDataAddSub < T > :: delta  );
+    epics::atomic::add ( pTestData->m_testValue, TestDataAddSub < T > :: delta  );
     increment ( pTestData->m_testIterations );
 }
 

modules/libcom/test/epicsCalcTest.cpp

@@ -298,7 +298,7 @@ MAIN(epicsCalcTest)
     const double a=1.0, b=2.0, c=3.0, d=4.0, e=5.0, f=6.0,
                  g=7.0, h=8.0, i=9.0, j=10.0, k=11.0, l=12.0;
 
-    testPlan(630);
+    testPlan(/*630*/628);
 
     /* LITERAL_OPERAND elements */
     testExpr(0);
@@ -945,8 +945,8 @@ MAIN(epicsCalcTest)
     testBadExpr("MAX()", CALC_ERR_SYNTAX);
     testBadExpr("MAX(A,)", CALC_ERR_SYNTAX);
     testBadExpr("MAX(A,B,)", CALC_ERR_SYNTAX);
-    testBadExpr("1?", CALC_ERR_CONDITIONAL);
-    testBadExpr("1?1", CALC_ERR_CONDITIONAL);
+//    testBadExpr("1?", CALC_ERR_CONDITIONAL);
+//    testBadExpr("1?1", CALC_ERR_CONDITIONAL);
     testBadExpr(":1", CALC_ERR_SYNTAX);
 
     // Bit manipulations wrt bit 31 (bug lp:1514520)

src/tools/genVersionHeader.pl

@@ -75,7 +75,7 @@ if (!$vcs && -d "$opt_t/.git") { # Git
     # v1-4-abcdef-dirty
     # is 4 commits after tag 'v1' with short hash abcdef
     # with uncommited modifications
-    my $result = `git describe --always --tags --dirty --abbrev=20`;
+    my $result = `git describe --always --tags --dirty --long`;
     chomp $result;
     print "== git describe:\n$result\n==\n" if $opt_v;
     if (!$? && $result ne '') {