Merge commit '235f8ed2fb85270a1b9edddbff6a1c5b10f484b9' into 7.0.5-troubleshoot

Merge commit '54e9d3f' into 7.0.5-troubleshoot
only 3 digits in version
2021-05-12 14:28:29 +02:00 · 2021-05-10 18:59:10 +02:00 · 2021-05-10 17:08:38 +02:00 · 2021-05-10 10:50:57 +02:00 · 2021-05-05 10:30:11 +02:00 · 2021-04-05 10:31:25 -07:00
269 changed files with 2824 additions and 1694 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -31,6 +31,8 @@ skip_commits:
    - 'documentation/*'
    - 'startup/*'
    - '.github/*'
+    - '.tools/*'
+    - '.gitattributes'
    - '**/*.html'
    - '**/*.md'

@@ -64,6 +66,7 @@ environment:
  - CMP: vs2012
  - CMP: vs2010
  - CMP: gcc
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019

 # Platform: processor architecture
 platform:
@@ -104,7 +107,7 @@ build_script:

 test_script:
  - cmd: python -m ci_core_dumper install
-  - cmd: python .ci/cue.py test
+  - cmd: python .ci/cue.py -T 20M test

 on_finish:
  - ps: Get-ChildItem *.tap -Recurse -Force | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
--- a/.appveyor/epics-base-7.yml
+++ b/.appveyor/epics-base-7.yml
@@ -38,6 +38,8 @@ skip_commits:
    - 'documentation/*'
    - 'startup/*'
    - '.github/*'
+    - '.tools/*'
+    - '.gitattributes'
    - '**/*.html'
    - '**/*.md'

--- a/.ci
+++ b/.ci
--- a/.ci-local/travis-fixup.sh
+++ b/.ci-local/travis-fixup.sh
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -e -u -x
-
-env|grep TRAVIS
-
-[ "$TRAVIS_OS_NAME" = "linux" ] || exit 0
-
-# Ensure there is an interface with a (correct) broadcast address
-# eg. 'trusty' VMs have interface broadcast address mis-configured
-# (why oh why do people insist on setting this explicitly?)
-
-sudo ip tuntap add dev tap42 mode tap
-
-sudo ip addr add 192.168.240.1/24 broadcast + dev tap42
-
-sudo ip link set dev tap42 up
-
-# note that this device will be UP but not RUNNING
-# so java will see it as not UP since java confuses UP and RUNNING
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,6 @@
 .ci/          export-ignore
 .tools/       export-ignore
+.github/      export-ignore
+.appveyor/    export-ignore
 .appveyor.yml export-ignore
-.travis.yml   export-ignore
 README        export-subst
--- a/.github/workflows/ci-scripts-build.yml
+++ b/.github/workflows/ci-scripts-build.yml
@@ -14,9 +14,19 @@ on:
      - 'documentation/*'
      - 'startup/*'
      - '.appveyor/*'
+      - '.tools/*'
+      - '.gitattributes'
      - '**/*.html'
      - '**/*.md'
  pull_request:
+    paths-ignore:
+      - 'documentation/*'
+      - 'startup/*'
+      - '.appveyor/*'
+      - '.tools/*'
+      - '.gitattributes'
+      - '**/*.html'
+      - '**/*.md'

 env:
    SETUP_PATH: .ci-local:.ci
@@ -98,6 +108,12 @@ jobs:
            configuration: default
            name: "Ub-20 gcc-8"

+          - os: ubuntu-20.04
+            cmp: gcc-9
+            utoolchain: "9"
+            configuration: default
+            name: "Ub-20 gcc-9"
+
          - os: ubuntu-20.04
            cmp: clang
            configuration: default
@@ -118,6 +134,11 @@ jobs:
            configuration: static
            name: "Win2019 MSC-19, static"

+          - os: windows-2019
+            cmp: gcc
+            configuration: default
+            name: "Win2019 mingw"
+
    steps:
    - uses: actions/checkout@v2
      with:
@@ -142,8 +163,9 @@ jobs:
    - name: Build main module
      run: python .ci/cue.py build
    - name: Run main module tests
-      run: python .ci/cue.py test
+      run: python .ci/cue.py -T 20M test
    - name: Upload tapfiles Artifact
+      if: ${{ always() }}
      uses: actions/upload-artifact@v2
      with:
        name: tapfiles ${{ matrix.name }}
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,3 +26,6 @@
    path = .ci
    url = https://github.com/epics-base/ci-scripts
    branch = master
+[submodule "modules/pcas"]
+    path = modules/pcas
+    url = https://github.com/epics-modules/pcas
--- a/7
+++ b/7
@@ -23,3 +23,10 @@ DIRS += modules
 modules_DEPEND_DIRS = src

 include $(TOP)/configure/RULES_TOP
+
+UNINSTALL_DIRS += $(INSTALL_LOCATION)/src
+copysrc:
+	tar cf - --exclude-vcs --exclude-backups --exclude=O.* modules/*/src | tar xf - -C $(INSTALL_LOCATION)
+
+tar:
+	tar cfjP epics_base-$(EPICS_VERSION_NUMBER).tar.bz2 $(INSTALL_LOCATION)
--- a/configure/CONFIG.gnuCommon
+++ b/configure/CONFIG.gnuCommon
@@ -33,7 +33,7 @@ CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
 CODE_CFLAGS += $(ASAN_FLAGS_$(ENABLE_ASAN))
 WARN_CFLAGS_YES = -Wall -Werror-implicit-function-declaration
 WARN_CFLAGS_NO = -w
-OPT_CFLAGS_YES = -O3
+OPT_CFLAGS_YES = -O3 -g
 OPT_CFLAGS_NO = -g

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

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

 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included in the official EPICS version number if zero
-EPICS_PATCH_LEVEL = 0
+EPICS_PATCH_LEVEL = 1

 # Immediately after an official release the EPICS_PATCH_LEVEL is incremented
 # and the -DEV suffix is added (similar to the Maven -SNAPSHOT versions)
-EPICS_DEV_SNAPSHOT=
+EPICS_DEV_SNAPSHOT=-DEV

 # No changes should be needed below here

--- a/configure/CONFIG_CA_VERSION
+++ b/configure/CONFIG_CA_VERSION
@@ -2,11 +2,11 @@

 EPICS_CA_MAJOR_VERSION = 4
 EPICS_CA_MINOR_VERSION = 13
-EPICS_CA_MAINTENANCE_VERSION = 8
+EPICS_CA_MAINTENANCE_VERSION = 9

 # Development flag, set to zero for release versions

-EPICS_CA_DEVELOPMENT_FLAG = 0
+EPICS_CA_DEVELOPMENT_FLAG = 1

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

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

 # Development flag, set to zero for release versions

-EPICS_DATABASE_DEVELOPMENT_FLAG = 0
+EPICS_DATABASE_DEVELOPMENT_FLAG = 1

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

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

 # Development flag, set to zero for release versions

-EPICS_LIBCOM_DEVELOPMENT_FLAG = 0
+EPICS_LIBCOM_DEVELOPMENT_FLAG = 1

 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -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.
--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -196,12 +196,12 @@ endif
 #---------------------------------------------------------------
 # build dependancies, clean rule

-inc: $(COMMON_INC) $(INSTALL_INC)
+inc: $(COMMON_INC) $(INSTALL_INC) $(COMMON_DBDS) $(COMMON_DBDCATS) \
+	$(INSTALL_DBDS) $(INSTALL_DBD_INSTALLS)

-build: $(COMMON_DBDS) $(COMMON_DBS) $(COMMON_DBDCATS) \
-	$(INSTALL_DBDS) $(INSTALL_DBS) \
+build: $(COMMON_DBS) $(INSTALL_DBS) \
 	$(DBDDEPENDS_FILES) $(TARGETS) \
-	$(INSTALL_DB_INSTALLS) $(INSTALL_DBD_INSTALLS)
+	$(INSTALL_DB_INSTALLS)

 clean: db_clean

--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -100,20 +100,40 @@ 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

-#ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY) ))
+ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) \
+        $(LOADABLE_LIBRARY)))
 include $(CONFIG)/RULES_TARGET
-#endif
+endif

 #---------------------------------------------------------------
 # Read dependency files

+ifneq (inc,$(strip $(MAKECMDGOALS)))
 ifneq (,$(strip $(HDEPENDS_FILES)))
 $(filter-out $(wildcard *$(DEP)), $(HDEPENDS_FILES)): | $(COMMON_INC)
 -include $(HDEPENDS_FILES)
 endif
+endif

 #---------------------------------------------------------------
 #   Products and Object libraries
@@ -161,12 +181,13 @@ build: inc
 build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODTARGETS) \
 	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)

-inc: $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS)
+inc: $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS) $(INSTALLS_CFG) \
+	$(INSTALL_HTMLS) $(INSTALLS_PERL_MODULES) $(INSTALL_SCRIPTS)

 buildInstall: \
-	$(INSTALL_SCRIPTS) $(INSTALL_PROD) $(INSTALL_MUNCHS) \
+	$(INSTALL_PROD) $(INSTALL_MUNCHS) \
 	$(INSTALL_TCLLIBS) $(INSTALL_TCLINDEX) \
-	$(INSTALL_HTMLS) $(INSTALL_DOCS) \
+	$(INSTALL_DOCS) \
 	$(INSTALL_OBJS) \
 	$(INSTALL_TEMPLATE) \
 	$(INSTALL_BIN_INSTALLS)
@@ -222,9 +243,9 @@ $(LOADABLE_SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)

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

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

 %_ctdt$(OBJ): %_ctdt.c
@@ -325,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

@@ -507,11 +524,9 @@ $(INSTALL_TCLLIB)/%: ../%
 	@$(INSTALL) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_TCLLIB)
 endif

-ifneq ($(TCLINDEX),)
 $(INSTALL_TCLLIB)/$(TCLINDEX): $(INSTALL_TCLLIBS)
 	$(ECHO) "Updating $@"
 	$(ECHO) eval auto_mkindex $(INSTALL_TCLLIB) "$(TCLLIBNAME)" | tclsh
-endif

 $(INSTALL_LOADABLE_SHRLIBS): $(INSTALL_SHRLIB)/%: %
 	$(ECHO) "Installing loadable shared library $@"
--- a/configure/RULES_TARGET
+++ b/configure/RULES_TARGET
@@ -21,7 +21,6 @@ $(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRA

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

-# This define block requires GNU make 3.81
 define PROD_template
 ifeq ($$(strip $$($(1)_OBJS) $$($(1)_SRCS) $$(PRODUCT_OBJS)),)
 $(1)_OBJS = $(1)$$(OBJ)
--- a/configure/RULES_TOP
+++ b/configure/RULES_TOP
@@ -73,7 +73,7 @@ help:
 	@echo "Usage: gnumake [options] [target] ..."
 	@echo "Targets supported by all Makefiles:"
 	@echo "     all            - Same as install (default rule)"
-	@echo "     inc            - Installs header files"
+	@echo "     inc            - Installs header, dbd and html files"
 	@echo "     build          - Builds and installs all targets"
 	@echo "     install        - Builds and installs all targets"
 	@echo "     buildInstall   - Same as install (deprecated)"
--- a/configure/os/CONFIG.Common.RHEL7-x86_64
+++ b/configure/os/CONFIG.Common.RHEL7-x86_64
@@ -0,0 +1,2 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
--- a/configure/os/CONFIG.Common.RHEL7-x86_64-clang
+++ b/configure/os/CONFIG.Common.RHEL7-x86_64-clang
@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang
--- a/configure/os/CONFIG.Common.SL5-x86
+++ b/configure/os/CONFIG.Common.SL5-x86
@@ -0,0 +1,6 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+ARCH_DEP_CFLAGS += -march=i686
--- a/configure/os/CONFIG.Common.SL5-x86_64
+++ b/configure/os/CONFIG.Common.SL5-x86_64
@@ -0,0 +1,4 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
--- a/configure/os/CONFIG.Common.SL6-x86
+++ b/configure/os/CONFIG.Common.SL6-x86
@@ -0,0 +1,4 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+ARCH_DEP_CFLAGS += -march=i686
--- a/configure/os/CONFIG.Common.SL6-x86_64
+++ b/configure/os/CONFIG.Common.SL6-x86_64
@@ -0,0 +1,2 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
--- a/configure/os/CONFIG.Common.SL6-x86_64-clang
+++ b/configure/os/CONFIG.Common.SL6-x86_64-clang
@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang
--- a/configure/os/CONFIG.Common.T2-ppc604
+++ b/configure/os/CONFIG.Common.T2-ppc604
@@ -0,0 +1,8 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 5.5.1
+WIND_BASE = /afs/psi.ch/project/vxworks/Tornado2.2.1
+
+#there is a problem with our ccppc and optimization
+# -O0 works, -O and -O1 and higher are buggy
+OPT_CFLAGS_YES = -O0
+OPT_CXXFLAGS_YES = -O0
--- a/configure/os/CONFIG.Common.V62-ppc604
+++ b/configure/os/CONFIG.Common.V62-ppc604
@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.2
--- a/configure/os/CONFIG.Common.V63-ppc603
+++ b/configure/os/CONFIG.Common.V63-ppc603
@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long
+VXWORKS_VERSION = 6.3
+
+# Buggy "uninitialized variable" warning produces many false positives
+ARCH_DEP_CXXFLAGS += -Wno-uninitialized
--- a/configure/os/CONFIG.Common.V63-ppc604
+++ b/configure/os/CONFIG.Common.V63-ppc604
@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.3
+
+# Buggy "uninitialized variable" warning produces many false positives
+ARCH_DEP_CXXFLAGS += -Wno-uninitialized
--- a/configure/os/CONFIG.Common.V66-ppc603
+++ b/configure/os/CONFIG.Common.V66-ppc603
@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long
+VXWORKS_VERSION = 6.6
--- a/configure/os/CONFIG.Common.V66-ppc604
+++ b/configure/os/CONFIG.Common.V66-ppc604
@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.6
--- a/configure/os/CONFIG.Common.V67-ppc604
+++ b/configure/os/CONFIG.Common.V67-ppc604
@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.7
+
+#needed when including memPartLib.h, e.g. through moduleLib.h or loadLib.h
+ARCH_DEP_CFLAGS += -D_VSB_CONFIG_FILE='<../lib/h/config/vsbConfig.h>'
--- a/configure/os/CONFIG.Common.V69-ppc32
+++ b/configure/os/CONFIG.Common.V69-ppc32
@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc32
+VXWORKS_VERSION = 6.9
+export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
--- a/configure/os/CONFIG.Common.V69-ppc604
+++ b/configure/os/CONFIG.Common.V69-ppc604
@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.9
+export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
--- a/configure/os/CONFIG.Common.eldk42-ppc4xxFP
+++ b/configure/os/CONFIG.Common.eldk42-ppc4xxFP
@@ -0,0 +1,22 @@
+# DeltaTau PowerPMAC with ELDK 4.2
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+ARCH_CLASS = ppc
+
+ELDK=/opt/eldk-4.2
+GNU_TARGET=ppc_4xxFP
+GNU_DIR=$(ELDK)/usr
+
+# This cross tool chain is installed in a somehow weired way
+# Without the following lines it does not work on RHEL7
+# but it worked on SL6
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/powerpc-linux
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/backward
+
+ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/lib
+ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/usr/lib
--- a/configure/os/CONFIG.Common.eldk51-ppc4xxSF
+++ b/configure/os/CONFIG.Common.eldk51-ppc4xxSF
@@ -0,0 +1,14 @@
+# Virtex FPGA embedded Processor with ELDK 5.1
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.1
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_TARGET = powerpc-4xx-softfloat
+GNU_ARCH = ppc405-linux
+GNU_DIR = $(SDK_DIR)/$(GNU_TARGET)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
--- a/configure/os/CONFIG.Common.eldk52-e500v2
+++ b/configure/os/CONFIG.Common.eldk52-e500v2
@@ -0,0 +1,15 @@
+# IOxOS IFC1210 with ELDK 5.2
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.2
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_TARGET = powerpc-e500v2
+GNU_ARCH = ppce500v2-linux-gnuspe
+GNU_DIR = $(SDK_DIR)/$(GNU_TARGET)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
+GNU_TARGET_INCLUDE_DIR =
--- a/configure/os/CONFIG.Common.eldk53-ppc4xxFP
+++ b/configure/os/CONFIG.Common.eldk53-ppc4xxFP
@@ -0,0 +1,21 @@
+# DeltaTau PowerPMAC with ELDK 5.3
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.3
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_ARCH = ppc440e-linux
+SDKTARGETSYSROOT=$(SDK_DIR)/powerpc-4xx/sysroots
+GNU_DIR = $(SDKTARGETSYSROOT)/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
+GNU_TARGET_INCLUDE_DIR =
+GNU_TARGET=powerpc-linux
+
+ARCH_DEP_CPPFLAGS =  -m32 -mcpu=440fp -mhard-float
+ARCH_DEP_CPPFLAGS += --sysroot=$(SDKTARGETSYSROOT)/$(GNU_ARCH)
+ARCH_DEP_LDFLAGS =   --sysroot=$(SDKTARGETSYSROOT)/$(GNU_ARCH)
+AS=$(GNU_BIN)/$(GNU_TARGET)-as
--- a/configure/os/CONFIG.Common.fslqoriq20-e6500_64
+++ b/configure/os/CONFIG.Common.fslqoriq20-e6500_64
@@ -0,0 +1,23 @@
+# IOxOS IFC1211 with Freescale QorIQ 2.0 toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = fslsdk
+SDK_DIR = /opt/fsl-qoriq/2.0
+SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
+SDK_TARGET = ppc64e6500-fsl-linux
+GNU_TARGET = powerpc64-fsl-linux
+SDKTARGETSYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
+
+ARCH_DEP_CPPFLAGS = --sysroot=$(SDKTARGETSYSROOT)
+ARCH_DEP_CFLAGS = -mcpu=e6500 -m64 -mhard-float
+ARCH_DEP_LDFLAGS = --sysroot=$(SDKTARGETSYSROOT)
+
+# warning -O2 and higher are broken!
+#OPT_CFLAGS_YES = -O1
+#OPT_CXXFLAGS_YES = -O1
--- a/configure/os/CONFIG.Common.linux-clang
+++ b/configure/os/CONFIG.Common.linux-clang
@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+GNU         = NO
+CMPLR_CLASS = clang
+CC          = clang
+CCC         = clang++
--- a/configure/os/CONFIG.Common.moxa42-armv6l
+++ b/configure/os/CONFIG.Common.moxa42-armv6l
@@ -0,0 +1,16 @@
+# Moxa DA-66x with SDK 4.2 and ARM7 processor
+
+# Include definitions common to all Linux ARM targets
+include $(CONFIG)/os/CONFIG.Common.linux-arm
+
+GNU_DIR=/afs/psi.ch/project/embeddedlinux/moxa/arm-linux-4.4.2-v4
+GNU_TARGET=arm
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(GNU_DIR)/arm-none-linux-gnueabi/lib
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB)
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# suppress note "the mangling of 'va_list' has changed in GCC 4.4"
+ARCH_DEP_CXXFLAGS += -Wno-psabi
+
+ARCH_DEP_CFLAGS += -funwind-tables
--- a/configure/os/CONFIG.Common.mvl40-xscale_be
+++ b/configure/os/CONFIG.Common.mvl40-xscale_be
@@ -0,0 +1,15 @@
+# Moxa DA-66x with Montavista Linux 4.0
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE_CURSES
+
+ARCH_CLASS = xscale
+
+GNU_DIR=/afs/psi.ch/project/embeddedlinux/moxa/xscale_be/armv5teb-montavista-linuxeabi
+
+ARCH_DEP_CFLAGS += -funwind-tables
+
+# Cannot build PVA because of missing boost support
+SKIP_BUILDS = pv% normativeTypes
--- a/configure/os/CONFIG.Common.nilrt7-armv7a
+++ b/configure/os/CONFIG.Common.nilrt7-armv7a
@@ -0,0 +1,18 @@
+# National Instruments CompactRIO running LabView RT 19.5.1
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = arm
+
+GNU_TARGET = arm-linux-gnu
+
+SYSROOT = /opt/LabVIEW-RT-19.5.1/arm/sysroots/armv7a-vfp-neon-nilrt-linux-gnueabi
+
+ARCH_DEP_CPPFLAGS += -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon
+ARCH_DEP_CPPFLAGS += --sysroot=$(SYSROOT)
+ARCH_DEP_CPPFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi/
+ARCH_DEP_CPPFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/
+ARCH_DEP_LDFLAGS  += --sysroot=$(SYSROOT)
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
--- a/configure/os/CONFIG.Common.raspbian-arm
+++ b/configure/os/CONFIG.Common.raspbian-arm
@@ -0,0 +1,41 @@
+# RaspberryPi with github.com/raspberrypi/tools toolchain
+# Tested on:
+# * Raspberry 3B+ Raspbian 9
+# * Raspberry 2   Raspbian 7
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+# Using readline:
+# Due to missing/messed up libs in the toolchain, readline needs copies of
+# libtinfo.so.5.9 and libreadline.so.6.2 from a Raspbian 7 rootfs
+# /lib/arm-linux-gnueabihf/ to the toolchain, e.g.
+# $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf/
+# and manually created links libtinfo.so.5 and libreadline.so.
+# For gcc-linaro-arm-linux-gnueabihf-raspbian, an existing incompatible
+# libtinfo.so.5 is in the way. Remove it.
+# (Built with glibc 2.16 like installed on Raspbian 9 but toolchain uses glibc 2.13.)
+# Also copy /usr/include/readline/ directory from some readline 6 installation
+# to $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/usr/include/
+
+ARCH_CLASS = arm
+
+SDK_DIR = /opt/raspberrypi/arm-bcm2708
+
+# Available SDK_TARGETs:
+
+# gcc 4.8.3 for 32 bit hosts with GLIBC 2.3 or higher
+SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian
+
+# gcc 4.8.3 for 64 bit hosts with GLIBC 2.14 or higher
+# SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian-x64
+
+# gcc 4.7.1 for 64 bit hosts with GLIBC 2.8 or higher
+# SDK_TARGET = arm-linux-gnueabihf
+
+# gcc 4.7.1 for 32 bit hosts with GLIBC 2.4 or higher
+# SDK_TARGET = arm-bcm2708hardfp-linux-gnueabi
+# SDK_TARGET = arm-bcm2708-linux-gnueabi
+
+GNU_DIR = $(SDK_DIR)/$(SDK_TARGET)
+GNU_TARGET = $(if $(filter arm-bcm2708%,SDK_TARGET),$(SDK_TARGET),arm-linux-gnueabihf)
--- a/configure/os/CONFIG.Common.vxWorks-ppc32
+++ b/configure/os/CONFIG.Common.vxWorks-ppc32
@@ -14,6 +14,7 @@ ARCH_CLASS = ppc

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

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

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

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

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

 GNU_TARGET = powerpc-wrs-vxworks
--- a/configure/os/CONFIG.Common.yocto21-aarch64
+++ b/configure/os/CONFIG.Common.yocto21-aarch64
@@ -0,0 +1,18 @@
+# XILINX Zynq with Yocto 2.1 / Petalinux toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = arm64
+
+SDK = petalinux
+SDK_DIR = /opt/petalinux-gfa/2017.2
+SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
+SDK_TARGET = aarch64-xilinx-linux
+GNU_TARGET = $(SDK_TARGET)
+SDKTARGETSYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
+
+ARCH_DEP_CPPFLAGS = --sysroot=$(SDKTARGETSYSROOT)
+ARCH_DEP_LDFLAGS = --sysroot=$(SDKTARGETSYSROOT)
--- a/configure/os/CONFIG.RHEL7-x86_64.Common
+++ b/configure/os/CONFIG.RHEL7-x86_64.Common
@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common
--- a/configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64
+++ b/configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64
@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
--- a/configure/os/CONFIG.RHEL7-x86_64.SL6-x86
+++ b/configure/os/CONFIG.RHEL7-x86_64.SL6-x86
@@ -0,0 +1,16 @@
+# "cross compile" for older Linux version
+# Use older compiler and older libraries
+# Used packages:
+# compat-gcc-44-c++-4.4.7
+# compat-gcc-44-4.4.7
+# compat-glibc-headers-2.12
+# It was neccessary to install 32 bit compatibility libraries manually
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44
+
+TARGET_CPPFLAGS = -isystem /usr/lib/x86_64-redhat-linux6E/include
+TARGET_LDFLAGS = -B /usr/lib/x86_64-redhat-linux6E/lib
+LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo
--- a/configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64
+++ b/configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64
@@ -0,0 +1,16 @@
+# "cross compile" for older Linux version
+# Use older compiler and older libraries
+# Used packages:
+# compat-gcc-44-c++-4.4.7
+# compat-gcc-44-4.4.7
+# compat-glibc-headers-2.12
+# compat-glibc-2.12
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44
+
+TARGET_CPPFLAGS = -isystem /usr/lib/x86_64-redhat-linux6E/include
+TARGET_LDFLAGS = -B /usr/lib/x86_64-redhat-linux6E/lib64
+LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo
--- a/configure/os/CONFIG.RHEL7-x86_64.win32-x86
+++ b/configure/os/CONFIG.RHEL7-x86_64.win32-x86
@@ -0,0 +1,8 @@
+include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
+
+PATH_FILTER = $(subst /,/,$(1))
+
+# Silence the tr1 namespace deprecation warnings
+USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
+
+MSVC_DIR = /opt/wine-msvc-2017/bin/x86/
--- a/configure/os/CONFIG.RHEL7-x86_64.windows-x64
+++ b/configure/os/CONFIG.RHEL7-x86_64.windows-x64
@@ -0,0 +1,8 @@
+include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
+
+PATH_FILTER = $(subst /,/,$(1))
+
+# Silence the tr1 namespace deprecation warnings
+USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
+
+MSVC_DIR = /opt/wine-msvc-2017/bin/x64/
--- a/configure/os/CONFIG.SL5-x86.Common
+++ b/configure/os/CONFIG.SL5-x86.Common
@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86.Common
--- a/configure/os/CONFIG.SL5-x86.SL5-x86
+++ b/configure/os/CONFIG.SL5-x86.SL5-x86
@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
--- a/configure/os/CONFIG.SL5-x86_64.Common
+++ b/configure/os/CONFIG.SL5-x86_64.Common
@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common
--- a/configure/os/CONFIG.SL5-x86_64.SL5-x86_64
+++ b/configure/os/CONFIG.SL5-x86_64.SL5-x86_64
@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
--- a/configure/os/CONFIG.SL6-x86.Common
+++ b/configure/os/CONFIG.SL6-x86.Common
@@ -0,0 +1,2 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
--- a/configure/os/CONFIG.SL6-x86.SL6-x86
+++ b/configure/os/CONFIG.SL6-x86.SL6-x86
@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
--- a/configure/os/CONFIG.SL6-x86_64.Common
+++ b/configure/os/CONFIG.SL6-x86_64.Common
@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common
--- a/configure/os/CONFIG.SL6-x86_64.SL6-x86
+++ b/configure/os/CONFIG.SL6-x86_64.SL6-x86
@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
--- a/configure/os/CONFIG.SL6-x86_64.SL6-x86_64
+++ b/configure/os/CONFIG.SL6-x86_64.SL6-x86_64
@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
--- a/configure/os/CONFIG.win32-x86.win32-x86
+++ b/configure/os/CONFIG.win32-x86.win32-x86
@@ -14,15 +14,15 @@ OPT_WHOLE_PROGRAM = YES

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

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

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

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

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

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

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

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

 # Other compiler flags, used for CPP, C and C++
 #
--- a/configure/os/CONFIG_SITE.Common.UnixCommon
+++ b/configure/os/CONFIG_SITE.Common.UnixCommon
@@ -0,0 +1,2 @@
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
--- a/configure/os/CONFIG_SITE.Common.linuxCommon
+++ b/configure/os/CONFIG_SITE.Common.linuxCommon
@@ -8,3 +8,12 @@
 # They must be set in the host+target specific file instead:
 #   CONFIG_SITE.<linux-arch>.<linux-arch>

+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g
+
+COMMANDLINE_LIBRARY = READLINE
+CODE_CPPFLAGS += -fno-strict-aliasing
--- a/configure/os/CONFIG_SITE.Common.vxWorksCommon
+++ b/configure/os/CONFIG_SITE.Common.vxWorksCommon
@@ -2,24 +2,81 @@
 #
 # Site specific definitions for vxWorks target builds.

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

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


-# Sites may override the following path for a particular host
-# architecture by adding it to an appropriate
-# CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file.
+# These are needed for vxWorks 6.x; the GNU toolset version number
+# is in the path to the compiler tools:
+VX_GNU_VERSION_5   = 2.96
+VX_GNU_VERSION_6 = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
+VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_MAJOR_VERSION))
+VX_GNU_MAJOR_VERSION = $(firstword $(subst ., ,$(VX_GNU_VERSION)))
+VX_GNU_MINOR_VERSION = $(word 2,$(subst ., ,$(VX_GNU_VERSION)))
+
+# gcc version before 3.4 are "old" and need special treatment
+VX_OLD_GCC_2   = OLD
+VX_OLD_GCC_3.3 = OLD
+VX_OLD_GCC_3   = $(VX_OLD_GCC_3.$(VX_GNU_MINOR_VERSION))
+VX_OLD_GCC = $(VX_OLD_GCC_$(VX_GNU_MAJOR_VERSION))
+
+# vxWorks directory definitions
+VX_DIR_5 = $(WIND_BASE)
+VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
+VX_DIR_7 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/pkgs/os
+VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
+
+VX_INCLUDE_DIRS_5  = $(VX_DIR)/target/h
+VX_INCLUDE_DIRS_6  = $(VX_DIR)/target/h
+VX_INCLUDE_DIRS_6 += $(VX_DIR)/target/h/wrn/coreip
+VX_INCLUDE_DIRS_7  = $(VX_DIR)/core/kernel-1.2.8.0/h
+VX_INCLUDE_DIRS_7 += $(VX_DIR)/lang-lib/libc-1.0.0.1/libc-kernel-1.0.8.0/h
+VX_INCLUDE_DIRS_7 += $(VX_DIR)/utils/ostools-1.0.5.0/h
+VX_INCLUDE_DIRS_7 += $(VX_DIR)/utils/ostools-1.0.5.0/shareh
+VX_INCLUDE_DIRS_7 += $(VX_DIR)/arch/ppc-1.3.4.0/kernel/base/h/
+VX_INCLUDE_DIRS_7 += $(VX_DIR)/arch/ppc-1.3.4.0/kernel/60x/h/arch/ppc/
+VX_INCLUDE_DIRS_7 += $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/samples/prebuilt_projects/vsb_vxsim_linux/krnl/h/public
+GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
+
+TARGET_CPPFLAGS_5 = -isystem $(VX_DIR)/target/h
+TARGET_CPPFLAGS_6 = -isystem $(VX_DIR)/target/h
+TARGET_CPPFLAGS_7 = -isystem $(VX_DIR)/core/kernel-1.2.8.0/h -D_VSB_CONFIG_FILE='<$(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/samples/prebuilt_projects/vsb_vxsim_linux/h/config/vsbConfig.h>'
+TARGET_CPPFLAGS = $(TARGET_CPPFLAGS_$(VXWORKS_MAJOR_VERSION))
+
+# vxWorks GNU directories
+
+GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
+GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
+GNU_DIR_7 = $(WIND_BASE)/compilers/gnu-$(VX_GNU_VERSION)/$(WIND_HOST_TYPE)
+GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
+
+# Operating system flags
+OP_SYS_CFLAGS += -fno-strict-aliasing
+
+OP_SYS_INCLUDE_CPPFLAGS_5 += -include $(VX_DIR)/target/h/vxWorks.h
+OP_SYS_INCLUDE_CPPFLAGS_6 += -include $(VX_DIR)/target/h/vxWorks.h
+OP_SYS_INCLUDE_CPPFLAGS_7 += -include vxWorks.h
+OP_SYS_INCLUDE_CPPFLAGS = $(OP_SYS_INCLUDE_CPPFLAGS_$(VXWORKS_MAJOR_VERSION))
+
+# For gcc versions before 3.4 we need this g++ compiler flag
+# However WindRiver says gcc 3.3 does not need it any more
+# which would allow to build vxWorks 6 without this flag.
+# Maybe we can live without it at the penalty of larger code.
+# See vxWorks 5 docs/gnu2.96+ppc/gcc.html
+# chapter 4.5 "Where's the Template?"
+CODE_CXXFLAGS_OLD = -fno-implicit-templates
+CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VX_OLD_GCC))

 # WIND_BASE is where you installed the Wind River software.
+WIND_BASE = /afs/psi.ch/project/vxworks/VxWorks$(VXWORKS_VERSION)
+
+#--------------------------------------------------
+# Modules we cannot build with old compiler
+
+PV_MODULES = pv% normativeTypes
+SKIP_BUILDS_5 = $(PV_MODULES)
+SKIP_BUILDS_OLD = $(PV_MODULES)
+SKIP_BUILDS_6 = $(SKIP_BUILDS_$(VX_OLD_GCC))
+SKIP_BUILDS = $(SKIP_BUILDS_$(VXWORKS_MAJOR_VERSION))

-#WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
-WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
-#WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
--- a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common
+++ b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common
@@ -0,0 +1,21 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
+
+# Build 32 bit version as a cross architecture
+#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86
+
+# Improved error checking with clang
+CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang
+
+# Build for old SL6 64 bit
+CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64
+
+# Build for old SL6 32 bit
+#CROSS_COMPILER_TARGET_ARCHS += SL6-x86
+
+# WINE MSVC
+CROSS_COMPILER_TARGET_ARCHS += win32-x86 windows-x64
+
+# NI Linux Real-Time 7.x
+# requires RPM gcc-c++-arm-linux-gnu
+CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a
+
--- a/configure/os/CONFIG_SITE.SL5-x86.Common
+++ b/configure/os/CONFIG_SITE.SL5-x86.Common
@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
--- a/configure/os/CONFIG_SITE.SL5-x86_64.Common
+++ b/configure/os/CONFIG_SITE.SL5-x86_64.Common
@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
+# Build 32 bit version as a cross architecture
+CROSS_COMPILER_TARGET_ARCHS += SL5-x86
--- a/configure/os/CONFIG_SITE.SL6-x86.Common
+++ b/configure/os/CONFIG_SITE.SL6-x86.Common
@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
--- a/configure/os/CONFIG_SITE.SL6-x86_64.Common
+++ b/configure/os/CONFIG_SITE.SL6-x86_64.Common
@@ -0,0 +1,7 @@
+# Build 32 bit version as a cross architecture
+#CROSS_COMPILER_TARGET_ARCHS += SL6-x86
+
+# Improved error checking with clang
+#CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64-clang
+
+include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
--- a/configure/os/CONFIG_SITE.linux-x86.Common
+++ b/configure/os/CONFIG_SITE.linux-x86.Common
@@ -1,9 +1,46 @@
-# CONFIG_SITE.linux-x86.Common
-#
-# Site override definitions for linux-x86 host builds
-#-------------------------------------------------------
+INSTALL_LOCATION=/usr/local/epics/base-$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)

-# JBA test override values
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
-#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386 # RTEMS-mvme5500 RTEMS-mvme167
+GNU_HOST_ARCH=i686
+GNU_HOST_OS=linux
+
+# LD_LIBRARY_PATH may cause problems for eldk53-ppc4xxFP
+LD_LIBRARY_PATH=
+
+# vxWorks 5.5 for MVxxxx boards
+CROSS_COMPILER_TARGET_ARCHS += T2-ppc604
+
+# vxWorks 6.7 for MVxxxx boards
+CROSS_COMPILER_TARGET_ARCHS += V67-ppc604
+
+# vxWorks 6.9 for MVxxxx boards
+CROSS_COMPILER_TARGET_ARCHS += V69-ppc604
+CROSS_COMPILER_TARGET_ARCHS += V69-ppc32
+
+# NI compact RIO
+CROSS_COMPILER_TARGET_ARCHS += V63-ppc603
+
+# MOXA montavista linux (No PVA because of missing boost support)
+CROSS_COMPILER_TARGET_ARCHS += mvl40-xscale_be
+
+# MOXA SDK 4.2
+CROSS_COMPILER_TARGET_ARCHS += moxa42-armv6l
+
+# Virtex embedded PPC
+CROSS_COMPILER_TARGET_ARCHS += eldk51-ppc4xxSF
+
+# IOxOS IFC1210
+CROSS_COMPILER_TARGET_ARCHS += eldk52-e500v2
+
+# DeltaTau PowerPMAC
+CROSS_COMPILER_TARGET_ARCHS += eldk42-ppc4xxFP
+CROSS_COMPILER_TARGET_ARCHS += eldk53-ppc4xxFP
+
+# Test other vxWorks versions
+#CROSS_COMPILER_TARGET_ARCHS += V66-ppc603
+CROSS_COMPILER_TARGET_ARCHS += V66-ppc604
+#CROSS_COMPILER_TARGET_ARCHS += V63-ppc604
+# (No PVA because of old compiler)
+CROSS_COMPILER_TARGET_ARCHS += V62-ppc604
+
+# Raspberry Pi
+CROSS_COMPILER_TARGET_ARCHS += raspbian-arm
--- a/configure/os/CONFIG_SITE.linux-x86_64.Common
+++ b/configure/os/CONFIG_SITE.linux-x86_64.Common
@@ -1,9 +1,9 @@
-# CONFIG_SITE.linux-x86_64.Common
-#
-# Site override definitions for linux-x86_64 host builds
-#-------------------------------------------------------
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common

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

+# IOxOS IFC1211
+CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64
+
+# Zynq
+CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64
--- a/documentation/Doxyfile@
+++ b/documentation/Doxyfile@
@@ -107,7 +107,7 @@ BRIEF_MEMBER_DESC      = YES
 # brief descriptions will be completely suppressed.
 # The default value is: YES.

-REPEAT_BRIEF           = YES
+REPEAT_BRIEF           = NO

 # This tag implements a quasi-intelligent brief description abbreviator that is
 # used to form the text in various listings. Each string in this list, if found
@@ -143,7 +143,7 @@ ALWAYS_DETAILED_SEC    = NO
 # operators of the base classes will not be shown.
 # The default value is: NO.

-INLINE_INHERITED_MEMB  = NO
+INLINE_INHERITED_MEMB  = YES

 # If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
 # before files name in the file list and in the header files. If set to NO the
@@ -162,8 +162,8 @@ FULL_PATH_NAMES        = YES
 # will be relative from the directory where doxygen is started.
 # This tag requires that the tag FULL_PATH_NAMES is set to YES.

-STRIP_FROM_PATH        =  \
-                         ../
+STRIP_FROM_PATH        = @TOP@/include \
+                         ..

 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
 # path mentioned in the documentation of a class, which tells the reader which
@@ -172,7 +172,8 @@ STRIP_FROM_PATH        =  \
 # specify the list of include paths that are normally passed to the compiler
 # using the -I flag.

-STRIP_FROM_INC_PATH    = ../
+STRIP_FROM_INC_PATH    = @TOP@/include \
+                         ..

 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
 # less readable) file names. This can be useful is your file systems doesn't
@@ -227,7 +228,7 @@ SEPARATE_MEMBER_PAGES  = NO
 # uses this value to replace tabs by spaces in code fragments.
 # Minimum value: 1, maximum value: 16, default value: 4.

-TAB_SIZE               = 4
+TAB_SIZE               = 8

 # This tag can be used to specify a number of aliases that act as commands in
 # the documentation. An alias has the form:
@@ -241,12 +242,6 @@ TAB_SIZE               = 4

 ALIASES                = 

-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              = 
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -420,7 +415,7 @@ LOOKUP_CACHE_SIZE      = 0
 # normally produced when WARNINGS is set to YES.
 # The default value is: NO.

-EXTRACT_ALL            = YES
+EXTRACT_ALL            = NO

 # If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
 # be included in the documentation.
@@ -548,7 +543,7 @@ INLINE_INFO            = YES
 # name. If set to NO the members will appear in declaration order.
 # The default value is: YES.

-SORT_MEMBER_DOCS       = YES
+SORT_MEMBER_DOCS       = NO

 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
 # descriptions of file, namespace and class members alphabetically by member
@@ -767,7 +762,8 @@ WARN_LOGFILE           =
 INPUT                  = ../mainpage.dox \
                         ../RELEASE_NOTES.md \
                         ../README.md \
-                         ../RecordReference.md
+                         ../RecordReference.md \
+                         @TOP@/include

 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -787,48 +783,10 @@ INPUT_ENCODING         = UTF-8
 # *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
 # *.qsf, *.as and *.js.

-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.c++ \
-                         *.java \
-                         *.ii \
-                         *.ixx \
-                         *.ipp \
-                         *.i++ \
-                         *.inl \
-                         *.idl \
-                         *.ddl \
-                         *.odl \
-                         *.h \
-                         *.hh \
-                         *.hxx \
+FILE_PATTERNS          = *.h \
                         *.hpp \
-                         *.h++ \
-                         *.cs \
-                         *.d \
-                         *.php \
-                         *.php4 \
-                         *.php5 \
-                         *.phtml \
-                         *.inc \
-                         *.m \
-                         *.markdown \
                         *.md \
-                         *.mm \
-                         *.dox \
-                         *.py \
-                         *.f90 \
-                         *.f \
-                         *.for \
-                         *.tcl \
-                         *.vhd \
-                         *.vhdl \
-                         *.ucf \
-                         *.qsf \
-                         *.as \
-                         *.js
+                         *.dox

 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
@@ -843,7 +801,8 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.

-EXCLUDE                = 
+EXCLUDE                = @TOP@/include/pv \
+                         @TOP@/include/pva

 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -859,7 +818,7 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*

-EXCLUDE_PATTERNS       = O.*
+EXCLUDE_PATTERNS       = /O.*/

 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -2028,7 +1987,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-PREDEFINED             = 
+PREDEFINED             = __cplusplus

 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
@@ -2047,7 +2006,7 @@ EXPAND_AS_DEFINED      =
 # The default value is: YES.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-SKIP_FUNCTION_MACROS   = YES
+SKIP_FUNCTION_MACROS   = NO

 #---------------------------------------------------------------------------
 # Configuration options related to external references
@@ -2094,12 +2053,6 @@ EXTERNAL_GROUPS        = YES

 EXTERNAL_PAGES         = YES

-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
@@ -2113,15 +2066,6 @@ PERL_PATH              = /usr/bin/perl

 CLASS_DIAGRAMS         = YES

-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            = 
-
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 # DIA_PATH tag allows you to specify the directory where the dia binary resides.
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -1,22 +1,24 @@
 TOP = ..
 include $(TOP)/configure/CONFIG

-ifdef T_A
+ifeq ($(T_A),$(EPICS_HOST_ARCH))

 DOXYGEN=doxygen

-EXPAND = Doxyfile
+EXPAND = Doxyfile@

 EXPAND_ME += EPICS_VERSION
 EXPAND_ME += EPICS_REVISION
 EXPAND_ME += EPICS_MODIFICATION
 EXPAND_ME += EPICS_PATCH_LEVEL
+EXPAND_ME += OS_CLASS CMPLR_CLASS

 ME = documentation/O.$(T_A)/html
+GH_FILES = $(ME)/ $(ME)/.nojekyll $(ME)/*.* $(ME)/*/*.*

 install: doxygen

-doxygen: Doxyfile
+doxygen: Doxyfile ../mainpage.dox
 	$(DOXYGEN)
 	rsync -av $(TOP)/html/ html/

@@ -24,10 +26,10 @@ doxygen: Doxyfile

 commit: doxygen
 	$(TOUCH) html/.nojekyll
-	(cd $(TOP) && $(CURDIR)/../commit-gh.sh $(ME)/ $(ME)/.nojekyll $(ME)/*.* $(ME)/*/*.*)
+	(cd $(TOP) && $(CURDIR)/../commit-gh.sh $(GH_FILES))

 .PHONY: commit

-endif # T_A
+endif # EPICS_HOST_ARCH

 include $(TOP)/configure/RULES
--- a/documentation/RELEASE_NOTES.md
+++ b/documentation/RELEASE_NOTES.md
@@ -11,6 +11,20 @@ release.
 The PVA submodules each have their own individual sets of release notes which
 should also be read to understand what has changed since earlier releases.

+**This version of EPICS has not been released yet.**
+
+## Changes made on the 7.0 branch since 7.0.5
+
+<!-- Insert new items immediately below here ... -->
+
+### IOCsh sets `${PWD}`
+
+IOC shell will now ensure `${PWD}` is set on startup,
+and updated by the `cd` iocsh function.
+
+
+-----
+
 ## EPICS Release 7.0.5

 ### Fix aai's Device Support Initialization
@@ -448,7 +462,7 @@ work with older Base releases.

 This would also be a good time to modify the device support to use the type-safe
 device support entry tables that were introduced in Base-3.16.2 -- see
-[#type-safe-device-and-driver-support-tables](this entry below) for the
+[this entry below](#type-safe-device-and-driver-support-tables) for the
 description of that change, which is also optional for now.

 Look at the aiRecord for example. Near the top of the generated `aiRecord.h`
--- a/documentation/mainpage.dox
+++ b/documentation/mainpage.dox
@@ -3,7 +3,6 @@

 Documentation index

-@ul
@li @ref releasenotes
@li @ref install
@li @ref recordrefmanual
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -37,6 +37,9 @@ pva2pva_DEPEND_DIRS = pvAccess
 SUBMODULES += example
 example_DEPEND_DIRS = pva2pva pvaClient

+SUBMODULES += pcas
+pcas_DEPEND_DIRS = ca
+
 # Allow sites to add extra submodules
 -include Makefile.local

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

 API_HEADER = libCaAPI.h
 ca_API = libCa
--- a/modules/ca/src/client/templateInstances.cpp
+++ b/modules/ca/src/client/templateInstances.cpp
@@ -0,0 +1,66 @@
+/*************************************************************************\
+* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+*     National Laboratory.
+* Copyright (c) 2002 The Regents of the University of California, as
+*     Operator of Los Alamos National Laboratory.
+* EPICS BASE Versions 3.13.7
+* and higher are distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution. 
+\*************************************************************************/
+
+/*  
+ *
+ *                              
+ *                    L O S  A L A M O S
+ *              Los Alamos National Laboratory
+ *               Los Alamos, New Mexico 87545
+ *                                  
+ *  Copyright, 1986, The Regents of the University of California.
+ *                                  
+ *           
+ *	Author Jeffrey O. Hill
+ *	johill@lanl.gov
+ *	505 665 1831
+ */
+
+#include "cac.h"
+#include "oldAccess.h"
+#include "repeaterClient.h"
+
+template class chronIntIdResTable < nciu >;
+template class chronIntIdResTable < baseNMIU >;
+template class chronIntIdResTable < CASG >;
+template class resTable < nciu, chronIntId >;
+template class resTable < baseNMIU, chronIntId >;
+template class resTable < CASG, chronIntId >;
+template class resTable < bhe, inetAddrID >;
+template class resTable < tcpiiu, caServerID >;
+template class tsFreeList < bhe, 0x100 >;
+template class tsFreeList < tcpiiu, 32, epicsMutexNOOP >;
+template class tsFreeList < netReadNotifyIO, 1024, epicsMutexNOOP >;
+template class tsFreeList < netWriteNotifyIO, 1024, epicsMutexNOOP >;
+template class tsFreeList < netSubscription, 1024, epicsMutexNOOP >;
+template class tsFreeList < CASG, 128, epicsMutexNOOP  >;
+template class tsFreeList < syncGroupReadNotify, 128, epicsMutexNOOP >;
+template class tsFreeList < syncGroupWriteNotify, 128, epicsMutexNOOP >;
+template class tsFreeList < comBuf, 0x20 >;
+template class tsFreeList < getCallback, 1024, epicsMutexNOOP >;
+template class tsFreeList < getCopy, 1024, epicsMutexNOOP >;
+template class tsFreeList < msgForMultiplyDefinedPV, 16 >;
+template class tsFreeList < nciu, 1024, epicsMutexNOOP>;
+template class tsFreeList < oldChannelNotify, 1024, epicsMutexNOOP >;
+template class tsFreeList < oldSubscription, 1024, epicsMutexNOOP >;
+template class tsFreeList < putCallback, 1024, epicsMutexNOOP >;
+template class tsFreeList < repeaterClient, 0x20 >;
+template class epicsSingleton < localHostName >;
+template unsigned comBuf :: push ( const double * pValue, unsigned nElem );
+template unsigned comBuf :: push ( const float * pValue, unsigned nElem );
+template unsigned comBuf :: push ( const int * pValue, unsigned nElem );
+template unsigned comBuf :: push ( const short * pValue, unsigned nElem );
+template comBuf :: popStatus comBuf :: pop ( unsigned int & returnVal );
+template comBuf :: popStatus comBuf :: pop ( unsigned short & returnVal );
+template comBuf :: popStatus comBuf :: pop ( unsigned char & returnVal );
+template void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO
+    (epicsGuard < epicsMutex > &, syncGroupWriteNotify & );
+template void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO
+    ( epicsGuard < epicsMutex > &, syncGroupReadNotify & );
--- a/modules/ca/src/perl/Makefile
+++ b/modules/ca/src/perl/Makefile
@@ -38,6 +38,7 @@ ifeq ($(wildcard $(PERL_h)),)
 endif
 endif

+ifneq (inc,$(strip $(MAKECMDGOALS)))
 ifeq ($(T_A),$(EPICS_HOST_ARCH))                 # No cross-builds (wrong Perl!)
 ifeq ($(strip $(XSUBPP)),)
  $(warning Perl's xsubpp program was not found.)
@@ -62,6 +63,7 @@ endif
 endif
 endif
 endif
+endif

 Cap5_SRCS = Cap5.xs
 Cap5_LIBS = ca Com
--- a/modules/database/src/ioc/as/asCa.c
+++ b/modules/database/src/ioc/as/asCa.c
@@ -33,7 +33,6 @@
 #include "caerr.h"
 #include "caeventmask.h"

-#define epicsExportSharedSymbols
 #include "asCa.h"
 #include "asDbLib.h"
 #include "callback.h"
--- a/modules/database/src/ioc/as/asCa.h
+++ b/modules/database/src/ioc/as/asCa.h
@@ -14,17 +14,17 @@

 #include <stdio.h>

-#include "shareLib.h"
+#include "dbCoreAPI.h"

 #ifdef __cplusplus
 extern "C" {
 #endif

-epicsShareFunc void asCaStart(void);
-epicsShareFunc void asCaStop(void);
-epicsShareFunc int ascar(int level);
-epicsShareFunc int ascarFP(FILE *fp, int level);
-epicsShareFunc void ascaStats(int *pchans, int *pdiscon);
+DBCORE_API void asCaStart(void);
+DBCORE_API void asCaStop(void);
+DBCORE_API int ascar(int level);
+DBCORE_API int ascarFP(FILE *fp, int level);
+DBCORE_API void ascaStats(int *pchans, int *pdiscon);

 #ifdef __cplusplus
 }
--- a/modules/database/src/ioc/as/asDbLib.c
+++ b/modules/database/src/ioc/as/asDbLib.c
@@ -25,7 +25,6 @@

 #include "caeventmask.h"

-#define epicsExportSharedSymbols
 #include "asCa.h"
 #include "asDbLib.h"
 #include "callback.h"
--- a/modules/database/src/ioc/as/asDbLib.h
+++ b/modules/database/src/ioc/as/asDbLib.h
@@ -15,7 +15,7 @@
 #include <stdio.h>

 #include "callback.h"
-#include "shareLib.h"
+#include "dbCoreAPI.h"

 typedef struct {
    epicsCallback   callback;
@@ -28,25 +28,25 @@ struct dbChannel;
 extern "C" {
 #endif

-epicsShareFunc int asSetFilename(const char *acf);
-epicsShareFunc int asSetSubstitutions(const char *substitutions);
-epicsShareFunc int asInit(void);
-epicsShareFunc int asInitAsyn(ASDBCALLBACK *pcallback);
-epicsShareFunc int asShutdown(void);
-epicsShareFunc int asDbGetAsl(struct dbChannel *chan);
-epicsShareFunc void * asDbGetMemberPvt(struct dbChannel *chan);
-epicsShareFunc int asdbdump(void);
-epicsShareFunc int asdbdumpFP(FILE *fp);
-epicsShareFunc int aspuag(const char *uagname);
-epicsShareFunc int aspuagFP(FILE *fp,const char *uagname);
-epicsShareFunc int asphag(const char *hagname);
-epicsShareFunc int asphagFP(FILE *fp,const char *hagname);
-epicsShareFunc int asprules(const char *asgname);
-epicsShareFunc int asprulesFP(FILE *fp,const char *asgname);
-epicsShareFunc int aspmem(const char *asgname,int clients);
-epicsShareFunc int aspmemFP(
+DBCORE_API int asSetFilename(const char *acf);
+DBCORE_API int asSetSubstitutions(const char *substitutions);
+DBCORE_API int asInit(void);
+DBCORE_API int asInitAsyn(ASDBCALLBACK *pcallback);
+DBCORE_API int asShutdown(void);
+DBCORE_API int asDbGetAsl(struct dbChannel *chan);
+DBCORE_API void * asDbGetMemberPvt(struct dbChannel *chan);
+DBCORE_API int asdbdump(void);
+DBCORE_API int asdbdumpFP(FILE *fp);
+DBCORE_API int aspuag(const char *uagname);
+DBCORE_API int aspuagFP(FILE *fp,const char *uagname);
+DBCORE_API int asphag(const char *hagname);
+DBCORE_API int asphagFP(FILE *fp,const char *hagname);
+DBCORE_API int asprules(const char *asgname);
+DBCORE_API int asprulesFP(FILE *fp,const char *asgname);
+DBCORE_API int aspmem(const char *asgname,int clients);
+DBCORE_API int aspmemFP(
    FILE *fp,const char *asgname,int clients);
-epicsShareFunc int astac(
+DBCORE_API int astac(
    const char *recordname,const char *user,const char *location);

 #ifdef __cplusplus
--- a/modules/database/src/ioc/as/asIocRegister.c
+++ b/modules/database/src/ioc/as/asIocRegister.c
@@ -11,7 +11,6 @@
 #include "asLib.h"
 #include "iocsh.h"

-#define epicsExportSharedSymbols
 #include "asCa.h"
 #include "asDbLib.h"
 #include "asIocRegister.h"
@@ -120,7 +119,9 @@ static void ascarCallFunc(const iocshArgBuf *args)
 }

 /* asDumpHash */
-static const iocshFuncDef asDumpHashFuncDef = {"asDumpHash",0,0};
+static const iocshFuncDef asDumpHashFuncDef = {"asDumpHash",0,0,
+                                               "Show the contents of the hash table used "
+                                               "to locate UAGs and HAGs.\n"};
 static void asDumpHashCallFunc(const iocshArgBuf *args)
 {
    asDumpHash();
--- a/modules/database/src/ioc/as/asIocRegister.h
+++ b/modules/database/src/ioc/as/asIocRegister.h
@@ -11,13 +11,13 @@
 #ifndef INC_asIocRegister_H
 #define INC_asIocRegister_H

-#include "shareLib.h"
+#include "dbCoreAPI.h"

 #ifdef __cplusplus
 extern "C" {
 #endif

-epicsShareFunc void asIocRegister(void);
+DBCORE_API void asIocRegister(void);

 #ifdef __cplusplus
 }
--- a/modules/database/src/ioc/bpt/Makefile
+++ b/modules/database/src/ioc/bpt/Makefile
@@ -19,7 +19,10 @@ BPT_DBD += bptTypeJdegC.dbd
 BPT_DBD += bptTypeJdegF.dbd
 BPT_DBD += bptTypeKdegC.dbd
 BPT_DBD += bptTypeKdegF.dbd
+
+ifneq (inc,$(strip $(MAKECMDGOALS)))
 DBD += $(BPT_DBD)
+endif

 PROD_HOST += makeBpt

--- a/modules/database/src/ioc/bpt/cvtTable.h
+++ b/modules/database/src/ioc/bpt/cvtTable.h
@@ -17,17 +17,17 @@
 #ifndef INCcvtTableh
 #define INCcvtTableh    1

-#include "shareLib.h"
+#include "dbCoreAPI.h"

 #ifdef __cplusplus
 extern "C" {
 #endif

 /* Global Routines*/
-epicsShareFunc long cvtEngToRawBpt(
+DBCORE_API long cvtEngToRawBpt(
    double *pval,short linr,short init,void **ppbrk,short *plbrk);

-epicsShareFunc long cvtRawToEngBpt(
+DBCORE_API long cvtRawToEngBpt(
    double *pval,short linr,short init,void **ppbrk, short *plbrk);

 #ifdef __cplusplus
--- a/modules/database/src/ioc/db/Makefile
+++ b/modules/database/src/ioc/db/Makefile
@@ -42,6 +42,7 @@ INC += dbState.h
 INC += db_access_routines.h
 INC += db_convert.h
 INC += dbUnitTest.h
+INC += dbCaPvt.h

 # Generate menuGlobal.dbd, not really by concatenation, see RULES
 DBDCAT += menuGlobal.dbd
@@ -99,3 +100,4 @@ dbCore_SRCS += chfPlugin.c
 dbCore_SRCS += dbState.c
 dbCore_SRCS += dbUnitTest.c
 dbCore_SRCS += dbServer.c
+dbCore_SRCS_vxWorks += templateInstances.cpp
--- a/modules/database/src/ioc/db/callback.c
+++ b/modules/database/src/ioc/db/callback.c
@@ -34,7 +34,6 @@
 #include "errMdef.h"
 #include "taskwd.h"

-#define epicsExportSharedSymbols
 #include "callback.h"
 #include "dbAccessDefs.h"
 #include "dbAddr.h"
--- a/modules/database/src/ioc/db/callback.h
+++ b/modules/database/src/ioc/db/callback.h
@@ -18,7 +18,7 @@
 #ifndef INCcallbackh
 #define INCcallbackh 1

-#include "shareLib.h"
+#include "dbCoreAPI.h"

 #ifdef __cplusplus
 extern "C" {
@@ -69,23 +69,23 @@ typedef struct callbackQueueStats {
 #define callbackGetUser(USER, PCALLBACK) \
    ( (USER) = (PCALLBACK)->user )

-epicsShareFunc void callbackInit(void);
-epicsShareFunc void callbackStop(void);
-epicsShareFunc void callbackCleanup(void);
-epicsShareFunc int callbackRequest(epicsCallback *pCallback);
-epicsShareFunc void callbackSetProcess(
+DBCORE_API void callbackInit(void);
+DBCORE_API void callbackStop(void);
+DBCORE_API void callbackCleanup(void);
+DBCORE_API int callbackRequest(epicsCallback *pCallback);
+DBCORE_API void callbackSetProcess(
    epicsCallback *pcallback, int Priority, void *pRec);
-epicsShareFunc int callbackRequestProcessCallback(
+DBCORE_API int callbackRequestProcessCallback(
    epicsCallback *pCallback,int Priority, void *pRec);
-epicsShareFunc void callbackRequestDelayed(
+DBCORE_API void callbackRequestDelayed(
    epicsCallback *pCallback,double seconds);
-epicsShareFunc void callbackCancelDelayed(epicsCallback *pcallback);
-epicsShareFunc void callbackRequestProcessCallbackDelayed(
+DBCORE_API void callbackCancelDelayed(epicsCallback *pcallback);
+DBCORE_API void callbackRequestProcessCallbackDelayed(
    epicsCallback *pCallback, int Priority, void *pRec, double seconds);
-epicsShareFunc int callbackSetQueueSize(int size);
-epicsShareFunc int callbackQueueStatus(const int reset, callbackQueueStats *result);
-epicsShareFunc void callbackQueueShow(const int reset);
-epicsShareFunc int callbackParallelThreads(int count, const char *prio);
+DBCORE_API int callbackSetQueueSize(int size);
+DBCORE_API int callbackQueueStatus(const int reset, callbackQueueStats *result);
+DBCORE_API void callbackQueueShow(const int reset);
+DBCORE_API int callbackParallelThreads(int count, const char *prio);

 #ifdef __cplusplus
 }
--- a/modules/database/src/ioc/db/chfPlugin.c
+++ b/modules/database/src/ioc/db/chfPlugin.c
@@ -27,7 +27,6 @@
 #include "epicsTypes.h"
 #include "errlog.h"

-#define epicsExportSharedSymbols
 #include "chfPlugin.h"
 #include "dbStaticLib.h"

--- a/modules/database/src/ioc/db/chfPlugin.h
+++ b/modules/database/src/ioc/db/chfPlugin.h
@@ -17,7 +17,7 @@
 #ifndef CHFPLUGIN_H
 #define CHFPLUGIN_H

-#include <shareLib.h>
+#include <dbCoreAPI.h>
 #include <dbDefs.h>
 #include <epicsTypes.h>
 #include <dbChannel.h>
@@ -302,7 +302,7 @@ typedef struct chfPluginArgDef {
 * @param def String to be returned when 'i' isn't a valid Enum index.
 * @return The string associated with 'i'.
 */
-epicsShareFunc const char* chfPluginEnumString(const chfPluginEnumType *Enums, int i, const char* def);
+DBCORE_API const char* chfPluginEnumString(const chfPluginEnumType *Enums, int i, const char* def);

 /** @brief Register a plugin.
 *
@@ -310,7 +310,7 @@ epicsShareFunc const char* chfPluginEnumString(const chfPluginEnumType *Enums, i
 * @param pif Pointer to the plugin's interface.
 * @param opts Pointer to the configuration argument description table.
 */
-epicsShareFunc int chfPluginRegister(const char* key, const chfPluginIf *pif, const chfPluginArgDef* opts);
+DBCORE_API int chfPluginRegister(const char* key, const chfPluginIf *pif, const chfPluginArgDef* opts);

 #ifdef __cplusplus
 }
--- a/modules/database/src/ioc/db/cvtBpt.c
+++ b/modules/database/src/ioc/db/cvtBpt.c
@@ -17,7 +17,6 @@

 #include "epicsPrint.h"

-#define epicsExportSharedSymbols
 #include "cvtTable.h"
 #include "dbAccess.h"
 #include "dbBase.h"
--- a/modules/database/src/ioc/db/dbAccess.c
+++ b/modules/database/src/ioc/db/dbAccess.c
@@ -35,7 +35,6 @@
 #include "errlog.h"
 #include "errMdef.h"

-#include "epicsExport.h" /* #define epicsExportSharedSymbols */
 #include "caeventmask.h"
 #include "callback.h"
 #include "dbAccessDefs.h"
@@ -62,6 +61,7 @@
 #include "recGbl.h"
 #include "recSup.h"
 #include "special.h"
+#include "epicsExport.h"

 struct dbBase *pdbbase = 0;
 volatile int interruptAccept=FALSE;
@@ -339,7 +339,7 @@ static void getOptions(DBADDR *paddr, char **poriginal, long *options,
        dbCommon        *pcommon;
        char            *pbuffer = *poriginal;

-        if (!pfl || pfl->type == dbfl_type_rec)
+        if (!pfl)
            field_type = paddr->field_type;
        else
            field_type = pfl->field_type;
@@ -349,7 +349,7 @@ static void getOptions(DBADDR *paddr, char **poriginal, long *options,
        if( (*options) & DBR_STATUS ) {
            unsigned short *pushort = (unsigned short *)pbuffer;

-            if (!pfl || pfl->type == dbfl_type_rec) {
+            if (!pfl) {
                *pushort++ = pcommon->stat;
                *pushort++ = pcommon->sevr;
            } else {
@@ -383,7 +383,7 @@ static void getOptions(DBADDR *paddr, char **poriginal, long *options,
        if( (*options) & DBR_TIME ) {
            epicsUInt32 *ptime = (epicsUInt32 *)pbuffer;

-            if (!pfl || pfl->type == dbfl_type_rec) {
+            if (!pfl) {
                *ptime++ = pcommon->time.secPastEpoch;
                *ptime++ = pcommon->time.nsec;
            } else {
@@ -904,22 +904,23 @@ long dbGet(DBADDR *paddr, short dbrType,
    if (nRequest && *nRequest == 0)
        return 0;

-    if (!pfl || pfl->type == dbfl_type_rec) {
+    if (!pfl) {
        field_type = paddr->field_type;
        no_elements = capacity = paddr->no_elements;
-
-        /* Update field info from record
-         * may modify paddr->pfield
-         */
-        if (paddr->pfldDes->special == SPC_DBADDR &&
-            (prset = dbGetRset(paddr)) &&
-            prset->get_array_info) {
-            status = prset->get_array_info(paddr, &no_elements, &offset);
-        } else
-            offset = 0;
    } else {
        field_type = pfl->field_type;
        no_elements = capacity = pfl->no_elements;
+    }
+
+    /* Update field info from record (if neccessary);
+     * may modify paddr->pfield.
+     */
+    if (!dbfl_has_copy(pfl) &&
+        paddr->pfldDes->special == SPC_DBADDR &&
+        (prset = dbGetRset(paddr)) &&
+        prset->get_array_info) {
+        status = prset->get_array_info(paddr, &no_elements, &offset);
+    } else {
        offset = 0;
    }

@@ -951,7 +952,7 @@ long dbGet(DBADDR *paddr, short dbrType,
            goto done;
        }

-        if (!pfl || pfl->type == dbfl_type_rec) {
+        if (!dbfl_has_copy(pfl)) {
            status = dbFastGetConvertRoutine[field_type][dbrType]
                (paddr->pfield, pbuf, paddr);
        } else {
@@ -964,11 +965,9 @@ long dbGet(DBADDR *paddr, short dbrType,

            localAddr.field_type = pfl->field_type;
            localAddr.field_size = pfl->field_size;
+            /* not used by dbFastConvert: */
            localAddr.no_elements = pfl->no_elements;
-            if (pfl->type == dbfl_type_val)
-                localAddr.pfield = (char *) &pfl->u.v.field;
-            else
-                localAddr.pfield = (char *)  pfl->u.r.field;
+            localAddr.pfield = dbfl_pfield(pfl);
            status = dbFastGetConvertRoutine[field_type][dbrType]
                (localAddr.pfield, pbuf, &localAddr);
        }
@@ -979,6 +978,8 @@ long dbGet(DBADDR *paddr, short dbrType,
        if (nRequest) {
            if (no_elements < *nRequest)
                *nRequest = no_elements;
+            if (capacity < *nRequest)
+                *nRequest = capacity;
            n = *nRequest;
        } else {
            n = 1;
@@ -995,8 +996,8 @@ long dbGet(DBADDR *paddr, short dbrType,
        }
        /* convert data into the caller's buffer */
        if (n <= 0) {
-            ;/*do nothing*/
-        } else if (!pfl || pfl->type == dbfl_type_rec) {
+            ;                           /*do nothing */
+        } else if (!dbfl_has_copy(pfl)) {
            status = convert(paddr, pbuf, n, capacity, offset);
        } else {
            DBADDR localAddr = *paddr; /* Structure copy */
@@ -1008,11 +1009,9 @@ long dbGet(DBADDR *paddr, short dbrType,

            localAddr.field_type = pfl->field_type;
            localAddr.field_size = pfl->field_size;
+            /* not used by dbConvert, it uses the passed capacity instead: */
            localAddr.no_elements = pfl->no_elements;
-            if (pfl->type == dbfl_type_val)
-                localAddr.pfield = (char *) &pfl->u.v.field;
-            else
-                localAddr.pfield = (char *)  pfl->u.r.field;
+            localAddr.pfield = dbfl_pfield(pfl);
            status = convert(&localAddr, pbuf, n, capacity, offset);
        }

--- a/modules/database/src/ioc/db/dbAccess.h
+++ b/modules/database/src/ioc/db/dbAccess.h
@@ -18,7 +18,7 @@
 #include "dbFldTypes.h"
 #include "link.h"
 #include "dbBase.h"
-#include "shareLib.h"
+#include "dbCoreAPI.h"
 #include "dbAddr.h"
 #include "dbLock.h"
 #include "dbAccessDefs.h"
--- a/modules/database/src/ioc/db/dbAccessDefs.h
+++ b/modules/database/src/ioc/db/dbAccessDefs.h
@@ -12,18 +12,10 @@
 #ifndef INCdbAccessDefsh
 #define INCdbAccessDefsh

-#ifdef epicsExportSharedSymbols
-#   define INCLdb_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsTypes.h"
 #include "epicsTime.h"

-#ifdef INCLdb_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "dbCoreAPI.h"

 #include "dbBase.h"
 #include "dbAddr.h"
@@ -34,9 +26,9 @@ extern "C" {
 #endif


-epicsShareExtern struct dbBase *pdbbase;
-epicsShareExtern volatile int interruptAccept;
-epicsShareExtern int dbAccessDebugPUTF;
+DBCORE_API extern struct dbBase *pdbbase;
+DBCORE_API extern volatile int interruptAccept;
+DBCORE_API extern int dbAccessDebugPUTF;

 /*  The database field and request types are defined in dbFldTypes.h*/
 /* Data Base Request Options    */
@@ -207,67 +199,67 @@ struct dbr_alDouble     {DBRalDouble};

 struct dbEntry;

-epicsShareFunc long dbPutSpecial(struct dbAddr *paddr,int pass);
-epicsShareFunc rset * dbGetRset(const struct dbAddr *paddr);
-epicsShareFunc long dbPutAttribute(
+DBCORE_API long dbPutSpecial(struct dbAddr *paddr,int pass);
+DBCORE_API rset * dbGetRset(const struct dbAddr *paddr);
+DBCORE_API long dbPutAttribute(
    const char *recordTypename,const char *name,const char*value);
-epicsShareFunc int dbIsValueField(const struct dbFldDes *pdbFldDes);
-epicsShareFunc int dbGetFieldIndex(const struct dbAddr *paddr);
-epicsShareFunc long dbScanPassive(
+DBCORE_API int dbIsValueField(const struct dbFldDes *pdbFldDes);
+DBCORE_API int dbGetFieldIndex(const struct dbAddr *paddr);
+DBCORE_API long dbScanPassive(
    struct dbCommon *pfrom,struct dbCommon *pto);
-epicsShareFunc long dbProcess(struct dbCommon *precord);
-epicsShareFunc long dbNameToAddr(const char *pname, struct dbAddr *paddr);
+DBCORE_API long dbProcess(struct dbCommon *precord);
+DBCORE_API long dbNameToAddr(const char *pname, struct dbAddr *paddr);

 /** Initialize DBADDR from a dbEntry
 * Also handles SPC_DBADDR processing. This is really an internal
 * routine for use by dbNameToAddr() and dbChannelCreate().
 */
-epicsShareFunc long dbEntryToAddr(const struct dbEntry *pdbentry,
+DBCORE_API long dbEntryToAddr(const struct dbEntry *pdbentry,
    struct dbAddr *paddr);

 /** Initialize DBENTRY from a valid dbAddr*
 * Constant time equivalent of dbInitEntry() then dbFindRecord(),
 * and finally dbFollowAlias().
 */
-epicsShareFunc void dbInitEntryFromAddr(struct dbAddr *paddr,
+DBCORE_API void dbInitEntryFromAddr(struct dbAddr *paddr,
    struct dbEntry *pdbentry);

 /** Initialize DBENTRY from a valid record (dbCommon*)
 * Constant time equivalent of dbInitEntry() then dbFindRecord(),
 * and finally dbFollowAlias() when no field is specified.
 */
-epicsShareFunc void dbInitEntryFromRecord(struct dbCommon *prec,
+DBCORE_API void dbInitEntryFromRecord(struct dbCommon *prec,
    struct dbEntry *pdbentry);

-epicsShareFunc devSup* dbDTYPtoDevSup(dbRecordType *prdes, int dtyp);
-epicsShareFunc devSup* dbDSETtoDevSup(dbRecordType *prdes, dset *pdset);
-epicsShareFunc long dbGetField(
+DBCORE_API devSup* dbDTYPtoDevSup(dbRecordType *prdes, int dtyp);
+DBCORE_API devSup* dbDSETtoDevSup(dbRecordType *prdes, dset *pdset);
+DBCORE_API long dbGetField(
    struct dbAddr *,short dbrType,void *pbuffer,long *options,
    long *nRequest,void *pfl);
-epicsShareFunc long dbGet(
+DBCORE_API long dbGet(
    struct dbAddr *,short dbrType,void *pbuffer,long *options,
    long *nRequest,void *pfl);
-epicsShareFunc long dbPutField(
+DBCORE_API long dbPutField(
    struct dbAddr *,short dbrType,const void *pbuffer,long nRequest);
-epicsShareFunc long dbPut(
+DBCORE_API long dbPut(
    struct dbAddr *,short dbrType,const void *pbuffer,long nRequest);

 typedef void(*SPC_ASCALLBACK)(struct dbCommon *);
 /*dbSpcAsRegisterCallback called by access security */
-epicsShareFunc void dbSpcAsRegisterCallback(SPC_ASCALLBACK func);
-epicsShareFunc long dbBufferSize(
+DBCORE_API void dbSpcAsRegisterCallback(SPC_ASCALLBACK func);
+DBCORE_API long dbBufferSize(
    short dbrType,long options,long nRequest);
-epicsShareFunc long dbValueSize(short dbrType);
+DBCORE_API long dbValueSize(short dbrType);

 /* Hook Routine */

 typedef void (*DB_LOAD_RECORDS_HOOK_ROUTINE)(const char* filename,
    const char* substitutions);
-epicsShareExtern DB_LOAD_RECORDS_HOOK_ROUTINE dbLoadRecordsHook;
+DBCORE_API extern DB_LOAD_RECORDS_HOOK_ROUTINE dbLoadRecordsHook;

-epicsShareFunc int  dbLoadDatabase(
+DBCORE_API int  dbLoadDatabase(
    const char *filename, const char *path, const char *substitutions);
-epicsShareFunc int dbLoadRecords(
+DBCORE_API int dbLoadRecords(
    const char* filename, const char* substitutions);

 #ifdef __cplusplus
--- a/modules/database/src/ioc/db/dbBkpt.c
+++ b/modules/database/src/ioc/db/dbBkpt.c
@@ -53,7 +53,6 @@
 #include "errlog.h"
 #include "errMdef.h"

-#define epicsExportSharedSymbols
 #include "dbAccessDefs.h"
 #include "dbAddr.h"
 #include "dbBase.h"
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`include $(CONFIG)/os/CONFIG.Common.linux-clang`
				`@@ -0,0 +1 @@`
				`include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common`