add raspberryPi and skip unused vxWorks archs

using <namespace::function>; seems not to work but
using namespace <namespace>; works
Also 'add' only works with explicit namespace. Why?

.ci/travis-build.sh

@@ -6,9 +6,18 @@ die() {
   exit 1
 }
 
+ticker() {
+  while true
+  do
+    sleep 60
+    date -R
+    [ -r "$1" ] && tail -n10 "$1"
+  done
+}
+
 CACHEKEY=1
 
-export EPICS_HOST_ARCH=`perl src/tools/EpicsHostArch.pl`
+EPICS_HOST_ARCH=`sh startup/EpicsHostArch`
 
 [ -e configure/os/CONFIG_SITE.Common.linux-x86 ] || die "Wrong location: $PWD"
 
@@ -48,24 +57,28 @@ EOF
 fi
 
 # set RTEMS to eg. "4.9" or "4.10"
+# requires qemu, bison, flex, texinfo, install-info
 if [ -n "$RTEMS" ]
 then
   echo "Cross RTEMS${RTEMS} for pc386"
-  curl -L "https://github.com/mdavidsaver/rsb/releases/download/20171203-${RTEMS}/i386-rtems${RTEMS}-trusty-20171203-${RTEMS}.tar.bz2" \
-  | tar -C / -xmj
+  install -d /home/travis/.cache
+  curl -L "https://github.com/mdavidsaver/rsb/releases/download/travis-20160306-2/rtems${RTEMS}-i386-trusty-20190306-2.tar.gz" \
+  | tar -C /home/travis/.cache -xj
 
   sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' configure/os/CONFIG_SITE.Common.RTEMS
   cat << EOF >> configure/os/CONFIG_SITE.Common.RTEMS
 RTEMS_VERSION=$RTEMS
-RTEMS_BASE=$HOME/.rtems
+RTEMS_BASE=/home/travis/.cache/rtems${RTEMS}-i386
 EOF
   cat << EOF >> configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386-qemu
+CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
 EOF
 
   # find local qemu-system-i386
+  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
   echo -n "Using QEMU: "
   type qemu-system-i386 || echo "Missing qemu"
+  EXTRA=RTEMS_QEMU_FIXUPS=YES
 fi
 
 make -j2 $EXTRA
@@ -73,5 +86,5 @@ make -j2 $EXTRA
 if [ "$TEST" != "NO" ]
 then
    make -j2 tapfiles
-   make -j2 -s test-results
+   make -s test-results
 fi

.ci/travis-prepare.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+set -e -x
+
+die() {
+  echo "$1" >&2
+  exit 1
+}
+
+CURDIR="$PWD"
+
+QDIR="$HOME/.cache/qemu"
+
+if [ -n "$RTEMS" -a "$TEST" = "YES" ]
+then
+  git clone --quiet --branch vme --depth 10 https://github.com/mdavidsaver/qemu.git "$HOME/.build/qemu"
+  cd "$HOME/.build/qemu"
+
+  HEAD=`git log -n1 --pretty=format:%H`
+  echo "HEAD revision $HEAD"
+
+  [ -e "$HOME/.cache/qemu/built" ] && BUILT=`cat "$HOME/.cache/qemu/built"`
+  echo "Cached revision $BUILT"
+
+  if [ "$HEAD" != "$BUILT" ]
+  then
+    echo "Building QEMU"
+    git submodule --quiet update --init
+
+    install -d "$HOME/.build/qemu/build"
+    cd         "$HOME/.build/qemu/build"
+
+    "$HOME/.build/qemu/configure" --prefix="$HOME/.cache/qemu/usr" --target-list=i386-softmmu --disable-werror
+    make -j2
+    make install
+
+    echo "$HEAD" > "$HOME/.cache/qemu/built"
+  fi
+fi
+
+cd "$CURDIR"
+
+cat <<EOF >> configure/CONFIG_SITE
+USR_CPPFLAGS += $USR_CPPFLAGS
+USR_CFLAGS += $USR_CFLAGS
+USR_CXXFLAGS += $USR_CXXFLAGS
+EOF

.travis.yml

@@ -11,17 +11,23 @@ addons:
     - perl
     - clang
     - g++-mingw-w64-i686
-    - qemu-system-x86
+    - bison
+    - flex
+    - texinfo
+    - install-info
+cache:
+  directories:
+   - $HOME/.cache
+install:
+ - ./.ci/travis-prepare.sh
 script:
-  - .ci/travis-build.sh
+ - ./.ci/travis-build.sh
 env:
-  - CMPLR=gcc
-  - CMPLR=clang
-  - CMPLR=gcc   STATIC=YES
-  - CMPLR=clang STATIC=YES
-  - CMPLR=gcc   EXTRA=CMD_CXXFLAGS=-std=c++11
-  - CMPLR=clang EXTRA=CMD_CXXFLAGS=-std=c++11
-  - WINE=32 TEST=NO STATIC=YES
-  - WINE=32 TEST=NO STATIC=NO
-  - RTEMS=4.10 TEST=YES
-  - RTEMS=4.9  TEST=YES
+ - BRCORE=master BRLIBCOM=master BRCA=master
+ - CMPLR=clang
+ - USR_CXXFLAGS=-std=c++11
+ - CMPLR=clang USR_CXXFLAGS=-std=c++11
+ - WINE=32 TEST=NO STATIC=YES
+ - WINE=32 TEST=NO STATIC=NO
+ - RTEMS=4.10 TEST=NO
+ - RTEMS=4.9 TEST=NO

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

@@ -20,14 +20,11 @@ else
 endif
 
 # Provide a default if the user hasn't set EPICS_HOST_ARCH
-#
-ifeq ($(origin EPICS_HOST_ARCH), undefined)
-  # Bootstrapping ...
-  EHA := $(firstword $(wildcard $(EPICS_BASE)/lib/perl/EpicsHostArch.pl \
-        $(TOP)/src/tools/EpicsHostArch.pl))
-  # NB: We use a simply expanded variable here for performance:
-  export EPICS_HOST_ARCH := $(shell perl $(EHA))
-  EHA :=
+ifeq ($(strip $(EPICS_HOST_ARCH)),)
+  # NB: We must set the environment variable for submodules to include
+  # the correct modules/RELEASE.<host>.local file to set EPICS_BASE,
+  # they can't do this for themselves since CONFIG is relative to it:
+  export EPICS_HOST_ARCH := $(shell $(CONFIG)/../startup/EpicsHostArch.pl)
 endif
 
 -include $(CONFIG)/RELEASE

configure/CONFIG_BASE

@@ -42,7 +42,7 @@ PODTOHTML        = $(PERL) $(TOOLS)/podToHtml.pl
 CONVERTRELEASE   = $(PERL) $(call FIND_TOOL,convertRelease.pl)
 FULLPATHNAME     = $(PERL) $(TOOLS)/fullPathName.pl
 TAPTOJUNIT       = $(PERL) $(TOOLS)/tap-to-junit-xml.pl
-GENVERSIONHEADER = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG) $(QUESTION_FLAG)
+GENVERSIONHEADER = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG)
 
 #---------------------------------------------------------------
 # tools for installing libraries and products

configure/CONFIG_BASE_VERSION

@@ -15,26 +15,17 @@
 # EPICS_SITE_VERSION is defined in CONFIG_SITE for sites that want a local
 # version number to be included in the reported version string.
 
-# We define convenience macros for our release series to be NO or YES, so
-# Makefiles can detect 'Series X or later', or 'Series X only' like this:
-#
+# We define BASE_3_14 and BASE_3_15 as NO and BASE_3_16 as YES, so
 #   ifdef BASE_3_14
 #       true for 3.14 or later
 #   ifdef BASE_3_15
 #       true for 3.15 or later
-#   ifdef BASE_3_16
-#       true for 3.16 or later
-#   ifdef BASE_7_0
-#       true for 7.0 or later
-#
 #   ifeq ($(BASE_3_14),YES)
 #       true for 3.14.x only
 #   ifeq ($(BASE_3_15),YES)
-#       true for 3.15.x only
+#       true for 3.15 only
 #   ifeq ($(BASE_3_16),YES)
-#       true for 3.16.x only.
-#   ifeq ($(BASE_7_0),YES)
-#       true for 7.0.x only.
+#       true for 3.16 only.
 
 BASE_3_14 = NO
 BASE_3_15 = NO
@@ -48,19 +39,19 @@ EPICS_VERSION = 7
 EPICS_REVISION = 0
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 2
+EPICS_MODIFICATION = 1
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included if zero
-EPICS_PATCH_LEVEL = 0
+EPICS_PATCH_LEVEL = 2
 
 # This will end in -DEV between official releases
-#EPICS_DEV_SNAPSHOT=-DEV
+EPICS_DEV_SNAPSHOT=-DEV
 #EPICS_DEV_SNAPSHOT=-pre1
 #EPICS_DEV_SNAPSHOT=-pre1-DEV
 #EPICS_DEV_SNAPSHOT=-pre2
 #EPICS_DEV_SNAPSHOT=-pre2-DEV
-EPICS_DEV_SNAPSHOT=-rc1
+#EPICS_DEV_SNAPSHOT=-rc1
 #EPICS_DEV_SNAPSHOT=-rc1-DEV
 #EPICS_DEV_SNAPSHOT=-rc2
 #EPICS_DEV_SNAPSHOT=-rc2-DEV

configure/CONFIG_COMMON

@@ -80,7 +80,6 @@ IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
 NOP = :
 ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
 QUIET_FLAG := $(if $(findstring s,$(MAKEFLAGS)),-q,)
-QUESTION_FLAG := $(if $(findstring q,$(MAKEFLAGS)),-i,)
 
 #-------------------------------------------------------
 ifdef T_A

configure/CONFIG_SITE

@@ -161,7 +161,7 @@ USE_POSIX_THREAD_PRIORITY_SCHEDULING = YES
 
 # Site version number, if set will append '-' and this string to the
 #  EPICS version number string that is reported by many tools.
-EPICS_SITE_VERSION =
+EPICS_SITE_VERSION:=$(shell date +%Y-%m)
 
 # For GNU compiler, use pipes rather than temporary files for
 #  communication between the various stages of compilation.

configure/RULES

@@ -1,10 +1,11 @@
 #*************************************************************************
-# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
+# 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 is distributed subject to a Software License Agreement found
-# in the file LICENSE that is included with this distribution.
+# 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. 
 #*************************************************************************
 
 ifndef T_A

configure/RULES.Db

@@ -4,10 +4,9 @@
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
-# in the file LICENSE that is included with this distribution.
+# in file LICENSE that is included with this distribution. 
 #*************************************************************************
-
-# RULES.Db
+#RULES.Db
 
 # Set db substitutions and template file suffixes
 SUBST_SUFFIX ?= .substitutions

configure/RULES.ioc

@@ -4,10 +4,9 @@
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
-# in the file LICENSE that is included with this distribution.
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
-
-# RULES.ioc
+#RULES.ioc
 
 include $(CONFIG)/RULES_DIRS
 

configure/RULES_ARCHS

@@ -90,4 +90,6 @@ realclean:
 .PHONY : $(BUILD_ARCHS) rebuild archsCommonClean
 .PHONY : $(ACTIONS) clean realclean archclean host all
 
-include $(CONFIG)/RULES_COMMON
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_BUILD

@@ -6,12 +6,11 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
-
-# RULES_BUILD
-
-# Rules for making things specified in a Makefile
 #
-# CWD is O.$(T_A), but most sources are elsewhere
+#	Rules for making things specified in Makefile
+#
+#	we are in O.$(T_A), but most sources are elsewhere
+#
 
 ifndef BASE_RULES_BUILD
 BASE_RULES_BUILD=1
@@ -80,9 +79,26 @@ else
 host:
 endif
 
-include $(CONFIG)/RULES_FILE_TYPE
+-include $(CONFIG)/RULES_FILE_TYPE
 
-include $(CONFIG)/RULES.Db
+-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
@@ -186,7 +202,7 @@ endif
 
 # RELEASE file consistency checking
 checkRelease:
-	+$(CONVERTRELEASE) checkRelease
+	$(CONVERTRELEASE) checkRelease
 warnRelease:
 	-$(CONVERTRELEASE) checkRelease
 noCheckRelease:
@@ -257,13 +273,15 @@ YACCOPT ?= $($*_YACCOPT)
 	$(MV) $*.tab.c $*.c
 	$(if $(findstring -d, $(YACCOPT)),$(MV) $*.tab.h $*.h,)
 
-# must be a separate rule since when not using '-d' the
+# must be a seperate rule since when not using '-d' the
 # prefix for .h will be different then .c
 %.h : %.c %.y
 
 %.c: %.l
+	@$(RM) $*.yy.c
+	$(LEX) $(LEXOPT) -t $< > $*.yy.c
 	@$(RM) $@
-	$(LEX) $(LEXOPT) -o$@ $<
+	$(MV) $*.yy.c $@
 
 #---------------------------------------------------------------
 # Libraries, shared/DLL and stubs
@@ -391,7 +409,7 @@ endif
 # Generate a perl program to exec the real test binary.
 %.t: %$(EXE) $(TOOLS)/makeTestfile.pl
 	@$(RM) $@
-	$(PERL) $(TOOLS)/makeTestfile.pl $(T_A) $(EPICS_HOST_ARCH) $@ $<
+	$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
 
 #---------------------------------------------------------------
 # Generate header with version number from VCS
@@ -530,7 +548,7 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-include $(CONFIG)/RULES_EXPAND
+-include $(CONFIG)/RULES_EXPAND
 
 .PRECIOUS: %.i %.o %.c %.nm %.cpp %.cc
 .PRECIOUS: $(COMMON_INC)
@@ -539,9 +557,5 @@ include $(CONFIG)/RULES_EXPAND
 .PHONY: runtests tapfiles clean-tests test-results junitfiles
 .PHONY: checkRelease warnRelease noCheckRelease FORCE
 
-include $(CONFIG)/RULES_COMMON
-
-else
-    $(warning RULES_BUILD included more than once. \
-        Use 'make show-makefiles' to work out why.)
 endif # BASE_RULES_BUILD
+#	EOF RULES_BUILD

configure/RULES_COMMON

@@ -1,35 +0,0 @@
-#*************************************************************************
-# Copyright (c) 2018 UChicago Argonne LLC, as Operator of Argonne
-#     National Laboratory.
-# EPICS BASE is distributed subject to a Software License Agreement found
-# in the file LICENSE that is included with this distribution.
-#*************************************************************************
-
-# These rules show the set of Makefiles, config files and
-# rules files loaded by GNUmake.
-
-# Protect against filenames containing colons (Windows)
-SAFE_MAKEFILES = $(subst :,__colon__,$(MAKEFILE_LIST))
-SHOW_MAKEFILES = $(SAFE_MAKEFILES:%=show-makefile.%)
-show-makefiles: $(SHOW_MAKEFILES)
-
-# The sort prevents warnings about duplicate targets:
-$(sort $(SHOW_MAKEFILES)): show-makefile.%:
-	@echo "    $(subst __colon__,:,$(@:show-makefile.%=%))"
-
-.PHONY: show-makefiles show-makefile.%
-
-# These rules support printing a Makefile variable values.
-# Many variables are only set inside an O.<arch> build directory.
-#   make PRINT.T_A
-
-PRINT_Var = $(@:PRINT.%=%)
-PRINT.%:
-	@echo $(PRINT_Var) = '$($(PRINT_Var))'
-
-.PHONY: PRINT PRINT.%
-
-
-#  User specific rules
-#
--include $(HOME)/configure/RULES_USER

configure/RULES_DIRS

@@ -92,4 +92,7 @@ $(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \
 .PHONY : $(dirActionArchTargets)
 .PHONY : $(actionArchTargets)
 
-include $(CONFIG)/RULES_COMMON
+
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_EXPAND

@@ -1,13 +1,4 @@
-#*************************************************************************
-# Copyright (c) 2011 UChicago Argonne LLC, 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 is distributed subject to a Software License Agreement found
-# in the file LICENSE that is included with this distribution.
-#*************************************************************************
-
-# RULES_EXPAND
+# <top>/configure/RULES_EXPAND
 
 vpath %@ $(USR_VPATH) $(ALL_SRC_DIRS)
 

configure/RULES_FILE_TYPE

@@ -7,11 +7,9 @@
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# Include <top>/configure/RULES_BUILD from tops defined in RELEASE* files,
-# excluding EPICS_BASE
+# Include <top>/configure/RULES_BUILD from tops defined in RELEASE* files
 #
-RELEASE_RULES_BUILDS = $(foreach top, \
-    $(filter-out EPICS_BASE, $(RELEASE_TOPS)), \
+RELEASE_RULES_BUILDS = $(foreach top, $(RELEASE_TOPS), \
     $(wildcard $($(top))/configure/RULES_BUILD))
 ifneq ($(RELEASE_RULES_BUILDS),)
   include $(RELEASE_RULES_BUILDS)
@@ -25,7 +23,7 @@ ifneq ($(RELEASE_CFG_RULES),)
   include $(RELEASE_CFG_RULES)
 endif
 
-# If this is not BASE then include <top>/configure/RULES_BUILD
+# If this is not BASE then include <TOP>/configure/RULES_BUILD
 #
 ifeq ($(wildcard $(TOP)/configure/CONFIG_BASE_VERSION),)
 TOP_RULES_BUILDS = $(wildcard $(TOP)/configure/RULES_BUILD)
@@ -69,3 +67,7 @@ file_type_clean:
 	@$(RM) $(foreach type, $(FILE_TYPE), $($(type)))
 
 .PHONY : file_type_clean
+
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_OCTAVE

@@ -1,10 +1,11 @@
 #*************************************************************************
-# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
+# 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 is distributed subject to a Software License Agreement found
-# in the file LICENSE that is included with this distribution.
+# 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. 
 #*************************************************************************
 
 # Octave definitions and rules

configure/RULES_TARGET

@@ -1,13 +1,18 @@
 #*************************************************************************
-# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
+# 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 is distributed subject to a Software License Agreement found
-# in the file LICENSE that is included with this distribution.
+# 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.
 #*************************************************************************
-
-# RULES_TARGET
+#
+#  RULES_TARGET
+#
+#  This file is to be maintained by the community.
+#
+#-----------------------------------------------------------------------
 
 define TARGET_template
 $(1)_$(2) += $$(if $$(strip $$($(1)_$(2)_$$(OS_CLASS))), \

configure/RULES_TOP

@@ -15,10 +15,6 @@ CVSCLEAN = $(call FIND_TOOL,cvsclean.pl)
 cvsclean:
 	$(PERL) $(CVSCLEAN)
 
-DEPCLEAN = $(call FIND_TOOL,depclean.pl)
-depclean:
-	$(PERL) $(DEPCLEAN)
-
 realuninstall: uninstallDirs
 	$(RMDIR) $(INSTALL_LOCATION_BIN)
 	$(RMDIR) $(INSTALL_LOCATION_LIB)
@@ -77,14 +73,12 @@ help:
 	@echo "     uninstall      - Remove install directories created by this hostarch."
 	@echo "     realuninstall  - Removes ALL install dirs"
 	@echo "     distclean      - Same as realclean cvsclean realuninstall."
-	@echo "     depclean       - Removes all .d files from O.<arch> directories."
 	@echo "     cvsclean       - Removes cvs .#* files in all dirs of directory tree"
 	@echo "     help           - Prints this list of valid make targets "
 	@echo "Indiv. object targets are supported by O.<arch> level Makefile .e.g"
 	@echo "     xxxRecord.o"
 
-.PHONY: cleandirs distclean cvsclean depclean
-.PHONY: realuninstall archuninstall uninstallDirs
+.PHONY: cleandirs distclean cvsclean realuninstall archuninstall uninstallDirs
 .PHONY: uninstall help
 
 # Include <top>/cfg/TOP_RULES* files from tops defined in RELEASE* files

configure/os/CONFIG.Common.RHEL7-x86_64

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

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

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

configure/os/CONFIG.Common.RTEMS

@@ -27,13 +27,9 @@ ifneq ($(CONFIG),$(TOP)/configure)
 -include $(TOP)/configure/CONFIG_SITE.Common.RTEMS
 endif
 
-#--------------------------------------------------
-# Set RTEMS_BSP from T_A if not already done
-RTEMS_BSP ?= $(subst RTEMS-,,$(T_A))
-
 #-------------------------------------------------------
 # Pick up the RTEMS tool/path definitions from the RTEMS BSP directory.
-include $(RTEMS_BASE)/$(RTEMS_TARGET_CPU)-rtems$(RTEMS_VERSION)/$(RTEMS_BSP)/Makefile.inc
+include $(RTEMS_BASE)/$(RTEMS_TARGET_CPU)-rtems$(RTEMS_VERSION)/$(subst RTEMS-,,$(T_A))/Makefile.inc
 include $(RTEMS_CUSTOM)
 include $(CONFIG.CC)
 

configure/os/CONFIG.Common.RTEMS-at91rm9200ek

@@ -9,6 +9,5 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_BSP = at91rm9200ek
-RTEMS_TARGET_CPU = arm
+RTEMS_TARGET_CPU=arm
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-beatnik

@@ -5,7 +5,6 @@
 # All RTEMS targets use the same Makefile fragment
 #
 EXE = .elf
-RTEMS_BSP = beatnik
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL

configure/os/CONFIG.Common.RTEMS-gen68360

@@ -5,6 +5,5 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_BSP = gen68360
-RTEMS_TARGET_CPU = m68k
+RTEMS_TARGET_CPU=m68k
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mcp750

@@ -5,6 +5,5 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_BSP = mcp750
-RTEMS_TARGET_CPU = ppc
+RTEMS_TARGET_CPU=ppc
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mvme167

@@ -5,6 +5,5 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_BSP = mvme167
-RTEMS_TARGET_CPU = m68k
+RTEMS_TARGET_CPU=m68k
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mvme2100

@@ -5,7 +5,6 @@
 # All RTEMS targets use the same Makefile fragment
 #
 EXE = .elf
-RTEMS_BSP = mvme2100
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL

configure/os/CONFIG.Common.RTEMS-mvme2700

@@ -1,7 +1,6 @@
 #
 # Author: Matt Rippa
 #
-RTEMS_BSP = mvme2700
 RTEMS_TARGET_CPU = powerpc
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 ARCH_DEP_CFLAGS += -DHAVE_PPCBUG

configure/os/CONFIG.Common.RTEMS-mvme3100

@@ -5,7 +5,6 @@
 # All RTEMS targets use the same Makefile fragment
 #
 EXE = .elf
-RTEMS_BSP = mvme3100
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL

configure/os/CONFIG.Common.RTEMS-mvme5500

@@ -5,7 +5,6 @@
 # All RTEMS targets use the same Makefile fragment
 #
 EXE = .elf
-RTEMS_BSP = mvme5500
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL

configure/os/CONFIG.Common.RTEMS-pc386

@@ -5,15 +5,14 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_BSP = pc386
-RTEMS_TARGET_CPU = i386
+RTEMS_TARGET_CPU=i386
 
 MUNCH_SUFFIX = .boot
 define MUNCH_CMD
-	$(RM) $*.bin
-	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< $*.bin
+	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< temp.bin
 	$(BIN2BOOT) $@ 0x00097E00 \
-	    $(PROJECT_RELEASE)/lib/start16.bin 0x00097C00 0 $*.bin 0x00100000 0
+		$(PROJECT_RELEASE)/lib/start16.bin 0x00097C00 0 temp.bin 0x00100000 0
+	rm -f temp.bin
 endef
 
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-pc386-qemu

@@ -1,11 +0,0 @@
-# CONFIG.Common.RTEMS-pc386-qemu
-#
-# Definitions for the RTEMS-pc386-qemu target
-# Site-specific overrides go in CONFIG_SITE.Common.RTEMS-pc386-qemu
-#
-#-------------------------------------------------------
-
-# Include definitions from RTEMS-pc386
-include $(CONFIG)/os/CONFIG.Common.RTEMS-pc386
-
-RTEMS_QEMU_FIXUPS = YES

configure/os/CONFIG.Common.RTEMS-psim

@@ -5,6 +5,5 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_BSP = psim
-RTEMS_TARGET_CPU = ppc
+RTEMS_TARGET_CPU=ppc
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-uC5282

@@ -5,7 +5,6 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_BSP = uC5282
 RTEMS_TARGET_CPU = m68k
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 

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

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

configure/os/CONFIG.Common.SL6-x86

@@ -0,0 +1,9 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+COMMANDLINE_LIBRARY = READLINE
+
+ARCH_DEP_CFLAGS += -march=i686
+
+# remove warning in anyscalar.h
+ARCH_DEP_CXXFLAGS += -fno-strict-aliasing

configure/os/CONFIG.Common.SL6-x86_64

@@ -0,0 +1,7 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+COMMANDLINE_LIBRARY = READLINE
+
+# remove warning in anyscalar.h
+ARCH_DEP_CXXFLAGS += -fno-strict-aliasing

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

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

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.UnixCommon

@@ -18,8 +18,10 @@ OBJ = .o
 LIB_PREFIX = lib
 LIB_SUFFIX = .a
 SHRLIB_SUFFIX_BASE = .so
-SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(SHRLIB_VERSION))
-LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
+#SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(SHRLIB_VERSION))
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
+#LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
 LOADABLE_SHRLIB_PREFIX = lib
 
 #-------------------------------------------------------

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.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,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>'

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
+
+# Some drivers complain
+ARCH_DEP_CFLAGS += -fno-strict-aliasing

configure/os/CONFIG.Common.eldk51-ppc4xxSF

@@ -0,0 +1,16 @@
+# Virtex FPGA embedded Processor with ELDK 5.1
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE
+
+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)

configure/os/CONFIG.Common.eldk52-e500v2

@@ -0,0 +1,17 @@
+# IOxOS IFC1210 with ELDK 5.2
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE
+
+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 =

configure/os/CONFIG.Common.eldk53-ppc4xxFP

@@ -0,0 +1,23 @@
+# DeltaTau PowerPMAC with ELDK 5.2
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE
+
+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,25 @@
+# IOxOS IFC1211 with Freescale QorIQ 2.0 toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE
+
+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.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
+
+# remove warning in anyscalar.h
+ARCH_DEP_CXXFLAGS += -fno-strict-aliasing

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

configure/os/CONFIG.Common.raspbian-arm

@@ -0,0 +1,43 @@
+# 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/
+
+COMMANDLINE_LIBRARY = READLINE
+
+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.vxWorksCommon

@@ -63,6 +63,7 @@ VXWORKS_MAJOR_VERSION = $(basename $(basename $(VXWORKS_VERSION)))
 
 # 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.0 = 3.3.2
 VX_GNU_VERSION_6.1 = 3.3.2
 VX_GNU_VERSION_6.2 = 3.3.2
@@ -73,9 +74,17 @@ VX_GNU_VERSION_6.6 = 4.1.2
 VX_GNU_VERSION_6.7 = 4.1.2
 VX_GNU_VERSION_6.8 = 4.1.2
 VX_GNU_VERSION_6.9 = 4.3.3
-VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
+VX_GNU_VERSION_6 = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
+VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_MAJOR_VERSION))
 
 VX_GNU_MAJOR_VERSION = $(basename $(basename $(VX_GNU_VERSION)))
+VX_GNU_MINOR_VERSION = $(basename $(patsubst $(VX_GNU_MAJOR_VERSION).%,%,$(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))
 
 #--------------------------------------------------
 # Fix old Linux WIND_HOST_TYPE
@@ -85,14 +94,21 @@ endif
 
 #--------------------------------------------------
 # vxWorks directory definitions
-VX_DIR = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
+VX_DIR_5 = $(WIND_BASE)
+VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
+VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
 
-GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
+VX_INCLUDE_DIRS_5 = $(VX_DIR)/target/h
+VX_INCLUDE_DIRS_6 = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
+GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
+TARGET_CPPFLAGS = -isystem $(VX_DIR)/target/h
 
 #--------------------------------------------------
 # vxWorks GNU directories
 
-GNU_DIR = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
+GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
+GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
+GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
 
 #--------------------------------------------------
 # This finds nm on any supported VxWorks version
@@ -133,12 +149,23 @@ OPT_CXXFLAGS_YES = -O2
 # code flags
 CODE_CFLAGS =
 #
-# For vxWorks versions before 6.3 we need this g++ compiler flag
-CODE_CXXFLAGS_6.0 = -fno-implicit-templates
-CODE_CXXFLAGS_6.1 = -fno-implicit-templates
-CODE_CXXFLAGS_6.2 = -fno-implicit-templates
-CODE_CXXFLAGS_6 = $(CODE_CXXFLAGS_$(VXWORKS_VERSION))
-CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(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))
+
+#--------------------------------------------------
+# 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))
 
 #--------------------------------------------------
 # no shared libs for vxWorks

configure/os/CONFIG.Common.yocto21-aarch64

@@ -0,0 +1,20 @@
+# XILINX Zynq with Yocto 2.1 / Petalinux toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE
+
+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,16 @@
+# "cross compile" for older Linux version
+# Use older compiler and older libraries
+# Used packages:
+# compat-gcc-44-c++-4.4
+# compat-gcc-44-4.4
+# compat-glibc-headers-2.12-4
+# It was neccessary to install 32 bit compatibility libraries manually
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44
+
+TARGET_CPPFLAGS = -isystem /usr/lib/x86_64-redhat-linux6E/include
+TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib 
+LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo

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

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

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

configure/os/CONFIG.SL5-x86.SL5-x86

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

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

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

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.darwinCommon.darwinCommon

@@ -65,14 +65,14 @@ GNU = NO
 #
 # Darwin shared libraries
 #
-SHRLIB_LDFLAGS = -dynamiclib -undefined dynamic_lookup \
+SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \
     -install_name $(shell $(FULLPATHNAME) $(INSTALL_LIB))/$@ \
     $(addprefix -compatibility_version , $(SHRLIB_VERSION)) \
     $(addprefix -current_version , $(SHRLIB_VERSION))
 SHRLIB_SUFFIX_BASE = .dylib
 SHRLIB_SUFFIX = $(addprefix ., $(SHRLIB_VERSION))$(SHRLIB_SUFFIX_BASE)
 
-LOADABLE_SHRLIB_LDFLAGS = -bundle -undefined dynamic_lookup
+LOADABLE_SHRLIB_LDFLAGS = -bundle -flat_namespace -undefined suppress
 
 #
 # Position-independent code is the default on Darwin.

configure/os/CONFIG_SITE.Common.RTEMS-pc386

@@ -0,0 +1,3 @@
+#
+# Site-specific overrides for RTEMS-pc386 target
+#

configure/os/CONFIG_SITE.Common.RTEMS-pc386-qemu

@@ -1,9 +0,0 @@
-# CONFIG_SITE.Common.RTEMS-pc386-qemu
-#
-# Site-specific overrides for the RTEMS-pc386-qemu target
-#
-
-# If you're building this architecture you _probably_ want to
-# run the tests for it under QEMU, but if not you can turn
-# them off here by commenting out this line:
-CROSS_COMPILER_RUNTEST_ARCHS += RTEMS-pc386-qemu

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -21,5 +21,6 @@ VXWORKS_VERSION = 6.9
 # 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)

configure/os/CONFIG_SITE.RHEL7-x86_64.Common

@@ -0,0 +1,13 @@
+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

configure/os/CONFIG_SITE.SL5-x86.Common

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

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

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

@@ -1,9 +1,40 @@
-# CONFIG_SITE.linux-x86.Common
-#
-# Site override definitions for linux-x86 host builds
-#-------------------------------------------------------
+INSTALL_LOCATION=/usr/local/epics/base-7.0.1
+#EPICS_SITE_VERSION:=$(shell date +%Y-%m-%d)
 
-# 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
+
+# vxWorks 5.5 for MVxxxx boards
+CROSS_COMPILER_TARGET_ARCHS += T2-ppc604
+
+# vxWorks 6.7 for MVxxxx boards
+CROSS_COMPILER_TARGET_ARCHS += V67-ppc604
+
+# NI compact RIO
+CROSS_COMPILER_TARGET_ARCHS += V63-ppc603
+
+# MOXA montavista linux (No PVA because of missing boost support)
+CROSS_COMPILER_TARGET_ARCHS += mvl40-xscale_be
+
+# MOXA SDK 4.2
+CROSS_COMPILER_TARGET_ARCHS += moxa42-armv6l
+
+# Virtex embedded PPC
+CROSS_COMPILER_TARGET_ARCHS += eldk51-ppc4xxSF
+
+# IOxOS IFC1210
+CROSS_COMPILER_TARGET_ARCHS += eldk52-e500v2
+
+# DeltaTau PowerPMAC
+CROSS_COMPILER_TARGET_ARCHS += eldk42-ppc4xxFP
+#CROSS_COMPILER_TARGET_ARCHS += eldk53-ppc4xxFP
+
+# Test other vxWorks versions
+#CROSS_COMPILER_TARGET_ARCHS += V66-ppc603
+CROSS_COMPILER_TARGET_ARCHS += V66-ppc604
+#CROSS_COMPILER_TARGET_ARCHS += V63-ppc604
+# (No PVA because of old compiler)
+CROSS_COMPILER_TARGET_ARCHS += V62-ppc604
+
+# Raspberry Pi
+CROSS_COMPILER_TARGET_ARCHS += raspbian-arm

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

documentation/README.1st

@@ -164,11 +164,12 @@
 
     base/startup directory - contains scripts to set environment and path
 
-         EpicsHostArch       Shell script to set EPICS_HOST_ARCH env variable
-         unix.csh            C shell script to set path and env variables
-         unix.sh             Bourne shell script to set path and env variables
-         win32.bat           Bat file example to configure win32-x86 target
-         windows.bat         Bat file example to configure windows-x64 target
+         EpicsHostArch       C shell script to set EPICS_HOST_ARCH env variable
+         EpicsHostArch.pl    Perl script to set EPICS_HOST_ARCH env variable
+         Site.profile        bourne shell script to set path and env variables
+         Site.cshrc          c shell script to set path and env variables
+         cygwin.bat          WIN32 bat file to set cygwin path and env variables
+         win32.bat           WIN32 bat file to set path and env variables
 
     base/configure directory - contains build definitions and rules
 

documentation/README.darwin.html

@@ -21,7 +21,7 @@ of my Bash login script (~/.bash_login):
 #
 EPICS_BASE="${HOME}/src/EPICS/base"
 EPICS_EXTENSIONS="${HOME}/src/EPICS/extensions"
-<strong>.</strong> "${EPICS_BASE}"/startup/unix.sh
+<strong>.</strong> "${EPICS_BASE}"/startup/Site.profile
 </pre>
 </li>
 <li>

documentation/README.html

@@ -176,11 +176,12 @@
 
 <H4>base/startup directory - contains scripts to set environment and path</H4>
 <PRE>
-        EpicsHostArch       Shell script to set EPICS_HOST_ARCH env variable
-        unix.csh            C shell script to set path and env variables
-        unix.sh             Bourne shell script to set path and env variables
-        win32.bat           Bat file example to configure win32-x86 target
-        windows.bat         Bat file example to configure windows-x64 target
+        EpicsHostArch       C shell script to set EPICS_HOST_ARCH env variable
+        EpicsHostArch.pl    Perl script to set EPICS_HOST_ARCH env variable
+        Site.profile        bourne shell script to set path and env variables
+        Site.cshrc          c shell script to set path and env variables
+        cygwin.bat          WIN32 bat file to set cygwin path and env variables
+        win32.bat           WIN32 bat file to set path and env variables
 </PRE>
 
 <H4>base/configure directory - contains build definitions and rules</H4>

documentation/RELEASE_NOTES.html

@@ -8,15 +8,7 @@
 
 <body lang="en">
 
-<p>These release notes describe changes that have been made since the previous
-release of this series of EPICS Base. Note that changes which were merged up
-from commits to new releases in an older Base series are not described at the
-top of this file but have entries that appear lower down, under the series to
-which they were originally committed. Thus it is important to read more than
-just the first section to understand everything that has changed in each
-release.</p>
-
-<h1 align="center">EPICS Release 7.0.2</h1>
+<h1 align="center">EPICS Release 7.0.2.x</h1>
 
 <!-- Insert new items immediately below this template ...
 
@@ -26,12 +18,15 @@ release.</p>
 
 -->
 
-<h3>Launchpad Bugs</h3>
-
-<p>The list of tracked bugs fixed in this release can be found on the
-<a href="https://launchpad.net/epics-base/+milestone/7.0.2">Launchpad Milestone
-page for EPICS Base 7.0.2</a>.</p>
+<h3>Skipping build of modules and re-enabling vxWorks 5</h3>
 
+<p>Any module can be skipped during the build for a given architecture by setting
+the Makfile variable <tt>SKIP_BUILDS</tt> to a list of patterns matching the
+module directories to skip. For example to skip building any pvAccess related
+modules set <code>SKIP_BUILDS=pv%&nbsp;normativeTypes</code> in the
+CONFIG.Common.&lt;arch&gt; file for that architecture.
+The builds for vxWorks 5 and up to 6.2 do that.
+</p>
 
 <h3>Git Branches Recombined</h3>
 
@@ -43,7 +38,6 @@ more than one of these modules. The layout of the source files has not changed
 at all however, so the source code for libcom, ca and the database are still
 found separately under the module subdirectory.</p>
 
-
 <h1 align="center">EPICS Release 7.0.1.1</h1>
 
 <h3>Changed SIML failure behavior</h3>
@@ -112,115 +106,6 @@ be happy to try and answer them!</p>
 
 <!-- Insert inherited items immediately below here ... -->
 
-<h3>Type-safe Device and Driver Support Tables</h3>
-
-<p>Type-safe versions of the device and driver support structures <tt>dset</tt>
-and <tt>drvet</tt> have been added to the devSup.h and drvSup.h headers
-respectively. The original structure definitions have not been changed so
-existing support modules will still build normally, but older modules can be
-modified and new code written to be compatible with both.</p>
-
-<p>The old structure definitions will be replaced by the new ones if the macros
-<tt>USE_TYPED_DSET</tt> and/or <tt>USE_TYPED_DRVET</tt> are defined when the
-appropriate header is included. The best place to define these is in the
-Makefile, as with the <tt>USE_TYPED_RSET</tt> macro that was introduced in
-Base-3.16.1 and described below. See the comments in devSup.h for a brief usage
-example, or look at <a href="https://github.com/epics-modules/ipac/commit/a7e0ff4089b9aa39108bc8569e95ba7fcf07cee9">
-this commit</a> to the ipac module to see a module conversion.</p>
-
-<p>A helper function <tt>DBLINK* dbGetDevLink(dbCommon *prec)</tt> has also been
-added to devSup.h which fetches a pointer to the INP or OUT field of the
-record.</p>
-
-<h3>RTEMS build configuration update, running tests under QEMU</h3>
-
-<p>This release includes the ability to run the EPICS unit tests built for a
-special version of the RTEMS-pc386 target architecture on systems that have an
-appropriate QEMU emulator installed (<tt>qemu-system-i386</tt>). It is also now
-possible to create sub-architectures of RTEMS targets, whereas previously the
-EPICS target architecture name had to be <tt>RTEMS-$(RTEMS_BSP)</tt>.</p>
-
-<p>The new target <tt>RTEMS-pc386-qemu</tt> builds binaries that can be run in
-the <tt>qemu-system-i386</tt> PC System emulator. This target is a derivative of
-the original <tt>RTEMS-pc386</tt> target but with additional software to build
-an in-memory file-system, and some minor modifications to allow the unit tests
-to work properly under QEMU. When this target is enabled, building any of the
-make targets that cause the built-in self-tests to be run (such as
-<tt>make&nbsp;runtests</tt>) will also run the tests for RTEMS using QEMU.</p>
-
-<p>To allow the new 3-component RTEMS target name, the EPICS build system for
-RTEMS was modified to allow a <tt>configure/os/CONFIG.Common.&lt;arch&gt;</tt>
-file to set the <tt>RTEMS_BSP</tt> variable to inform the build what RTEMS BSP
-to use. Previously this was inferred from the value of the <tt>T_A</tt> make
-variable, but that prevents having multiple EPICS targets that build against the
-same BSP. All the included RTEMS target configuration files have been updated;
-build configuration files for out-of-tree RTEMS targets will continue to work as
-the original rules are used to set <tt>RTEMS_BSP</tt> if it hasn't been set when
-needed.</p>
-
-<h3>Link type enhancements</h3>
-
-<p>This release adds three new link types: "state", "debug" and "trace". The
-"state" link type gets and puts boolean values from/to the dbState library that
-was added in the 3.15.1 release. The "debug" link type sets the
-<code>jlink::debug</code> flag in its child link, while the "trace" link type
-also causes the arguments and return values for all calls to the child link's
-jlif and lset routines to be printed on stdout. The debug flag can no longer be
-set using an info tag. The addition of the "trace" link type has allowed over
-200 lines of conditional diagnostic printf() calls to be removed from the other
-link types.</p>
-
-<p>The "calc" link type can now be used for output links as well as input links.
-This allows modification of the output value and even combining it with values
-from other input links. See the separate JSON Link types document for
-details.</p>
-
-<p>A new <code>start_child()</code> method was added to the end of the jlif
-interface table.</p>
-
-<p>The <code>lset</code> methods have now been properly documented in the
-dbLink.h header file using Doxygen annotations, although we do not run Doxygen
-on the source tree yet to generate API documentation.</p>
-
-<p>Link types that utilize child links must now indicate whether the child will
-be used for input, output or forward linking by the return value from its
-<code>parse_start_map()</code> method. The <code>jlif_key_result</code> enum now
-contains 3 values <code>jlif_key_child_inlink</code>,
-<code>jlif_key_child_outlink</code> and <code>jlif_key_child_fwdlink</code>
-instead of the single <code>jlif_key_child_link</code> that was previously used
-for this.</p>
-
-<h3>GNUmake targets for debugging</h3>
-
-<p>Some additional build rules have been added to help debug configuration
-problems with the build system. Run <tt>make show-makefiles</tt> to get a sorted
-list of all the files that the build system includes when building in the
-current directory.</p>
-
-<p>A new pattern rule for <tt>PRINT.%</tt> can be used to show the value of any
-GNUmake variable for the current build directory (make sure you are in the right
-directory though, many variables are only set when inside the
-<tt>O.<i>arch</i></tt> build directory). For example <tt>make PRINT.T_A</tt>
-will display the build target architecture name from inside a
-<tt>O.<i>arch</i></tt> directory but the variable will be empty from an
-application top or src directory. <tt>make PRINT.EPICS_BASE</tt> will show the
-path to Base from any EPICS application directory though.</p>
-
-<h3>Propagate PUTF across Asynchronous record processing</h3>
-
-<p>The IOC contains a mechanism involving the PUTF and RPRO fields of each
-record to ensure that if a record is busy when it receives a put to one of its
-fields, the record will be processed again to ensure that the new field value
-has been correctly acted on. Until now that mechanism only worked if the put was
-to the asynchronous record itself, so puts that were chained from some other
-record via a DB link did not cause reprocessing.</p>
-
-<p>In this release the mechanism has been extended to propagate the PUTF state
-across DB links until all downstream records have been reprocessed. Some
-additional information about the record state can be shown by setting the TPRO
-field of an upstream record, and even more trace data is displayed if the
-debugging variable <tt>dbAccessDebugPUTF</tt> is set in addition to TPRO.</p>
-
 <h3>Finding info fields</h3>
 
 <p>A new iocsh command <code>dbli</code> lists the info fields defined in the
@@ -237,18 +122,15 @@ release also includes additional protection against buffer overflows while
 printing long links in <tt>dbpr</tt>, and corrects the output of long strings
 from the <tt>dbgf</tt> command.</p>
 
-<h3>Record types mbbiDirect and mbboDirect upgraded to 32 bit</h3>
+<h3>Record types mbbiDirect and mbboDirect extended to 32 bit</h3>
 
-<p>The VAL fields and related fields of these records are now <tt>DBF_LONG</tt>.
-(Not <tt>DBF_ULONG</tt> in order to prevent Channel Access from promoting them
-to <tt>DBF_DOUBLE</tt>.) Additional bit fields <tt>B10</tt>...<tt>B1F</tt> have
-been added.</p>
+<p>The VAL fields of mbbiDirect and mbboDirect records have
+been extended from <tt>DBF_USHORT</tt> (16 bit) to <tt>DBF_LONG</tt> (32 bit).
+New bit fields <tt>B10</tt>...<tt>B1F</tt> have been added.</p>
 
-<p>Device support that accesses <tt>VAL</tt> or the bit fields directly (most
-don't) and aims for compatibility with old and new versions of these records
-should use at least 32 bit integer types to avoid bit loss. The number of bit
-fields can be calculated using <code>8&nbsp;*&nbsp;sizeof(prec->val)</code>
-which is correct in both versions.</p>
+<p>Device support which accesses the bit fields can test if the macro
+<tt>mbbiDirectRecord1BF</tt> or <tt>mbboDirectRecord1BF</tt> is
+defined. Device support which only accesses RVAL needs no modification.</p>
 
 <h3>Restore use of ledlib for VxWorks command editing</h3>
 
@@ -890,45 +772,11 @@ the stdout stream, making it hard to parse.</p>
 callback.h header and removed the need for dbScan.c to reach into the internals
 of its CALLBACK objects.</p>
 
-<h2 align="center">Changes from the 3.15 branch since 3.15.6</h2>
+
+<h2 align="center">Changes from the 3.15 branch since 3.15.5</h2>
 
 <!-- Insert inherited items immediately below here ... -->
 
-
-<h2 align="center">Changes made between 3.15.5 and 3.15.6</h2>
-
-<h3>Unsetting environment variables</h3>
-
-<p>The new command <code>epicsEnvUnset <i>varname</i></code> can be used to
-unset an environment variable.</p>
-
-<h3>Warning indicators in msi (and macLib) output</h3>
-
-<p>The libCom macro expansion library has been modified so that when the
-SUPPRESS_WARNINGS flag is set it will no longer include any <tt>,undefined</tt>
-or <tt>,recursive</tt> indicators in its output when undefined or recursive
-macros are encountered. These indicators were harmless when the output was fed
-into an IOC along with a definition for the macro, but when the <tt>msi</tt>
-tool was used to generate other kinds of files they caused problems. If the
-<tt>msi -V</tt> flag is used the markers will still be present in the output
-whenever the appropriate condition is seen.</p>
-
-<h3>Improvements to msi</h3>
-
-<p>In addition to fixing its response to discovering parsing errors in its
-substitution input file (reported as Launchpad
-<a href="https://bugs.launchpad.net/epics-base/+bug/1503661">bug #1503661</a>)
-so it now deletes the incomplete output file, the msi program has been cleaned
-up a little bit internally.</p>
-
-<h3>All array records now post monitors on their array-length fields</h3>
-
-<p>The waveform record has been posting monitors on its NORD field since Base
-3.15.0.1; we finally got around to doing the equivalent in all the other
-built-in record types, which even required modifying device support in some
-cases. This fixes <a href="https://bugs.launchpad.net/epics-base/+bug/1730727">
-Launchpad bug #1730727</a>.</p>
-
 <h3>HOWTO: Converting Wiki Record Reference to POD</h3>
 
 <p>Some documentation has been added to the <tt>dbdToHtml.pl</tt> script
@@ -960,84 +808,15 @@ of having go modify or replace the original. A new .gitignore pattern
 tells git to ignore all configure/*.local files.</p>
 
 
-<h2 align="center">Changes from the 3.14 branch between 3.15.5 and 3.15.6</h2>
+<h2 align="center">Changes from the 3.14 branch since 3.15.5</h2>
 
-<h3>Fix broken <tt>EPICS_IOC_LOG_FILE_LIMIT=0</tt> setting</h3>
-
-<p>The Application Developers' Guide says this is allowed and disables the
-limit on the log-file, but it hasn't actually worked for some time (if ever).
-Note that the iocLogServer will be removed from newer Base release sometime
-soon as its functionality can be implemented by other dedicated log servers
-such as logstash or syslog-ng.</p>
-
-<p>Fixes <a href="https://bugs.launchpad.net/bugs/1786858">lp:1786858</a>
-and part of <a href="https://bugs.launchpad.net/bugs/1786966">lp:1786966</a>.
-</p>
-
-<h3>Cleanup of startup directory</h3>
-
-<p>The files in the startup directory have not been maintained in recent years
-and have grown crufty (technical term). This release includes the following
-updates to these files:</p>
-
-<ul>
-
-<li>The Perl <tt>EpicsHostArch.pl</tt> script has been rewritten, and support
-for a few previously missing host architectures has been added to it.</li>
-
-<li>The <tt>EpicsHostArch.pl</tt> script has also been moved into the standard
-<tt>src/tools</tt> directory, from where it will be installed into
-<tt>lib/perl</tt>. In this new location it is no longer executable, so it must
-be run by the <tt>perl</tt> executable.</li>
-
-<li>The build system has been adjusted to look for <tt>EpicsHostArch.pl</tt> in
-both places if the <tt>EPICS_HOST_ARCH</tt> environment variable has not been
-set at build-time.</li>
-
-<li>Sites that used the original Perl script to set <tt>EPICS_HOST_ARCH</tt> as
-part of their standard environment will need to adjust their scripts when they
-upgrade to this release.</li>
-
-<li>The <tt>EpicsHostArch</tt> shell script has been replaced with a wrapper
-routine that calls the Perl <tt>EpicsHostArch.pl</tt> script. Sites that rely on
-this script to set <tt>EPICS_HOST_ARCH</tt> should consider switching to the
-Perl script instead.</li>
-
-<li>The <tt>Site.cshrc</tt> and <tt>Site.profile</tt> files have been renamed to
-<tt>unix.csh</tt> and <tt>unix.sh</tt>, respectively.</li>
-
-<li>The existing <tt>win32.bat</tt> file has been cleaned up and a new
-<tt>windows.bat</tt> file added for 64-bit targets. The contents of these files
-should be seen as examples, don't uncomment or install parts for software that
-you don't explicitly know that you need.</li>
-
-</ul>
-
-<h3>Recent Apple XCode Build Issues</h3>
-
-<p>The latest version of XCode will not compile calls to <tt>system()</tt> or
-<tt>clock_settime()</tt> for iOS targets. There were several places in Base
-where these were being compiled, although there were probably never called. The
-code has now been modified to permit iOS builds to complete again.</p>
-
-<h3>Prevent illegal alarm severities</h3>
-
-<p>A check has been added to <tt>recGblResetAlarms()</tt> that prevents records
-from getting an alarm severity higher than INVALID_ALARM. It is still possible
-for a field like HSV to get set to a value that is not a legal alarm severity,
-but the core IOC code should never copy such a value into a record's SEVR or
-ACKS fields. With this fix the record's alarm severity will be limited to
-INVALID_ALARM.</p>
+<!-- Insert inherited items immediately below here ... -->
 
 <h3>Fixes for Launchpad bugs</h3>
 
 <p>The following launchpad bugs have fixes included:</p>
 
 <ul>
-<li><a href="https://bugs.launchpad.net/epics-base/+bug/1786320">
-    lp: #1786320</a>, dbCa subscribes twice to ENUM</li>
-<li><a href="https://bugs.launchpad.net/epics-base/+bug/541221">
-    lp: #541221</a>, 'assert (pca->pgetNative)' failed in ../dbCa.c</li>
 <li><a href="https://bugs.launchpad.net/epics-base/+bug/1747091">
     lp: #1747091</a>, epicsTimeGetEvent() / generalTime bug</li>
 <li><a href="https://bugs.launchpad.net/epics-base/+bug/1743076">

documentation/ReleaseChecklist.html

@@ -133,20 +133,20 @@ made.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Tag the module in Git, using these tag conventions:
+      <td>Tag the module in Git using these tag conventions:
         <ul>
           <li>
-            <tt>R7.0.2-pre<i>n</i></tt>
+            <tt>R7.1.1-pre<i>n</i></tt>
             &mdash; pre-release tag
             </li>
           <li>
-            <tt>R7.0.2-rc<i>n</i></tt>
+            <tt>R7.1.1-rc<i>n</i></tt>
             &mdash; release candidate tag
             </li>
-          </ul>
+        </ul>
         <blockquote><tt>
-          cd base-7.0<br />
-          git tag -m 'ANJ: Tagged for 7.0.2-rc1' R7.0.2-rc1
+          cd base-7.1<br />
+          git tag -m 'ANJ: Tagged for 7.1.1-rc1' R7.1.1-rc1
           </tt></blockquote>
         Note that submodules must <em>not</em> be tagged with the version used
         for the top-level, they each have their own separate version numbers
@@ -159,12 +159,12 @@ made.</p>
         script generates a gzipped tarfile directly from the tag, excluding the
         files and directories that are only used for continuous integration:
         <blockquote><tt>
-          cd base-7.0<br />
-          .ci/make-tar.sh R7.0.2-rc1 base-7.0.2-rc1.tar.gz base-7.0.2-rc1/
+          cd base-7.1<br />
+          .ci/make-tar.sh R7.1.1-rc1 base-7.1.1-rc1.tar.gz base-7.1.1-rc1/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
-          gpg --armor --sign --detach-sig base-7.0.2-rc1.tar.gz
+          gpg --armor --sign --detach-sig base-7.1.1-rc1.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -247,25 +247,6 @@ made.</p>
           </ul>
         </td>
       </tr>
-
-    <tr>
-      <th colspan="3">To Do</th>
-    </tr>
-    <tr>
-      <td>&nbsp;</td>
-      <td>Release Manager</td>
-      <td>Discuss and resolve before final release:
-        <ul>
-          <li>Update version numbers in individual
-            <tt>modules/*/configure/*VERSION</tt> files?</li>
-          <li>Unifying module Release Notes for easier publication.</li>
-          <li>Unifying module documentation directories and Doxygen
-            config's.</li>
-          <li>Publishing releases on the new website.</li>
-          </ul>
-        </td>
-      </tr>
-
     <tr>
       <th colspan="3">Release Approval</th>
     </tr>
@@ -290,8 +271,8 @@ made.</p>
       <td>Release Manager</td>
       <td>Tag the module in Git:
         <blockquote><tt>
-          cd base-7.0<br />
-          git tag -m 'ANJ: Tagged for 7.0.2' R7.0.2</i>
+          cd base-7.1<br />
+          git tag -m 'ANJ: Tagged for 7.1.1' R7.1.1</i>
           </tt></blockquote>
         </td>
       </tr>
@@ -302,12 +283,12 @@ made.</p>
         script generates a gzipped tarfile directly from the tag, excluding the
         files and directories that are only used for continuous integration:
         <blockquote><tt>
-          cd base-7.0<br />
-          .ci/make-tar.sh R7.0.2 base-7.0.2.tar.gz base-7.0.2/
+          cd base-7.1<br />
+          .ci/make-tar.sh R7.1.1 base-7.1.1.tar.gz base-7.1.1/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
-          gpg --armor --sign --detach-sig base-7.0.2.tar.gz
+          gpg --armor --sign --detach-sig base-7.1.1.tar.gz
           </tt></blockquote>
         </td>
       </tr>

modules/ca/src/client/Makefile

@@ -72,6 +72,7 @@ LIBSRCS += comQueSend.cpp
 LIBSRCS += comBuf.cpp
 LIBSRCS += hostNameCache.cpp
 LIBSRCS += msgForMultiplyDefinedPV.cpp
+LIBSRCS_vxWorks += templateInstances.cpp
 
 LIBRARY=ca
 

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 & );

modules/ca/src/client/udpiiu.cpp

@@ -193,7 +193,7 @@ udpiiu::udpiiu (
 
 #ifdef IP_MULTICAST_TTL
     {
-        osiSockOptMcastTTL_t ttl;
+        int ttl;
         long val;
         if(envGetLongConfigParam(&EPICS_CA_MCAST_TTL, &val))
             val =1;

modules/ca/src/template/top/caPerlApp/caget.pl

@@ -143,10 +143,6 @@ sub display {
             printf "    Lo ctrl limit:    %g\n", $data->{lower_ctrl_limit};
             printf "    Hi ctrl limit:    %g\n", $data->{upper_ctrl_limit};
         }
-        if (exists $data->{ackt}) {
-            printf "    Ack transients:   %s\n", $data->{ackt} ? 'YES' : 'NO';
-            printf "    Ack severity:     %s\n", $data->{acks};
-        }
     } else {
         my $value = format_number($data, $type);
         if ($opt_t) {

modules/database/src/ioc/db/Makefile

@@ -35,6 +35,7 @@ INC += dbTest.h
 INC += dbCaTest.h
 INC += db_test.h
 INC += db_field_log.h
+INC += initHooks.h
 INC += recGbl.h
 INC += dbIocRegister.h
 INC += chfPlugin.h
@@ -42,6 +43,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
@@ -85,6 +87,7 @@ dbCore_SRCS += recGbl.c
 dbCore_SRCS += callback.c
 dbCore_SRCS += dbCa.c
 dbCore_SRCS += dbCaTest.c
+dbCore_SRCS += initHooks.c
 dbCore_SRCS += cvtBpt.c
 dbCore_SRCS += dbContext.cpp
 dbCore_SRCS += dbChannelIO.cpp
@@ -96,4 +99,5 @@ dbCore_SRCS += chfPlugin.c
 dbCore_SRCS += dbState.c
 dbCore_SRCS += dbUnitTest.c
 dbCore_SRCS += dbServer.c
+dbCore_SRCS_vxWorks += templateInstances.cpp
 

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

@@ -34,7 +34,7 @@
 #include "errlog.h"
 #include "errMdef.h"
 
-#include "epicsExport.h" /* #define epicsExportSharedSymbols */
+#define epicsExportSharedSymbols
 #include "caeventmask.h"
 #include "callback.h"
 #include "dbAccessDefs.h"
@@ -65,9 +65,6 @@
 epicsShareDef struct dbBase *pdbbase = 0;
 epicsShareDef volatile int interruptAccept=FALSE;
 
-epicsShareDef int dbAccessDebugPUTF = 0;
-epicsExportAddress(int, dbAccessDebugPUTF);
-
 /* Hook Routines */
 
 epicsShareDef DB_LOAD_RECORDS_HOOK_ROUTINE dbLoadRecordsHook = NULL;
@@ -449,6 +446,22 @@ int dbGetFieldIndex(const struct dbAddr *paddr)
     return paddr->pfldDes->indRecordType;
 }
 
+/*
+ *  Process a record if its scan field is passive.
+ *     Will notify if processing is complete by callback.
+ *       (only if you are interested in completion)
+ */
+long dbScanPassive(dbCommon *pfrom, dbCommon *pto)
+{
+    /* if not passive just return success */
+    if (pto->scan != 0)
+        return 0;
+
+    if (pfrom && pfrom->ppn)
+        dbNotifyAdd(pfrom,pto);
+    return dbProcess(pto);
+}
+
 /*
  *   Process the record.
  *     1.  Check for breakpoints.
@@ -514,8 +527,7 @@ long dbProcess(dbCommon *precord)
         unsigned short monitor_mask;
 
         if (*ptrace)
-            printf("%s: dbProcess of Active '%s' with RPRO=%d\n",
-                context, precord->name, precord->rpro);
+            printf("%s: Active %s\n", context, precord->name);
 
         /* raise scan alarm after MAX_LOCK times */
         if ((precord->stat == SCAN_ALARM) ||
@@ -544,8 +556,7 @@ long dbProcess(dbCommon *precord)
     /* if disabled check disable alarm severity and return success */
     if (precord->disa == precord->disv) {
         if (*ptrace)
-            printf("%s: dbProcess of Disabled '%s'\n",
-                context, precord->name);
+            printf("%s: Disabled %s\n", context, precord->name);
 
         /*take care of caching and notifyCompletion*/
         precord->rpro = FALSE;
@@ -582,7 +593,7 @@ long dbProcess(dbCommon *precord)
     }
 
     if (*ptrace)
-        printf("%s: dbProcess of '%s'\n", context, precord->name);
+        printf("%s: Process %s\n", context, precord->name);
 
     /* process record */
     status = prset->process(precord);
@@ -702,18 +713,6 @@ void dbInitEntryFromRecord(struct dbCommon *prec, DBENTRY *pdbentry)
     pdbentry->precnode = ppvt->recnode;
 }
 
-struct link* dbGetDevLink(struct dbCommon* prec)
-{
-    DBLINK *plink = 0;
-    DBENTRY entry;
-    dbInitEntryFromRecord(prec, &entry);
-    if(dbFindField(&entry, "INP")==0 || dbFindField(&entry, "OUT")==0) {
-        plink = (DBLINK*)entry.pfield;
-    }
-    dbFinishEntry(&entry);
-    return plink;
-}
-
 long dbValueSize(short dbr_type)
 {
     /* sizes for value associated with each DBR request type */
@@ -1050,7 +1049,7 @@ static long dbPutFieldLink(DBADDR *paddr,
         return S_db_badDbrtype;
     }
 
-    status = dbParseLink(pstring, pfldDes->field_type, &link_info);
+    status = dbParseLink(pstring, pfldDes->field_type, &link_info, 0);
     if (status)
         return status;
 
@@ -1223,8 +1222,8 @@ long dbPutField(DBADDR *paddr, short dbrType,
              precord->scan == 0 &&
              dbrType < DBR_PUT_ACKT)) {
             if (precord->pact) {
-                if (dbAccessDebugPUTF && precord->tpro)
-                    printf("%s: dbPutField to Active '%s', setting RPRO=1\n",
+                if (precord->tpro)
+                    printf("%s: Active %s\n",
                         epicsThreadGetNameSelf(), precord->name);
                 precord->rpro = TRUE;
             } else {
@@ -1357,3 +1356,4 @@ done:
     paddr->pfield = pfieldsave;
     return status;
 }
+

modules/database/src/ioc/db/dbAccessDefs.h

@@ -34,7 +34,6 @@ extern "C" {
 
 epicsShareExtern struct dbBase *pdbbase;
 epicsShareExtern volatile int interruptAccept;
-epicsShareExtern int dbAccessDebugPUTF;
 
 /*  The database field and request types are defined in dbFldTypes.h*/
 /* Data Base Request Options	*/

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

@@ -842,7 +842,6 @@ static void eventCallback(struct event_handler_args arg)
     struct dbr_time_double *pdbr_time_double;
     dbCaCallback monitor = 0;
     void *userPvt = 0;
-    int doScan = 1;
 
     assert(pca);
     epicsMutexMustLock(pca->lock);
@@ -873,13 +872,10 @@ static void eventCallback(struct event_handler_args arg)
         memcpy(pca->pgetString, dbr_value_ptr(arg.dbr, arg.type), size);
         pca->gotInString = TRUE;
     } else switch (arg.type){
-    case DBR_TIME_ENUM:
-        /* Disable the record scan if we also have a string monitor */
-        doScan = !(plink->value.pv_link.pvlMask & pvlOptInpString);
-        /* fall through */
     case DBR_TIME_STRING: 
     case DBR_TIME_SHORT: 
     case DBR_TIME_FLOAT:
+    case DBR_TIME_ENUM:
     case DBR_TIME_CHAR:
     case DBR_TIME_LONG:
     case DBR_TIME_DOUBLE:
@@ -897,7 +893,7 @@ static void eventCallback(struct event_handler_args arg)
     pca->sevr = pdbr_time_double->severity;
     pca->stat = pdbr_time_double->status;
     memcpy(&pca->timeStamp, &pdbr_time_double->stamp, sizeof(epicsTimeStamp));
-    if (doScan && precord) {
+    if (precord) {
         struct pv_link *ppv_link = &plink->value.pv_link;
 
         if ((ppv_link->pvlMask & pvlOptCP) ||

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

@@ -12,29 +12,6 @@
  *      Current Author: Andrew Johnson
  */
 
-/* The PUTF and RPRO fields in dbCommon are flags that indicate when a record
- * is being processed as a result of an external put (i.e. some server process
- * calling dbPutField()), ensuring that the record and its successors will
- * eventually get processed even if they happen to be busy at the time of the
- * put. From Base-3.16.2 and 7.0.2 the code ensures that all records downstream
- * from the original are processed even if a busy asynchronous device appears
- * in the processing chain (this breaks the chain in older versions).
- *
- * PUTF - This field is set in dbPutField() prior to it calling dbProcess().
- *        It is normally cleared at the end of processing in recGblFwdLink().
- *        It may also be cleared in dbProcess() if DISA==DISV (scan disabled),
- *        or by the processTarget() function below.
- *
- * If PUTF is TRUE before a call to dbProcess(prec), then after it returns
- * either PACT is TRUE, or PUTF will be FALSE.
- *
- * RPRO - This field is set by dbPutField() or by the processTarget() function
- *        below when a record to be processed is found to be busy (PACT==1).
- *        It is normally cleared in recGblFwdLink() when the record is queued
- *        for re-processing, or in dbProcess() if DISA==DISV (scan disabled).
- */
-
-
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -66,22 +43,17 @@
 #include "dbNotify.h"
 #include "dbScan.h"
 #include "dbStaticLib.h"
-#include "dbServer.h"
 #include "devSup.h"
 #include "link.h"
 #include "recGbl.h"
 #include "recSup.h"
 #include "special.h"
-#include "dbDbLink.h"
-
 
 /***************************** Database Links *****************************/
 
-/* Forward definitions */
+/* Forward definition */
 static lset dbDb_lset;
 
-static long processTarget(dbCommon *psrc, dbCommon *pdst);
-
 long dbDbInitLink(struct link *plink, short dbfType)
 {
     DBADDR dbaddr;
@@ -166,7 +138,11 @@ static long dbDbGetValue(struct link *plink, short dbrType, void *pbuffer,
 
     /* scan passive records if link is process passive  */
     if (ppv_link->pvlMask & pvlOptPP) {
+        unsigned char pact = precord->pact;
+
+        precord->pact = TRUE;
         status = dbScanPassive(precord, paddr->precord);
+        precord->pact = pact;
         if (status)
             return status;
     }
@@ -335,10 +311,22 @@ static long dbDbPutValue(struct link *plink, short dbrType,
         return status;
 
     if (paddr->pfield == (void *) &pdest->proc ||
-        (ppv_link->pvlMask & pvlOptPP && pdest->scan == 0)) {
-        status = processTarget(psrce, pdest);
-    }
+            (ppv_link->pvlMask & pvlOptPP && pdest->scan == 0)) {
+        /* if dbPutField caused asyn record to process */
+        /* ask for reprocessing*/
+        if (pdest->putf) {
+            pdest->rpro = TRUE;
+        } else { /* process dest record with source's PACT true */
+            unsigned char pact;
 
+            if (psrce && psrce->ppn)
+                dbNotifyAdd(psrce, pdest);
+            pact = psrce->pact;
+            psrce->pact = TRUE;
+            status = dbProcess(pdest);
+            psrce->pact = pact;
+        }
+    }
     return status;
 }
 
@@ -368,75 +356,3 @@ static lset dbDb_lset = {
     dbDbPutValue, NULL,
     dbDbScanFwdLink, doLocked
 };
-
-
-/*
- *  Process a record if its scan field is passive.
- */
-long dbScanPassive(dbCommon *pfrom, dbCommon *pto)
-{
-    /* if not passive we're done */
-    if (pto->scan != 0)
-        return 0;
-
-    return processTarget(pfrom, pto);
-}
-
-static long processTarget(dbCommon *psrc, dbCommon *pdst)
-{
-    char context[40] = "";
-    int trace = dbAccessDebugPUTF && *dbLockSetAddrTrace(psrc);
-    long status;
-    epicsUInt8 pact = psrc->pact;
-
-    psrc->pact = TRUE;
-
-    if (psrc && psrc->ppn)
-        dbNotifyAdd(psrc, pdst);
-
-    if (trace && dbServerClient(context, sizeof(context))) {
-        /* No client, use thread name */
-        strncpy(context, epicsThreadGetNameSelf(), sizeof(context));
-        context[sizeof(context) - 1] = 0;
-    }
-
-    if (!pdst->pact) {
-        /* Normal propagation of PUTF from src to dst */
-        if (trace)
-            printf("%s: '%s' -> '%s' with PUTF=%u\n",
-                context, psrc->name, pdst->name, psrc->putf);
-
-        if (pdst->putf)
-            errlogPrintf("Warning: '%s.PUTF' found true with PACT false\n",
-                pdst->name);
-
-        pdst->putf = psrc->putf;
-    }
-    else if (psrc->putf) {
-        /* The dst record is busy (awaiting async reprocessing) and
-         * we were originally triggered by a call to dbPutField(),
-         * so we mark the dst record for reprocessing once the async
-         * completion is over.
-         */
-        if (trace)
-            printf("%s: '%s' -> Active '%s', setting RPRO=1\n",
-                context, psrc->name, pdst->name);
-
-        pdst->putf = FALSE;
-        pdst->rpro = TRUE;
-    }
-    else {
-        /* The dst record is busy, but we weren't triggered by a call
-         * to dbPutField(). Do nothing.
-         */
-        if (trace)
-            printf("%s: '%s' -> Active '%s', done\n",
-                context, psrc->name, pdst->name);
-    }
-
-    status = dbProcess(pdst);
-
-    psrc->pact = pact;
-
-    return status;
-}

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

@@ -2,7 +2,7 @@
 * Copyright (c) 2016 UChicago Argonne LLC, as Operator of Argonne
 *     National Laboratory.
 * EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* dbJLink.c */
 
@@ -25,33 +25,19 @@
 #include "dbLock.h"
 #include "dbStaticLib.h"
 #include "link.h"
-#include "epicsExport.h"
 
-epicsShareDef int dbJLinkDebug = 0;
-epicsExportAddress(int, dbJLinkDebug);
-
-#define IFDEBUG(n) if (dbJLinkDebug >= (n))
+#define IFDEBUG(n) if(parser->parse_debug)
 
 typedef struct parseContext {
     jlink *pjlink;
     jlink *product;
     short dbfType;
     short jsonDepth;
+    unsigned key_is_link:1;
+    unsigned parse_debug:1;
+    unsigned lset_debug:1;
 } parseContext;
 
-epicsShareDef const char *jlif_result_name[2] = {
-    "jlif_stop",
-    "jlif_continue",
-};
-
-epicsShareDef const char *jlif_key_result_name[5] = {
-    "jlif_key_stop",
-    "jlif_key_continue",
-    "jlif_key_child_inlink",
-    "jlif_key_child_outlink",
-    "jlif_key_child_fwdlink"
-};
-
 #define CALL_OR_STOP(routine) !(routine) ? jlif_stop : (routine)
 
 static int dbjl_return(parseContext *parser, jlif_result result) {
@@ -59,8 +45,8 @@ static int dbjl_return(parseContext *parser, jlif_result result) {
 
     IFDEBUG(10) {
         printf("dbjl_return(%s@%p, %d)\t", pjlink ? pjlink->pif->name : "", pjlink, result);
-        printf("    jsonDepth=%d, parseDepth=%d, dbfType=%d\n",
-            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->dbfType);
+        printf("    jsonDepth=%d, parseDepth=%d, key_is_link=%d\n",
+            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->key_is_link);
     }
 
     if (result == jlif_stop && pjlink) {
@@ -73,9 +59,6 @@ static int dbjl_return(parseContext *parser, jlif_result result) {
         pjlink->pif->free_jlink(pjlink);
     }
 
-    IFDEBUG(10)
-        printf("    returning %d %s\n", result,
-            result == jlif_stop ? "*** STOP ***" : "Continue");
     return result;
 }
 
@@ -85,8 +68,8 @@ static int dbjl_value(parseContext *parser, jlif_result result) {
 
     IFDEBUG(10) {
         printf("dbjl_value(%s@%p, %d)\t", pjlink ? pjlink->pif->name : "", pjlink, result);
-        printf("    jsonDepth=%d, parseDepth=%d, dbfType=%d\n",
-            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->dbfType);
+        printf("    jsonDepth=%d, parseDepth=%d, key_is_link=%d\n",
+            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->key_is_link);
     }
 
     if (result == jlif_stop || pjlink->parseDepth > 0)
@@ -98,6 +81,7 @@ static int dbjl_value(parseContext *parser, jlif_result result) {
     } else if (parent->pif->end_child) {
         parent->pif->end_child(parent, pjlink);
     }
+    pjlink->debug = 0;
 
     parser->pjlink = parent;
 
@@ -175,46 +159,29 @@ static int dbjl_start_map(void *ctx) {
     if (!pjlink) {
         IFDEBUG(10) {
             printf("dbjl_start_map(NULL)\t");
-            printf("    jsonDepth=%d, parseDepth=00, dbfType=%d\n",
-                parser->jsonDepth, parser->dbfType);
+            printf("    jsonDepth=%d, parseDepth=00, key_is_link=%d\n",
+                parser->jsonDepth, parser->key_is_link);
         }
 
         assert(parser->jsonDepth == 0);
         parser->jsonDepth++;
+        parser->key_is_link = 1;
         return jlif_continue; /* Opening '{' */
     }
 
     IFDEBUG(10) {
         printf("dbjl_start_map(%s@%p)\t", pjlink ? pjlink->pif->name : "", pjlink);
-        printf("    jsonDepth=%d, parseDepth=%d, dbfType=%d\n",
-            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->dbfType);
+        printf("    jsonDepth=%d, parseDepth=%d, key_is_link=%d\n",
+            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->key_is_link);
     }
 
     pjlink->parseDepth++;
     parser->jsonDepth++;
 
     result = CALL_OR_STOP(pjlink->pif->parse_start_map)(pjlink);
-    switch (result) {
-    case jlif_key_child_inlink:
-        parser->dbfType = DBF_INLINK;
+    if (result == jlif_key_child_link) {
+        parser->key_is_link = 1;
         result = jlif_continue;
-        break;
-    case jlif_key_child_outlink:
-        parser->dbfType = DBF_OUTLINK;
-        result = jlif_continue;
-        break;
-    case jlif_key_child_fwdlink:
-        parser->dbfType = DBF_FWDLINK;
-        result = jlif_continue;
-        break;
-    case jlif_key_stop:
-    case jlif_key_continue:
-        break;
-    default:
-        errlogPrintf("dbJLinkInit: Bad return %d from '%s'::parse_start_map()\n",
-            result, pjlink->pif->name);
-        result = jlif_stop;
-        break;
     }
 
     IFDEBUG(10)
@@ -229,9 +196,8 @@ static int dbjl_map_key(void *ctx, const unsigned char *key, size_t len) {
     char *link_name;
     linkSup *linkSup;
     jlif *pjlif;
-    jlink *child;
 
-    if (parser->dbfType == 0) {
+    if (!parser->key_is_link) {
         if (!pjlink) {
             errlogPrintf("dbJLinkInit: Illegal second link key '%.*s'\n",
                 (int) len, key);
@@ -241,8 +207,8 @@ static int dbjl_map_key(void *ctx, const unsigned char *key, size_t len) {
         IFDEBUG(10) {
             printf("dbjl_map_key(%s@%p, \"%.*s\")\t",
                 pjlink->pif->name, pjlink, (int) len, key);
-            printf("    jsonDepth=%d, parseDepth=%d, dbfType=%d\n",
-                parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->dbfType);
+            printf("    jsonDepth=%d, parseDepth=%d, key_is_link=%d\n",
+                parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->key_is_link);
         }
 
         assert(pjlink->parseDepth > 0);
@@ -253,8 +219,8 @@ static int dbjl_map_key(void *ctx, const unsigned char *key, size_t len) {
 
     IFDEBUG(10) {
         printf("dbjl_map_key(NULL, \"%.*s\")\t", (int) len, key);
-        printf("    jsonDepth=%d, parseDepth=00, dbfType=%d\n",
-            parser->jsonDepth, parser->dbfType);
+        printf("    jsonDepth=%d, parseDepth=00, key_is_link=%d\n",
+            parser->jsonDepth, parser->key_is_link);
     }
 
     link_name = dbmfStrndup((const char *) key, len);
@@ -275,35 +241,27 @@ static int dbjl_map_key(void *ctx, const unsigned char *key, size_t len) {
         return dbjl_return(parser, jlif_stop);
     }
 
-    child = pjlif->alloc_jlink(parser->dbfType);
-    if (!child) {
-        errlogPrintf("dbJLinkInit: Link type '%s' allocation failed. \n",
-            link_name);
-        dbmfFree(link_name);
+    dbmfFree(link_name);
+
+    pjlink = pjlif->alloc_jlink(parser->dbfType);
+    if (!pjlink) {
+        errlogPrintf("dbJLinkInit: Out of memory\n");
         return dbjl_return(parser, jlif_stop);
     }
-
-    child->pif = pjlif;
-    child->parseDepth = 0;
-    child->debug = 0;
+    pjlink->pif = pjlif;
+    pjlink->parent = NULL;
+    pjlink->parseDepth = 0;
+    pjlink->debug = !!parser->lset_debug;
 
     if (parser->pjlink) {
         /* We're starting a child link, save its parent */
-        child->parent = pjlink;
-
-        if (pjlink->pif->start_child)
-            pjlink->pif->start_child(pjlink, child);
+        pjlink->parent = parser->pjlink;
     }
-    else
-        child->parent = NULL;
-
-    parser->pjlink = child;
-    parser->dbfType = 0;
-
-    dbmfFree(link_name);
+    parser->pjlink = pjlink;
+    parser->key_is_link = 0;
 
     IFDEBUG(8)
-        printf("dbjl_map_key: New %s@%p\n", child ? child->pif->name : "", child);
+        printf("dbjl_map_key: New %s@%p\n", pjlink ? pjlink->pif->name : "", pjlink);
 
     return jlif_continue;
 }
@@ -316,9 +274,9 @@ static int dbjl_end_map(void *ctx) {
     IFDEBUG(10) {
         printf("dbjl_end_map(%s@%p)\t",
             pjlink ? pjlink->pif->name : "NULL", pjlink);
-        printf("    jsonDepth=%d, parseDepth=%d, dbfType=%d\n",
+        printf("    jsonDepth=%d, parseDepth=%d, key_is_link=%d\n",
             parser->jsonDepth, pjlink ? pjlink->parseDepth : 0,
-            parser->dbfType);
+            parser->key_is_link);
     }
 
     parser->jsonDepth--;
@@ -340,8 +298,8 @@ static int dbjl_start_array(void *ctx) {
 
     IFDEBUG(10) {
         printf("dbjl_start_array(%s@%p)\t", pjlink ? pjlink->pif->name : "", pjlink);
-        printf("    jsonDepth=%d, parseDepth=%d, dbfType=%d\n",
-            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->dbfType);
+        printf("    jsonDepth=%d, parseDepth=%d, key_is_link=%d\n",
+            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->key_is_link);
     }
 
     assert(pjlink);
@@ -358,8 +316,8 @@ static int dbjl_end_array(void *ctx) {
 
     IFDEBUG(10) {
         printf("dbjl_end_array(%s@%p)\t", pjlink ? pjlink->pif->name : "", pjlink);
-        printf("    jsonDepth=%d, parseDepth=%d, dbfType=%d\n",
-            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->dbfType);
+        printf("    jsonDepth=%d, parseDepth=%d, key_is_link=%d\n",
+            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->key_is_link);
     }
 
     assert(pjlink);
@@ -377,7 +335,7 @@ static yajl_callbacks dbjl_callbacks = {
 };
 
 long dbJLinkParse(const char *json, size_t jlen, short dbfType,
-    jlink **ppjlink)
+    jlink **ppjlink, unsigned opts)
 {
     parseContext context, *parser = &context;
     yajl_alloc_funcs dbjl_allocs;
@@ -389,14 +347,17 @@ long dbJLinkParse(const char *json, size_t jlen, short dbfType,
     parser->product = NULL;
     parser->dbfType = dbfType;
     parser->jsonDepth = 0;
+    parser->key_is_link = 0;
+    parser->parse_debug = !!(opts&LINK_DEBUG_JPARSE);
+    parser->lset_debug = !!(opts&LINK_DEBUG_LSET);
 
     IFDEBUG(10)
         printf("dbJLinkInit(\"%.*s\", %d, %p)\n",
             (int) jlen, json, dbfType, ppjlink);
 
     IFDEBUG(10)
-        printf("dbJLinkInit: jsonDepth=%d, dbfType=%d\n",
-            parser->jsonDepth, parser->dbfType);
+        printf("dbJLinkInit: jsonDepth=%d, key_is_link=%d\n",
+            parser->jsonDepth, parser->key_is_link);
 
     yajl_set_default_alloc_funcs(&dbjl_allocs);
     yh = yajl_alloc(&dbjl_callbacks, &dbjl_allocs, parser);
@@ -404,14 +365,8 @@ long dbJLinkParse(const char *json, size_t jlen, short dbfType,
         return S_db_noMemory;
 
     ys = yajl_parse(yh, (const unsigned char *) json, jlen);
-    IFDEBUG(10)
-        printf("dbJLinkInit: yajl_parse() returned %d\n", ys);
-
-    if (ys == yajl_status_ok) {
+    if (ys == yajl_status_ok)
         ys = yajl_complete_parse(yh);
-        IFDEBUG(10)
-            printf("dbJLinkInit: yajl_complete_parse() returned %d\n", ys);
-    }
 
     switch (ys) {
         unsigned char *err;
@@ -423,9 +378,6 @@ long dbJLinkParse(const char *json, size_t jlen, short dbfType,
         break;
 
     case yajl_status_error:
-        IFDEBUG(10)
-            printf("    jsonDepth=%d, product=%p, pjlink=%p\n",
-                parser->jsonDepth, parser->product, parser->pjlink);
         err = yajl_get_error(yh, 1, (const unsigned char *) json, jlen);
         errlogPrintf("dbJLinkInit: %s\n", err);
         yajl_free_error(yh, err);
@@ -437,24 +389,18 @@ long dbJLinkParse(const char *json, size_t jlen, short dbfType,
     }
 
     yajl_free(yh);
-
-    IFDEBUG(10)
-        printf("dbJLinkInit: returning status=0x%lx\n\n",
-            status);
-
     return status;
 }
 
 long dbJLinkInit(struct link *plink)
 {
+    jlink *pjlink;
+
     assert(plink);
+    pjlink = plink->value.json.jlink;
 
-    if (plink->type == JSON_LINK) {
-        jlink *pjlink = plink->value.json.jlink;
-
-        if (pjlink)
-            plink->lset = pjlink->pif->get_lset(pjlink);
-    }
+    if (pjlink)
+        plink->lset = pjlink->pif->get_lset(pjlink);
 
     dbLinkOpen(plink);
     return 0;