Clear version snapshot for final release

Add proper equals() method for DBD::Recfield and DBD::Recordtype.
In Parser::parse_recordtype() check for and re-use a declaration
(i.e. an empty recordtype object) when parsing a later definition
of the same recordtype.

.ci/checkout-modules.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# Checkout submodules on their appropriate branches
-#
-
-git submodule foreach '\
-    git checkout `git config -f $toplevel/.gitmodules submodule.$name.branch` && \
-    git pull '

.ci/travis-prepare.sh

@@ -1,46 +0,0 @@
-#!/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

.gitattributes

@@ -1,5 +0,0 @@
-.ci/          export-ignore
-.tools/       export-ignore
-.appveyor.yml export-ignore
-.travis.yml   export-ignore
-README        export-subst

.gitignore

@@ -7,8 +7,6 @@
 /include/
 /templates/
 /configure/*.local
-/modules/RELEASE.*.local
-/modules/Makefile.local
 O.*/
 /QtC-*
 *.orig

.gitmodules

@@ -1,24 +0,0 @@
-[submodule "modules/pvData"]
-    path = modules/pvData
-    url = https://github.com/epics-base/pvDataCPP
-    branch = master
-[submodule "modules/pvAccess"]
-    path = modules/pvAccess
-    url = https://github.com/epics-base/pvAccessCPP
-    branch = master
-[submodule "modules/normativeTypes"]
-    path = modules/normativeTypes
-    url = https://github.com/epics-base/normativeTypesCPP
-    branch = master
-[submodule "modules/pvaClient"]
-    path = modules/pvaClient
-    url = https://github.com/epics-base/pvaClientCPP
-    branch = master
-[submodule "modules/pvDatabase"]
-    path = modules/pvDatabase
-    url = https://github.com/epics-base/pvDatabaseCPP
-    branch = master
-[submodule "modules/pva2pva"]
-    path = modules/pva2pva
-    url = https://github.com/epics-base/pva2pva
-    branch = master

.tools/make-tar.sh

@@ -1,109 +0,0 @@
-#!/bin/sh
-#
-# Make tar for git repo w/ one level of sub modules.
-#
-set -e
-
-die() {
-  echo "$1" >&2
-  exit 1
-}
-
-TOPREV="$1"
-FINALTAR="$2"
-PREFIX="$3"
-
-if ! [ "$TOPREV" ]
-then
-   cat <<EOF >&2
-usage: $0 [rev] [outfile.tar.gz] [prefix/]
-
-  <rev> may be any git revision spec. (tag, branch, or commit id).
-
-  Output file may be .tar.gz, .tar.bz2, or any extension supported by "tar -a".
-  If output file name is omitted, "base-<rev>.tar.gz" will be used.
-  If <prefix> is omitted, the default prefix is "base-<rev>/".
-EOF
-   exit 1
-fi
-
-[ "$FINALTAR" ] || FINALTAR="base-$TOPREV.tar.gz"
-[ "$PREFIX" ] || PREFIX="base-$TOPREV/"
-
-case "$PREFIX" in
-*/) ;;
-*)  die "Prefix must end with '/'";;
-esac
-
-# Check for both <tag> and R<tag>
-if ! [ `git tag -l $TOPREV` ]
-then
-  if [ `git tag -l R$TOPREV` ]
-  then
-    TOPREV="R$TOPREV"
-  else
-    die "No tags exist '$TOPREV' or 'R$TOPREV'"
-  fi
-fi
-
-# temporary directory w/ automatic cleanup
-TDIR=`mktemp -d`
-trap 'rm -rf "$TDIR"' EXIT INT QUIT TERM
-
-mkdir "$TDIR"/tar
-
-echo "Exporting revision $TOPREV as $FINALTAR with prefix $PREFIX"
-
-# Use git-archive to copy files at the given revision into our temp. dir.
-# Respects 'export-exclude' in .gitattributes files.
-
-git archive --prefix=$PREFIX $TOPREV | tar -C "$TDIR"/tar -x
-
-# use ls-tree instead of submodule-foreach to capture submodule revision associated with supermodule rev.
-#
-# sub-modules appear in tree as eg.:
-#  160000 commit c3a6cfcf0dad4a4eeecf59b474710d06ff3eb68a  modules/ca
-git ls-tree -r $TOPREV | awk '/^[0-9]+ commit / {print $3, $4}' | \
-while read HASH MODDIR
-do
-    echo "Visiting $HASH $MODDIR"
-    git -C $MODDIR archive --prefix=${PREFIX}${MODDIR}/ $HASH | tar -C "$TDIR"/tar -x
-done
-
-# make a list of files copied and filter out undesirables
-
-(cd "$TDIR"/tar && find . -mindepth 1 -not -type d) > "$TDIR"/list.1
-
-# Remove leading ./ from filenames
-sed -i -e 's|^\./||' "$TDIR"/list.1
-
-# Exclude files
-sed \
-  -e '/\/\.\?ci\//d' \
-  -e '/\/\.tools\//d' \
-  -e '/\/jenkins\//d' \
-  -e '/\/\.git/d' \
-  -e '/\/\.project$/d' \
-  -e '/\/\.travis\.yml$/d' \
-  -e '/\/\.appveyor\.yml$/d' \
-  "$TDIR"/list.1 > "$TDIR"/list.2
-
-if ! diff -U 0 "$TDIR"/list.1 "$TDIR"/list.2
-then
-    echo "Excluding the files shown above"
-fi
-
-# Use the filtered list to build the final tar
-#  The -a option chooses compression automatically based on output file name.
-
-tar -C "$TDIR"/tar --files-from="$TDIR"/list.2 -caf "$FINALTAR"
-
-echo "Wrote $FINALTAR"
-
-tar -taf "$FINALTAR" > "$TDIR"/list.3
-
-# make sure we haven't picked up anything extra
-if ! diff -u "$TDIR"/list.2 "$TDIR"/list.3
-then
-    echo "Oops! Tarfile diff against plan shown above"
-fi

.travis.yml

@@ -3,6 +3,16 @@ dist: trusty
 language: c
 compiler:
   - gcc
+env:
+  - CMPLR=gcc
+  - CMPLR=gcc EXTRA=CMD_CXXFLAGS=-std=c++11
+  - CMPLR=gcc STATIC=YES
+  - CMPLR=clang
+  - CMPLR=clang STATIC=YES
+  - WINE=32 TEST=NO STATIC=YES
+  - WINE=32 TEST=NO STATIC=NO
+  - RTEMS=4.10 TEST=YES
+  - RTEMS=4.9 TEST=YES
 addons:
   apt:
     packages:
@@ -15,19 +25,8 @@ addons:
     - flex
     - texinfo
     - install-info
+    - qemu-system-x86
 cache:
   directories:
    - $HOME/.cache
-install:
- - ./.ci/travis-prepare.sh
-script:
- - ./.ci/travis-build.sh
-env:
- - 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
+script: sh ci/travis-build.sh </dev/null

Makefile

@@ -4,7 +4,7 @@
 # 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 file LICENSE that is included with this distribution.
+# in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
 TOP = .
@@ -14,19 +14,8 @@ include $(TOP)/configure/CONFIG
 TOOLS = $(TOP)/src/tools
 
 DIRS += configure src
+
 src_DEPEND_DIRS = configure
 
-DIRS += test
-test_DEPEND_DIRS = src
-
-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)

README

@@ -22,6 +22,3 @@ training materials, additional components, links to other
 websites etc. is available on the EPICS home page at
 	https://epics.anl.gov/
 
-$Format:%cD$
-$Format:%H$
-https://code.launchpad.net/epics-base

appveyor.yml

@@ -16,7 +16,7 @@ init:
   - git config --global core.autocrlf true
 
 # Set clone depth (do not fetch complete history)
-clone_depth: 50
+clone_depth: 2
 
 # Skipping commits affecting only specific files
 skip_commits:
@@ -66,14 +66,13 @@ matrix:
 #---------------------------------#
 
 install:
-  - cmd: git submodule update --init --recursive
-  - cmd: .ci/appveyor-prepare.bat
+  - cmd: ci/appveyor-prepare.bat
 
 build_script:
-  - cmd: .ci/appveyor-make.bat
+  - cmd: ci/appveyor-make.bat
 
 test_script:
-  - cmd: .ci/appveyor-make.bat runtests
+  - cmd: ci/appveyor-make.bat runtests
 
 #---------------------------------#
 #         notifications           #

ci/travis-build.sh

@@ -6,18 +6,9 @@ die() {
   exit 1
 }
 
-ticker() {
-  while true
-  do
-    sleep 60
-    date -R
-    [ -r "$1" ] && tail -n10 "$1"
-  done
-}
-
 CACHEKEY=1
 
-EPICS_HOST_ARCH=`sh startup/EpicsHostArch`
+EPICS_HOST_ARCH=`perl src/tools/EpicsHostArch.pl`
 
 [ -e configure/os/CONFIG_SITE.Common.linux-x86 ] || die "Wrong location: $PWD"
 
@@ -62,29 +53,28 @@ if [ -n "$RTEMS" ]
 then
   echo "Cross RTEMS${RTEMS} for pc386"
   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
+  curl -L "https://github.com/mdavidsaver/rsb/releases/download/20171203-${RTEMS}/i386-rtems${RTEMS}-trusty-20171203-${RTEMS}.tar.bz2" \
+  | tar -C / -xmj
 
   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/travis/.cache/rtems${RTEMS}-i386
+RTEMS_BASE=/home/travis/.rtems
 EOF
   cat << EOF >> configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
+CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386-qemu
+CROSS_COMPILER_RUNTEST_ARCHS += RTEMS-pc386-qemu
 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
 
 if [ "$TEST" != "NO" ]
 then
-   make -j2 tapfiles
+   make tapfiles
    make -s test-results
 fi

configure/CONFIG

@@ -20,11 +20,14 @@ else
 endif
 
 # Provide a default if the user hasn't set EPICS_HOST_ARCH
-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)
+#
+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 :=
 endif
 
 -include $(CONFIG)/RELEASE

configure/CONFIG_ADDONS

@@ -4,7 +4,7 @@
 # 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 file LICENSE that is included with this distribution.
+# in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
 #	check for add-on CFLAGS and CXXFLAGS
@@ -37,6 +37,9 @@
 #    PROD_LIBS     libs needed by PROD and TESTPROD
 #    LIB_LIBS      libs needed by shared LIBRARY
 #    SHRLIB_LIBS   libs needed by shared LIBRARY
+#    USR_OBJLIBS   R3.13 vxWorks object libs needed building libraries and prods
+#    PROD_OBJLIBS  R3.13 vxWorks object    libs needed for building prods
+#    LIB_OBJLIBS   R3.13 vxWorks object libs needed for building libraries
 #    USR_SYS_LIBS  system libs needed building libraries and prods
 #    PROD_SYS_LIBS system libs needed for building prods
 #    LIB_SYS_LIBS  system libs needed for building libraries
@@ -270,6 +273,30 @@ OBJS_HOST+=$(OBJS_HOST_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(PROD_OBJLIBS_$(OS_CLASS))),)
+PROD_OBJLIBS+=$(subst -nil-,,$(PROD_OBJLIBS_$(OS_CLASS)))
+else
+ifdef PROD_OBJLIBS_DEFAULT
+PROD_OBJLIBS+=$(PROD_OBJLIBS_DEFAULT)
+endif
+endif
+
+ifneq ($(strip $(LIB_OBJLIBS_$(OS_CLASS))),)
+LIB_OBJLIBS+=$(subst -nil-,,$(LIB_OBJLIBS_$(OS_CLASS)))
+else
+ifdef LIB_OBJLIBS_DEFAULT
+LIB_OBJLIBS+=$(LIB_OBJLIBS_DEFAULT)
+endif
+endif
+
+ifneq ($(strip $(USR_OBJLIBS_$(OS_CLASS))),)
+USR_OBJLIBS+=$(subst -nil-,,$(USR_OBJLIBS_$(OS_CLASS)))
+else
+ifdef USR_OBJLIBS_DEFAULT
+USR_OBJLIBS+=$(USR_OBJLIBS_DEFAULT)
+endif
+endif
+
 ifneq ($(strip $(LIB_OBJS_$(OS_CLASS))),)
 LIB_OBJS+=$(subst -nil-,,$(LIB_OBJS_$(OS_CLASS)))
 else
@@ -554,3 +581,4 @@ ifdef LIB_RCS_DEFAULT
 LIB_RCS+=$(LIB_RCS_DEFAULT)
 endif
 endif
+

configure/CONFIG_BASE

@@ -4,7 +4,7 @@
 # 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 file LICENSE that is included with this distribution.
+# in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
 #---------------------------------------------------------------
@@ -17,6 +17,17 @@ ifdef T_A
   EPICS_BASE_BIN    = $(EPICS_BASE)/bin/$(T_A)
 endif
 
+#---------------------------------------------------------------
+# EPICS Base Ioc libraries 
+
+EPICS_BASE_IOC_LIBS += dbRecStd dbCore ca Com 
+
+#---------------------------------------------------------------
+# EPICS Base Host libraries 
+
+EPICS_BASE_HOST_LIBS += cas gdd
+EPICS_BASE_HOST_LIBS += ca Com
+
 #---------------------------------------------------------------
 # Version number for base shared libraries (and win32 products)
 
@@ -25,8 +36,18 @@ ifdef BASE_TOP
   SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
   # Windows only allows 2 levels of version numbering
   PROD_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
+  BASE_CPPFLAGS += -DUSE_TYPED_RSET
 endif # BASE_TOP
 
+#---------------------------------------------------------------
+# Base c preprocessor flags
+
+# osithread default stack
+OSITHREAD_USE_DEFAULT_STACK = NO
+OSITHREAD_DEFAULT_STACK_FLAGS_YES = -DOSITHREAD_USE_DEFAULT_STACK
+
+BASE_CPPFLAGS += $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))
+
 #---------------------------------------------------------------
 # Where to find the installed build tools
 #   Windows does not like commands with relative paths starting ../
@@ -38,11 +59,15 @@ FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(TOP)/src/tools/$(1)))
 #---------------------------------------------------------------
 # EPICS Base build tools and tool flags
 
-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)
+MAKEBPT                    = $(TOOLS)/makeBpt$(HOSTEXE)
+DBEXPAND                   = $(PERL) $(TOOLS)/dbdExpand.pl
+DBTORECORDTYPEH            = $(PERL) $(TOOLS)/dbdToRecordtypeH.pl
+DBTOMENUH                  = $(PERL) $(TOOLS)/dbdToMenuH.pl
+REGISTERRECORDDEVICEDRIVER = $(PERL) $(TOOLS)/registerRecordDeviceDriver.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)
 
 #---------------------------------------------------------------
 # tools for installing libraries and products
@@ -51,6 +76,19 @@ INSTALL_PRODUCT = $(INSTALL)
 INSTALL_LIBRARY = $(INSTALL)
 
 #---------------------------------------------------------------
-# tools for making header dependencies and variable replacement
-MKMF       = $(PERL) $(TOOLS)/mkmf.pl
-REPLACEVAR = $(PERL) $(TOOLS)/replaceVAR.pl
+# tools for making header dependancies and variable replacement
+MKMF                       = $(PERL) $(TOOLS)/mkmf.pl
+REPLACEVAR                 = $(PERL) $(TOOLS)/replaceVAR.pl
+
+#---------------------------------------------------------------
+# Our versions of lex (flex) and yacc (antelope)
+EYACC = $(TOOLS)/antelope$(HOSTEXE)
+ELEX = $(TOOLS)/e_flex$(HOSTEXE) -S$(EPICS_BASE)/include/flex.skel.static
+
+YACC  = $(EYACC)
+LEX   = $(ELEX)
+
+#---------------------------------------------------------------
+# The 3.15 version of msi supports new options
+
+MSI3_15 = $(EPICS_BASE_HOST_BIN)/msi

configure/CONFIG_BASE_VERSION

@@ -29,24 +29,23 @@
 
 BASE_3_14 = NO
 BASE_3_15 = NO
-BASE_3_16 = NO
-BASE_7_0  = YES
+BASE_3_16 = YES
 
 # EPICS_VERSION must be a number >0 and <256
-EPICS_VERSION = 7
+EPICS_VERSION = 3
 
 # EPICS_REVISION must be a number >=0 and <256
-EPICS_REVISION = 0
+EPICS_REVISION = 16
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 1
+EPICS_MODIFICATION = 2
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included if zero
-EPICS_PATCH_LEVEL = 2
+EPICS_PATCH_LEVEL = 0
 
 # 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
@@ -55,7 +54,7 @@ EPICS_DEV_SNAPSHOT=-DEV
 #EPICS_DEV_SNAPSHOT=-rc1-DEV
 #EPICS_DEV_SNAPSHOT=-rc2
 #EPICS_DEV_SNAPSHOT=-rc2-DEV
-#EPICS_DEV_SNAPSHOT=
+EPICS_DEV_SNAPSHOT=
 
 # No changes should be needed below here
 

configure/CONFIG_COMMON

@@ -4,7 +4,7 @@
 # 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 file LICENSE that is included with this distribution.
+# in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
 #  CONFIG_COMMON
@@ -76,10 +76,14 @@ COMMON_DIR = ../O.Common
 IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
 
 #-------------------------------------------------------
-# Make echo output - suppress echoing if make's '-s' flag is set
+# Silencing the build - suppress messages during 'make -s'
 NOP = :
-ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
-QUIET_FLAG := $(if $(findstring s,$(MAKEFLAGS)),-q,)
+ECHO = @$(if $(findstring s,$(MFLAGS)),$(NOP),echo)
+QUIET_FLAG := $(if $(findstring s,$(MFLAGS)),-q,)
+
+#-------------------------------------------------------
+# Convert 'make -q' flag into '-i' for genVersionHeader.pl
+QUESTION_FLAG := $(if $(findstring q,$(MFLAGS)),-i,)
 
 #-------------------------------------------------------
 ifdef T_A
@@ -89,7 +93,7 @@ INSTALL_SHRLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_TCLLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_BIN                 = $(INSTALL_LOCATION_BIN)/$(T_A)
 
-#Directories for libraries
+# Directories for libraries
 SHRLIB_SEARCH_DIRS          = $(INSTALL_LIB)
 
 #-------------------------------------------------------
@@ -163,13 +167,13 @@ TESTSHRLIBNAME = $(TESTSHRLIBNAME_$(SHARED_LIBRARIES))
 #--------------------------------------------------
 # obj files
 
-TARGET_OBJS =  $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS) $($*_SRCS)))
+TARGET_OBJS =  $($*_OBJLIBS) $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS) $($*_SRCS)))
 
 PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(USR_OBJS) $(PROD_OBJS)))
-PROD_LD_OBJS = $(TARGET_OBJS) $(PRODUCT_OBJS)
+PROD_LD_OBJS = $(USR_OBJLIBS) $(PROD_OBJLIBS) $(TARGET_OBJS) $(PRODUCT_OBJS)
 
 LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(LIB_SRCS) $(LIBSRCS) $(USR_OBJS) $(LIB_OBJS)))
-LIBRARY_LD_OBJS = $(TARGET_OBJS) $(LIBRARY_OBJS)
+LIBRARY_LD_OBJS = $(USR_OBJLIBS) $(LIB_OBJLIBS) $(TARGET_OBJS) $(LIBRARY_OBJS)
 
 #--------------------------------------------------
 # Windows resource files
@@ -261,7 +265,7 @@ LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRA
 LIBRARY_SRC_CFLAGS=$($(patsubst $*,SHRLIB,$(findstring $*,$(LIBRARY_SRCS)))_CFLAGS)
 
 #--------------------------------------------------
-# prefix, suffix, and ldflags for loadable shared libraries
+# prefix, suffix, and ldflags for loadable shared libraries 
 TARGET_LIB_LDFLAGS=$($(patsubst $*,LOADABLE_,$(findstring $*,$(LOADABLE_LIBRARY)))SHRLIB_LDFLAGS)
 LOADABLE_SHRLIB_PREFIX=$(SHRLIB_PREFIX)
 LOADABLE_SHRLIB_SUFFIX=$(SHRLIB_SUFFIX)
@@ -459,5 +463,5 @@ COMMON_INC += $(filter $(COMMON_DIR)/%, $(foreach file, $(INC), \
 SOURCE_INC = $(wildcard $(file) $(SOURCE_INC_bbb) )
 SOURCE_INC_bbb = $(foreach dir, $(ALL_SRC_DIRS), $(SOURCE_INC_aaa)  )
 SOURCE_INC_aaa = $(addsuffix /$(file), $(dir) )
-
+ 
 endif

configure/CONFIG_ENV

@@ -47,9 +47,6 @@ EPICS_CAS_SERVER_PORT=
 EPICS_CAS_INTF_ADDR_LIST=""
 EPICS_CAS_IGNORE_ADDR_LIST=""
 
-# Servers to disable
-EPICS_IOC_IGNORE_SERVERS=""
-
 # Log Server:
 # EPICS_IOC_LOG_PORT Log server port number etc.
 EPICS_IOC_LOG_PORT=7004

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:=$(shell date +%Y-%m)
+EPICS_SITE_VERSION =
 
 # For GNU compiler, use pipes rather than temporary files for
 #  communication between the various stages of compilation.

configure/RULES

@@ -1,11 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
 ifndef T_A

configure/RULES.Db

@@ -4,9 +4,10 @@
 # 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 file LICENSE that is included with this distribution. 
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
-#RULES.Db
+
+# RULES.Db
 
 # Set db substitutions and template file suffixes
 SUBST_SUFFIX ?= .substitutions
@@ -428,30 +429,30 @@ $(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))
 #---------------------------------------------------------------
 # HTML files
 
-$(COMMON_DIR)/%.html: %.dbd.pod
+$(COMMON_DIR)/%.html: %.dbd.pod $(TOOLS)/dbdToHtml.pl
 	@$(RM) $(notdir $@)
-	$(DBDTOHTML) $(DBDFLAGS) -o $(notdir $@) $<
+	$(PERL) $(TOOLS)/dbdToHtml.pl $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: %.pod
+$(COMMON_DIR)/%.html: %.pod $(TOOLS)/podToHtml.pl
 	@$(RM) $(notdir $@)
-	$(PODTOHTML) -o $(notdir $@) $<
+	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: %.pm
+$(COMMON_DIR)/%.html: %.pm $(TOOLS)/podToHtml.pl
 	@$(RM) $(notdir $@)
-	$(PODTOHTML) -o $(notdir $@) $<
+	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: ../%.pm
+$(COMMON_DIR)/%.html: ../%.pm $(TOOLS)/podToHtml.pl
 	@$(RM) $(notdir $@)
-	$(PODTOHTML) -s -o $(notdir $@) $<
+	$(PERL) $(TOOLS)/podToHtml.pl -s -o $(notdir $@) $<
 	@$(MKDIR) $(dir $@)
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: ../%.pl
+$(COMMON_DIR)/%.html: ../%.pl $(TOOLS)/podToHtml.pl
 	@$(RM) $(notdir $@)
-	$(PODTOHTML) -s -o $(notdir $@) $<
+	$(PERL) $(TOOLS)/podToHtml.pl -s -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
 .PRECIOUS: $(COMMON_DIR)/%.html %.html

configure/RULES.ioc

@@ -4,9 +4,10 @@
 # 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 file LICENSE that is included with this distribution.
+# in the file LICENSE that is included with this distribution. 
 #*************************************************************************
-#RULES.ioc
+
+# RULES.ioc
 
 include $(CONFIG)/RULES_DIRS
 

configure/RULES_ARCHS

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

configure/RULES_BUILD

@@ -6,11 +6,12 @@
 # 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
 #
-#	Rules for making things specified in Makefile
-#
-#	we are in O.$(T_A), but most sources are elsewhere
-#
+# CWD is O.$(T_A), but most sources are elsewhere
 
 ifndef BASE_RULES_BUILD
 BASE_RULES_BUILD=1
@@ -42,6 +43,7 @@ LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_HOST)
 OBJS += $(OBJS_HOST)
 PROD += $(PROD_HOST)
 SCRIPTS += $(SCRIPTS_HOST)
+TARGETS += $(TARGETS_HOST)
 TESTLIBRARY += $(TESTLIBRARY_HOST)
 TESTSCRIPTS += $(TESTSCRIPTS_HOST)
 TESTPROD += $(TESTPROD_HOST)
@@ -53,6 +55,7 @@ LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_IOC)
 OBJS += $(OBJS_IOC)
 PROD += $(PROD_IOC)
 SCRIPTS += $(SCRIPTS_IOC)
+TARGETS += $(TARGETS_IOC)
 TESTLIBRARY += $(TESTLIBRARY_IOC)
 TESTSCRIPTS += $(TESTSCRIPTS_IOC)
 TESTPROD += $(TESTPROD_IOC)
@@ -79,26 +82,9 @@ else
 host:
 endif
 
--include $(CONFIG)/RULES_FILE_TYPE
+include $(CONFIG)/RULES_FILE_TYPE
 
--include $(CONFIG)/RULES.Db
-
-#---------------------------------------------------------------
-# Do not build anything if current path matches SKIP_BUILD
-
-ifneq (,$(strip $(SKIP_BUILDS)))
-CURRENT_MODULE=$(subst $(realpath $(TOP)/..)/,,$(subst $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)/,,$(realpath ..)))
-ifneq ($(filter $(SKIP_BUILDS) $(addsuffix /%,$(SKIP_BUILDS)),$(CURRENT_MODULE)),)
-$(info Skipping $(CURRENT_MODULE) for $(T_A))
-PROD=
-TESTPROD=
-LIBRARY=
-TESTLIBRARY=
-LOADABLE_LIBRARY=
-TESTS=
-SRC_FILES=
-endif
-endif
+include $(CONFIG)/RULES.Db
 
 #---------------------------------------------------------------
 # Include defines and rules for prod, library and test* targets
@@ -202,7 +188,7 @@ endif
 
 # RELEASE file consistency checking
 checkRelease:
-	$(CONVERTRELEASE) checkRelease
+	+$(CONVERTRELEASE) checkRelease
 warnRelease:
 	-$(CONVERTRELEASE) checkRelease
 noCheckRelease:
@@ -273,15 +259,13 @@ YACCOPT ?= $($*_YACCOPT)
 	$(MV) $*.tab.c $*.c
 	$(if $(findstring -d, $(YACCOPT)),$(MV) $*.tab.h $*.h,)
 
-# must be a seperate rule since when not using '-d' the
+# must be a separate 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) $@
-	$(MV) $*.yy.c $@
+	$(LEX) $(LEXOPT) -o$@ $<
 
 #---------------------------------------------------------------
 # Libraries, shared/DLL and stubs
@@ -351,12 +335,6 @@ $(MODNAME): %$(MODEXT): %$(EXE)
 	@$(RM) $@
 	$(LINK.mod)
 
-#---------------------------------------------------------------
-# Generate Perl include path module
-%ModuleDirs.pm: $(wildcard $(TOP)/configure/RELEASE*)
-	@$(MKDIR) $(dir $@)
-	$(CONVERTRELEASE) -T $(TOP) $@
-
 #---------------------------------------------------------------
 # Automated testing
 
@@ -378,14 +356,17 @@ ifneq ($(TAPFILES),)
 ifdef RUNTESTS_ENABLED
 	prove --failures --ext .tap --exec "$(CAT)" --color $(TAPFILES)
 endif
+
+CURRENT_TAPFILES := $(wildcard $(TAPFILES))
+CURRENT_JUNITFILES := $(wildcard $(JUNITFILES))
 endif
 
 clean-tests:
-ifneq ($(TAPFILES),)
-	$(RM) $(TAPFILES)
+ifneq ($(CURRENT_TAPFILES),)
+	$(RM) $(CURRENT_TAPFILES)
 endif
-ifneq ($(JUNITFILES),)
-	$(RM) $(JUNITFILES)
+ifneq ($(CURRENT_JUNITFILES),)
+	$(RM) $(CURRENT_JUNITFILES)
 endif
 
 tapfiles: $(TESTSCRIPTS) $(TAPFILES)
@@ -403,13 +384,13 @@ endif
 # If there's a perl test script (.plt) available, use it
 %.t: ../%.plt
 	@$(RM) $@
-	$(EXPAND_TOOL) -t $(INSTALL_LOCATION) -a $(T_A) $< $@
+	$(CP) $< $@
 
 # Test programs (.t files) must be written in Perl.
 # Generate a perl program to exec the real test binary.
 %.t: %$(EXE) $(TOOLS)/makeTestfile.pl
 	@$(RM) $@
-	$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
+	$(PERL) $(TOOLS)/makeTestfile.pl $(T_A) $(EPICS_HOST_ARCH) $@ $<
 
 #---------------------------------------------------------------
 # Generate header with version number from VCS
@@ -494,7 +475,6 @@ ifneq (,$(strip $(LOADABLE_SHRLIB_VERSION)))
 endif # LOADABLE_SHRLIB_VERSION
 endif # LOADABLE_SHRLIB_SUFFIX
 
-ifneq ($(INSTALL_CONFIGS),)
 $(INSTALL_CONFIG)/%: %
 	$(ECHO) "Installing config file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
@@ -502,7 +482,6 @@ $(INSTALL_CONFIG)/%: %
 $(INSTALL_CONFIG)/%: ../%
 	$(ECHO) "Installing config file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
-endif
 
 $(INSTALL_INCLUDE)/% : $(COMMON_DIR)/%
 	$(ECHO) "Installing generated generic include file $@"
@@ -548,7 +527,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)
@@ -557,5 +536,9 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 .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

@@ -0,0 +1,35 @@
+#*************************************************************************
+# 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,7 +92,4 @@ $(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \
 .PHONY : $(dirActionArchTargets)
 .PHONY : $(actionArchTargets)
 
-
-#  User specific rules
-#
--include $(HOME)/configure/RULES_USER
+include $(CONFIG)/RULES_COMMON

configure/RULES_EXPAND

@@ -1,4 +1,13 @@
-# <top>/configure/RULES_EXPAND
+#*************************************************************************
+# 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
 
 vpath %@ $(USR_VPATH) $(ALL_SRC_DIRS)
 

configure/RULES_FILE_TYPE

@@ -7,9 +7,11 @@
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# Include <top>/configure/RULES_BUILD from tops defined in RELEASE* files
+# Include <top>/configure/RULES_BUILD from tops defined in RELEASE* files,
+# excluding EPICS_BASE
 #
-RELEASE_RULES_BUILDS = $(foreach top, $(RELEASE_TOPS), \
+RELEASE_RULES_BUILDS = $(foreach top, \
+    $(filter-out EPICS_BASE, $(RELEASE_TOPS)), \
     $(wildcard $($(top))/configure/RULES_BUILD))
 ifneq ($(RELEASE_RULES_BUILDS),)
   include $(RELEASE_RULES_BUILDS)
@@ -23,7 +25,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)
@@ -67,7 +69,3 @@ 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,11 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution. 
 #*************************************************************************
 
 # Octave definitions and rules

configure/RULES_TARGET

@@ -1,18 +1,13 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
-#
-#  RULES_TARGET
-#
-#  This file is to be maintained by the community.
-#
-#-----------------------------------------------------------------------
+
+# RULES_TARGET
 
 define TARGET_template
 $(1)_$(2) += $$(if $$(strip $$($(1)_$(2)_$$(OS_CLASS))), \
@@ -20,7 +15,7 @@ $(1)_$(2) += $$(if $$(strip $$($(1)_$(2)_$$(OS_CLASS))), \
              $$($(1)_$(2)_DEFAULT))
 endef
 
-$(foreach type, SRCS RCS OBJS LDFLAGS LDOBJS SYS_LIBS , \
+$(foreach type, SRCS RCS OBJS LDFLAGS OBJLIBS LDOBJS SYS_LIBS , \
 $(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY) , \
     $(eval $(call TARGET_template,$(strip $(target)),$(type)))))
 
@@ -152,3 +147,4 @@ $(foreach target, $(LOADABLE_LIBRARY), \
     $(eval $(call LOADABLE_LIBRARY_template,$(strip $(target)))))
 
 #-----------------------------------------------------------------------
+

configure/RULES_TOP

@@ -21,9 +21,6 @@ realuninstall: uninstallDirs
 
 UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC) \
     $(INSTALL_HTML) $(INSTALL_TEMPLATES) $(INSTALL_DB) $(DIRECTORY_TARGETS)
-ifneq ($(INSTALL_LOCATION),$(TOP))
-UNINSTALL_DIRS += $(INSTALL_CONFIG)
-endif
 uninstallDirs:
 	$(RMDIR) $(UNINSTALL_DIRS)
 

configure/os/CONFIG.Common.RHEL7-x86_64

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

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

configure/os/CONFIG.Common.RTEMS

@@ -27,9 +27,13 @@ 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)/$(subst RTEMS-,,$(T_A))/Makefile.inc
+include $(RTEMS_BASE)/$(RTEMS_TARGET_CPU)-rtems$(RTEMS_VERSION)/$(RTEMS_BSP)/Makefile.inc
 include $(RTEMS_CUSTOM)
 include $(CONFIG.CC)
 
@@ -72,7 +76,7 @@ CPPFLAGS += $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\
  $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\
  $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
 
-ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
+ECHO = @$(if $(findstring s,$(MFLAGS)),$(NOP),echo)
 
 #--------------------------------------------------
 # Although RTEMS uses gcc, it wants to use gcc its own way

configure/os/CONFIG.Common.RTEMS-at91rm9200ek

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

configure/os/CONFIG.Common.RTEMS-beatnik

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

configure/os/CONFIG.Common.RTEMS-mcp750

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

configure/os/CONFIG.Common.RTEMS-mvme167

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

configure/os/CONFIG.Common.RTEMS-mvme2100

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

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

@@ -0,0 +1,11 @@
+# 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,5 +5,6 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_TARGET_CPU=ppc
+RTEMS_BSP = psim
+RTEMS_TARGET_CPU = ppc
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-uC5282

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

@@ -1,6 +0,0 @@
-# Include definitions common to linux pentium targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86
-
-COMMANDLINE_LIBRARY = READLINE_NCURSES
-
-ARCH_DEP_CFLAGS += -march=i686

configure/os/CONFIG.Common.SL5-x86_64

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

configure/os/CONFIG.Common.SL6-x86

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

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

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

configure/os/CONFIG.Common.T2-ppc604

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

configure/os/CONFIG.Common.UnixCommon

@@ -18,10 +18,8 @@ OBJ = .o
 LIB_PREFIX = lib
 LIB_SUFFIX = .a
 SHRLIB_SUFFIX_BASE = .so
-#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)
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(SHRLIB_VERSION))
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
 LOADABLE_SHRLIB_PREFIX = lib
 
 #-------------------------------------------------------

configure/os/CONFIG.Common.V62-ppc604

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

configure/os/CONFIG.Common.V63-ppc603

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

configure/os/CONFIG.Common.V63-ppc604

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

configure/os/CONFIG.Common.V66-ppc603

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

configure/os/CONFIG.Common.V66-ppc604

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

configure/os/CONFIG.Common.V67-ppc604

@@ -1,5 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
-VXWORKS_VERSION = 6.7
-
-#needed when including memPartLib.h, e.g. through moduleLib.h or loadLib.h
-ARCH_DEP_CFLAGS += -D_VSB_CONFIG_FILE='<../lib/h/config/vsbConfig.h>'

configure/os/CONFIG.Common.eldk42-ppc4xxFP

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

configure/os/CONFIG.Common.eldk51-ppc4xxSF

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

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

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

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

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

configure/os/CONFIG.Common.moxa42-armv6l

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

configure/os/CONFIG.Common.mvl40-xscale_be

@@ -1,15 +0,0 @@
-# Moxa DA-66x with Montavista Linux 4.0
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-COMMANDLINE_LIBRARY = READLINE_CURSES
-
-ARCH_CLASS = xscale
-
-GNU_DIR=/afs/psi.ch/project/embeddedlinux/moxa/xscale_be/armv5teb-montavista-linuxeabi
-
-ARCH_DEP_CFLAGS += -funwind-tables
-
-# Cannot build PVA because of missing boost support
-SKIP_BUILDS = pv% normativeTypes

configure/os/CONFIG.Common.raspbian-arm

@@ -1,43 +0,0 @@
-# RaspberryPi with github.com/raspberrypi/tools toolchain
-# Tested on:
-# * Raspberry 3B+ Raspbian 9
-# * Raspberry 2   Raspbian 7
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-# Using readline:
-# Due to missing/messed up libs in the toolchain, readline needs copies of
-# libtinfo.so.5.9 and libreadline.so.6.2 from a Raspbian 7 rootfs 
-# /lib/arm-linux-gnueabihf/ to the toolchain, e.g.
-# $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf/
-# and manually created links libtinfo.so.5 and libreadline.so.
-# For gcc-linaro-arm-linux-gnueabihf-raspbian, an existing incompatible
-# libtinfo.so.5 is in the way. Remove it.
-# (Built with glibc 2.16 like installed on Raspbian 9 but toolchain uses glibc 2.13.)
-# Also copy /usr/include/readline/ directory from some readline 6 installation
-# to $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/usr/include/
-
-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,7 +63,6 @@ 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
@@ -74,17 +73,9 @@ 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_6 = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
-VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_MAJOR_VERSION))
+VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_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
@@ -94,21 +85,14 @@ endif
 
 #--------------------------------------------------
 # vxWorks directory definitions
-VX_DIR_5 = $(WIND_BASE)
-VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
-VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
+VX_DIR = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
 
-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
+GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
 
 #--------------------------------------------------
 # vxWorks GNU directories
 
-GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
-GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
-GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
+GNU_DIR = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
 
 #--------------------------------------------------
 # This finds nm on any supported VxWorks version
@@ -149,23 +133,12 @@ OPT_CXXFLAGS_YES = -O2
 # code flags
 CODE_CFLAGS =
 #
-# 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))
+# 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))
 
 #--------------------------------------------------
 # no shared libs for vxWorks
@@ -173,8 +146,10 @@ SHRLIB_CFLAGS =
 SHRLIB_LDFLAGS =
 
 #--------------------------------------------------
-# Earlier versions of gcc don't understand -MF
-HDEPENDS_COMPFLAGS = -MM > $@
+# Don't use gcc 2.x for dependency generation
+
+HDEPENDS_METHOD_2 = MKMF
+HDEPENDS_METHOD = $(firstword $(HDEPENDS_METHOD_$(VX_GNU_MAJOR_VERSION)) COMP)
 
 #--------------------------------------------------
 # osithead use default stack, YES or NO override

configure/os/CONFIG.Common.yocto21-aarch64

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

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

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

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

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

@@ -1,16 +0,0 @@
-# "cross compile" for older Linux version
-# Use older compiler and older libraries
-# Used packages:
-# compat-gcc-44-c++-4.4
-# 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

@@ -1,16 +0,0 @@
-# "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

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

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

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

configure/os/CONFIG.SL5-x86_64.Common

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

configure/os/CONFIG.SL5-x86_64.SL5-x86_64

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

configure/os/CONFIG.SL6-x86.Common

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

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

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

configure/os/CONFIG.SL6-x86_64.Common

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

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

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

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

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

configure/os/CONFIG.darwinCommon.darwinCommon

@@ -65,14 +65,14 @@ GNU = NO
 #
 # Darwin shared libraries
 #
-SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \
+SHRLIB_LDFLAGS = -dynamiclib -undefined dynamic_lookup \
     -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 -flat_namespace -undefined suppress
+LOADABLE_SHRLIB_LDFLAGS = -bundle -undefined dynamic_lookup
 
 #
 # Position-independent code is the default on Darwin.

configure/os/CONFIG_SITE.Common.RTEMS-pc386

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

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

@@ -0,0 +1,9 @@
+# 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,6 +21,5 @@ 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

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

configure/os/CONFIG_SITE.SL5-x86.Common

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

configure/os/CONFIG_SITE.SL5-x86_64.Common

@@ -1,3 +0,0 @@
-include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
-# Build 32 bit version as a cross architecture
-CROSS_COMPILER_TARGET_ARCHS += SL5-x86

configure/os/CONFIG_SITE.SL6-x86.Common

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

configure/os/CONFIG_SITE.SL6-x86_64.Common

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

configure/os/CONFIG_SITE.linux-x86.Common

@@ -1,40 +1,9 @@
-INSTALL_LOCATION=/usr/local/epics/base-7.0.1
-#EPICS_SITE_VERSION:=$(shell date +%Y-%m-%d)
+# CONFIG_SITE.linux-x86.Common
+#
+# Site override definitions for linux-x86 host builds
+#-------------------------------------------------------
 
-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
+# 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

configure/os/CONFIG_SITE.linux-x86.linux-arm

@@ -8,8 +8,7 @@ GNU_TARGET = arm-xilinx-linux-gnueabi
 
 # Set GNU tools install path
 # Examples are installations at the APS:
-#GNU_DIR = /usr/local/vw/zynq-2011.09
-GNU_DIR = /usr/local/vw/zynq-2016.1/gnu/arm/lin
+GNU_DIR = /usr/local/vw/zynq-2011.09
 #GNU_DIR = /usr/local/Xilinx/SDK/2016.3/gnu/arm/lin
 #GNU_DIR = /APSshare/XilinxSDK/2015.4/gnu/arm/lin
 

configure/os/CONFIG_SITE.linux-x86_64.Common

@@ -1,9 +1,9 @@
-include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
+# CONFIG_SITE.linux-x86_64.Common
+#
+# Site override definitions for linux-x86_64 host builds
+#-------------------------------------------------------
 
-GNU_HOST_ARCH_64=x86_64
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100
 
-# IOxOS IFC1211
-CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64
-
-# Zynq
-CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64

documentation/KnownProblems.html

@@ -4,17 +4,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <title>Known Problems in EPICS 7.0.1</title>
+  <title>Known Problems in Base-3.16.1</title>
 </head>
 
 <body>
-<h1 style="text-align: center">EPICS 7.0.1: Known Problems</h1>
+<h1 style="text-align: center">EPICS Base R3.16.1: Known Problems</h1>
 
 <p>Any patch files linked below should be applied at the root of the
-base-7.0.1 tree. Download them, then use the GNU Patch program as
+base-3.16.1 tree. Download them, then use the GNU Patch program as
 follows:</p>
 
-<blockquote><pre>% <b>cd <i>/path/to/</i>base-7.0.1</b>
+<blockquote><pre>% <b>cd <i>/path/to/</i>base-3.16.1</b>
 % <b>patch -p1 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
 
 <p>The following problems were known by the developers at the time of this
@@ -32,6 +32,10 @@ release:</p>
     about duplicate EPICS CA Address list entries. These warnings might be due
     to a bug in Cygwin; they are benign and can be ignored.</li>
 
+  <li>64-bit Windows builds of the CAS library may not work with some compilers.
+    The code in <tt>src/legacy/gdd</tt> is incompatible with the LLP64 model
+    that Windows uses for its 64-bit ABI.</li>
+
 </ul>
 
 </body>

documentation/README.1st

@@ -1,6 +1,6 @@
                            Installation Instructions
 
-                           EPICS Base Release 7.0.1.1
+                           EPICS Base Release 3.16.1
 
    --------------------------------------------------------------------------
 
@@ -164,12 +164,11 @@
 
     base/startup directory - contains scripts to set environment and path
 
-         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
+         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
 
     base/configure directory - contains build definitions and rules
 
@@ -223,13 +222,13 @@
        required path and other environment variables.
 
        EPICS_HOST_ARCH
-       Before you can build or use EPICS Base, the environment variable
-       EPICS_HOST_ARCH should be defined. A perl script EpicsHostArch.pl in
-       the base/startup directory has been provided to help set
-       EPICS_HOST_ARCH. You should have EPICS_HOST_ARCH set to your host
-       operating system followed by a dash and then your CPU architecture,
-       e.g. linux-x86_64. If you are not using the OS vendor's c/c++ compiler
-       for host builds, you will need another dash followed by the alternate
+       Before you can build or use EPICS R3.15, the environment variable
+       EPICS_HOST_ARCH must be defined. A perl script EpicsHostArch.pl in the
+       base/startup directory has been provided to help set EPICS_HOST_ARCH.
+       You should have EPICS_HOST_ARCH set to your host operating system
+       followed by a dash and then your host architecture, e.g.
+       solaris-sparc. If you are not using the OS vendor's c/c++ compiler for
+       host builds, you will need another dash followed by the alternate
        compiler name (e.g. "-gnu" for GNU c/c++ compilers on a solaris host
        or "-mingw" for MinGW c/c++ compilers on a WIN32 host). See
        configure/CONFIG_SITE for a list of supported EPICS_HOST_ARCH values.
@@ -248,7 +247,7 @@
        solaris systems you need uname in your path.
 
        LD_LIBRARY_PATH
-       EPICS shared libraries and executables normally contain the full path
+       R3.15 shared libraries and executables normally contain the full path
        to any libraries they require. However, if you move the EPICS files or
        directories from their build-time location then in order for the
        shared libraries to be found at runtime LD_LIBRARY_PATH must include
@@ -311,7 +310,7 @@
      script will create a sample application that can be built and then
      executed to try out this release of base.
 
-     Instructions for building and executing the example IOC application can
+     Instructions for building and executing the 3.15 example application can
      be found in the section "Example Application" of Chapter 2, "Getting
      Started", in the "IOC Application Developer's Guide" for this release.
      The "Example IOC Application" section briefly explains how to create and

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/Site.profile
+<strong>.</strong> "${EPICS_BASE}"/startup/unix.sh
 </pre>
 </li>
 <li>