fix posix epicsThreadSleepQuantum() implementation not to return 0.01 on Linux

Turns out this is ~10x slower to query than CLOCK_MONOTONIC

.appveyor.yml

@@ -16,7 +16,7 @@ init:
   - git config --global core.autocrlf true
 
 # Set clone depth (do not fetch complete history)
-clone_depth: 2
+clone_depth: 50
 
 # Skipping commits affecting only specific files
 skip_commits:
@@ -40,11 +40,12 @@ configuration:
 # Environment variables: compiler toolchain
 environment:
   matrix:
-  - TOOLCHAIN: 9.0
   - TOOLCHAIN: 10.0
   - TOOLCHAIN: 11.0
   - TOOLCHAIN: 12.0
   - TOOLCHAIN: 14.0
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    TOOLCHAIN: 2017
   - TOOLCHAIN: cygwin
   - TOOLCHAIN: mingw
 
@@ -57,8 +58,6 @@ platform:
 matrix:
   exclude:
   # VS Express installs don't have the 64 bit compiler
-  - platform: x64
-    TOOLCHAIN: 9.0
   - platform: x64
     TOOLCHAIN: 10.0
 
@@ -67,13 +66,14 @@ matrix:
 #---------------------------------#
 
 install:
-  - cmd: ci/appveyor-prepare.bat
+  - cmd: git submodule update --init --recursive
+  - 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/appveyor-make.bat

@@ -1,6 +1,6 @@
 :: Universal build script for AppVeyor (https://ci.appveyor.com/)
 :: Environment:
-::     TOOLCHAIN      -  toolchain version   [9.0/10.0/11.0/12.0/14.0/cygwin/mingw]
+::     TOOLCHAIN      -  toolchain version   [10.0/11.0/12.0/14.0/2017/cygwin/mingw]
 ::     CONFIGURATION  -  determines EPICS build   [dynamic/static]
 ::     PLATFORM       -  architecture   [x86/x64]
 ::
@@ -57,10 +57,22 @@ if "%TOOLCHAIN%"=="mingw" (
 )
 
 set "VSINSTALL=C:\Program Files (x86)\Microsoft Visual Studio %TOOLCHAIN%"
+if not exist "%VSINSTALL%\" set "VSINSTALL=C:\Program Files (x86)\Microsoft Visual Studio\%TOOLCHAIN%\Community"
+if not exist "%VSINSTALL%\" goto MSMissing
+
 set "MAKE=C:\tools\make"
 
+echo [INFO] APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE%
+
 if "%OS%"=="64BIT" (
     set EPICS_HOST_ARCH=windows-x64%ST%
+    :: VS 2017
+    if exist "%VSINSTALL%\VC\Auxiliary\Build\vcvars64.bat" (
+        call "%VSINSTALL%\VC\Auxiliary\Build\vcvars64.bat"
+        where cl
+        if !ERRORLEVEL! NEQ 0 goto MSMissing
+        goto MSFound
+    )
     if exist "%VSINSTALL%\VC\vcvarsall.bat" (
         call "%VSINSTALL%\VC\vcvarsall.bat" amd64
         where cl
@@ -79,12 +91,19 @@ if "%OS%"=="64BIT" (
     )
 ) else (
     set EPICS_HOST_ARCH=win32-x86%ST%
+    :: VS 2017
+    if exist "%VSINSTALL%\VC\Auxiliary\Build\vcvars32.bat" (
+        call "%VSINSTALL%\VC\Auxiliary\Build\vcvars32.bat"
+        where cl
+        if !ERRORLEVEL! NEQ 0 goto MSMissing
+        goto MSFound
+    )
     if exist "%VSINSTALL%\VC\vcvarsall.bat" (
         call "%VSINSTALL%\VC\vcvarsall.bat" x86
         where cl
         if !ERRORLEVEL! NEQ 0 goto MSMissing
         goto MSFound
-    )    
+    )
     if exist "%VSINSTALL%\VC\bin\vcvars32.bat" (
         call "%VSINSTALL%\VC\bin\vcvars32.bat"
         where cl

.ci/appveyor-prepare.bat

@@ -65,6 +65,6 @@ if "%TOOLCHAIN%"=="mingw" (
 )
 
 echo [INFO] Installing Make 4.1
-@powershell -Command "(new-object net.webclient).DownloadFile('https://www.aps.anl.gov/epics/download/tools/make-4.1-win64.zip', 'C:\tools\make-4.1.zip')"
+curl -fsS --retry 3 -o C:\tools\make-4.1.zip https://epics.anl.gov/download/tools/make-4.1-win64.zip
 cd \tools
 "C:\Program Files\7-Zip\7z" e make-4.1.zip

.ci/checkout-modules.sh

@@ -0,0 +1,8 @@
+#!/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-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`
+export EPICS_HOST_ARCH=`perl src/tools/EpicsHostArch.pl`
 
 [ -e configure/os/CONFIG_SITE.Common.linux-x86 ] || die "Wrong location: $PWD"
 
@@ -57,34 +48,30 @@ 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"
-  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/.rtems
 EOF
   cat << EOF >> configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
+CROSS_COMPILER_TARGET_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 tapfiles
-   find . -name '*.tap' -print0 | xargs -0 -n1 prove -e cat -f
+   make -j2 tapfiles
+   make -s test-results
 fi

.gitattributes

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

.gitignore

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

.gitmodules

@@ -0,0 +1,27 @@
+[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
+[submodule "modules/pcas"]
+	path = modules/pcas
+	url = https://github.com/epics-modules/pcas

.tools/make-tar.sh

@@ -0,0 +1,112 @@
+#!/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 [ "$TOPREV" = "HEAD" ]
+then
+  true
+elif ! [ `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,16 +3,6 @@ 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=NO
-  - RTEMS=4.9 TEST=NO
 addons:
   apt:
     packages:
@@ -21,12 +11,17 @@ addons:
     - perl
     - clang
     - g++-mingw-w64-i686
-    - bison
-    - flex
-    - texinfo
-    - install-info
-cache:
-  directories:
-   - $HOME/.cache
-install: sh ci/travis-prepare.sh </dev/null
-script: sh ci/travis-build.sh </dev/null
+    - qemu-system-x86
+script:
+  - .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

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,8 +14,19 @@ 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

@@ -20,5 +20,8 @@ Additional information about EPICS including mailing list
 archives and subscription instructions, documentation and
 training materials, additional components, links to other
 websites etc. is available on the EPICS home page at
-	http://www.aps.anl.gov/epics/
+	https://epics.anl.gov/
 
+$Format:%cD$
+$Format:%H$
+https://code.launchpad.net/epics-base

ci/travis-prepare.sh

@@ -1,40 +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"

configure/CONFIG

@@ -20,11 +20,15 @@ else
 endif
 
 # Provide a default if the user hasn't set EPICS_HOST_ARCH
-ifeq ($(origin EPICS_HOST_ARCH), undefined)
-  # NB: We use a simply expanded variable here for performance:
-  EPICS_HOST_ARCH := $(shell $(CONFIG)/../startup/EpicsHostArch.pl)
-endif
 #
+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
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH)
@@ -73,17 +77,17 @@ ifdef T_A
   #
   -include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
 
+  #  Site specific target and host-target definitions and overrides
+  #
+  -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
+  -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+
   #  RELEASE file specific definitions
   #
   ifneq ($(CONFIG),$(TOP)/configure)
     -include $(CONFIG)/CONFIG_APP_INCLUDE
   endif
 
-  #  Site specific target and host-target definitions
-  #
-  -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
-  -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-
 endif # ifdef T_A
 
 

configure/CONFIG.CrossCommon

@@ -17,14 +17,14 @@ BUILD_CLASS = CROSS
 #   ifdef CROSS    looks better than  ifeq ($(BUILD_CLASS),CROSS)
 CROSS = YES
 
-GNU_TARGET_INCLUDE_DIR = $(GNU_TARGET:%= $(GNU_DIR)/%/include)
-GNU_TARGET_LIB_DIR = $(GNU_TARGET:%= $(GNU_DIR)/%/lib)
+GNU_TARGET_INCLUDE_DIR = $(wildcard $(GNU_TARGET:%=$(GNU_DIR)/%/include))
+GNU_TARGET_LIB_DIR = $(wildcard $(GNU_TARGET:%=$(GNU_DIR)/%/lib))
 
-CROSS_INCLUDES = $(addprefix -I,$(GNU_TARGET_INCLUDE_DIR))
-CROSS_LDFLAGS = $(addprefix -L,$(GNU_TARGET_LIB_DIR))
+CROSS_INCLUDES = $(GNU_TARGET_INCLUDE_DIR:%=-I%)
+CROSS_LDFLAGS = $(GNU_TARGET_LIB_DIR:%=-L%)
 
-CMPLR_PREFIX_CROSS=$(addsuffix -,$(GNU_TARGET))
-CMPLR_PREFIX=$(CMPLR_PREFIX_$(BUILD_CLASS))
+CMPLR_PREFIX_CROSS = $(addsuffix -,$(GNU_TARGET))
+CMPLR_PREFIX = $(CMPLR_PREFIX_$(BUILD_CLASS))
 
 # Cross builds usually use the gnu compiler
 include $(CONFIG)/CONFIG.gnuCommon

configure/CONFIG.gnuCommon

@@ -24,9 +24,14 @@ LD = $(GNU_BIN)/$(CMPLR_PREFIX)ld$(CMPLR_SUFFIX) -r
 CPP = $(CC) -x c -E
 RANLIB = $(GNU_BIN)/$(CMPLR_PREFIX)ranlib$(CMPLR_SUFFIX)
 
+# Requires at least GCC 4.8 or LLVM (clang) 3.1
+ASAN_FLAGS_YES = -fsanitize=address
+ASAN_LDFLAGS_YES = $(ASAN_FLAGS_YES)
+
 PROF_CFLAGS_YES = -p
 GPROF_CFLAGS_YES = -pg
 CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
+CODE_CFLAGS += $(ASAN_FLAGS_$(ENABLE_ASAN))
 WARN_CFLAGS_YES = -Wall
 WARN_CFLAGS_NO = -w
 OPT_CFLAGS_YES = -O3
@@ -35,12 +40,14 @@ OPT_CFLAGS_NO = -g
 PROF_CXXFLAGS_YES = -p
 GPROF_CXXFLAGS_YES = -pg
 CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
+CODE_CXXFLAGS += $(ASAN_FLAGS_$(ENABLE_ASAN))
 WARN_CXXFLAGS_YES = -Wall
 WARN_CXXFLAGS_NO = -w
 OPT_CXXFLAGS_YES = -O3
 OPT_CXXFLAGS_NO = -g
 
 CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
+CODE_LDFLAGS += $(ASAN_LDFLAGS_$(ENABLE_ASAN))
 
 PIPE_CFLAGS_YES_YES = -pipe
 PIPE_CFLAGS = $(PIPE_CFLAGS_$(GCC_PIPE)_$(GNU))

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,9 +37,6 @@
 #    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
@@ -273,30 +270,6 @@ 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
@@ -581,4 +554,3 @@ 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,17 +17,6 @@ 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)
 
@@ -36,18 +25,8 @@ 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 ../
@@ -59,15 +38,11 @@ FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(TOP)/src/tools/$(1)))
 #---------------------------------------------------------------
 # EPICS Base build tools and tool flags
 
-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)
+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)
 
 #---------------------------------------------------------------
 # tools for installing libraries and products
@@ -76,19 +51,6 @@ INSTALL_PRODUCT = $(INSTALL)
 INSTALL_LIBRARY = $(INSTALL)
 
 #---------------------------------------------------------------
-# 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
+# tools for making header dependencies and variable replacement
+MKMF       = $(PERL) $(TOOLS)/mkmf.pl
+REPLACEVAR = $(PERL) $(TOOLS)/replaceVAR.pl

configure/CONFIG_BASE_VERSION

@@ -15,37 +15,49 @@
 # 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 BASE_3_14 and BASE_3_15 as NO and BASE_3_16 as YES, so
+# 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:
+#
 #   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 only
+#       true for 3.15.x only
 #   ifeq ($(BASE_3_16),YES)
-#       true for 3.16 only.
+#       true for 3.16.x only.
+#   ifeq ($(BASE_7_0),YES)
+#       true for 7.0.x only.
 
 BASE_3_14 = NO
 BASE_3_15 = NO
-BASE_3_16 = YES
+BASE_3_16 = NO
+BASE_7_0  = YES
 
 # EPICS_VERSION must be a number >0 and <256
-EPICS_VERSION = 3
+EPICS_VERSION = 7
 
 # EPICS_REVISION must be a number >=0 and <256
-EPICS_REVISION = 16
+EPICS_REVISION = 0
 
 # 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 = 0
+EPICS_PATCH_LEVEL = 2
 
-# This will end in -DEV between official releases
-#EPICS_DEV_SNAPSHOT=-DEV
+# Between official releases, the EPICS_PATCH_LEVEL gets incremented
+# and a -DEV suffix is added (similar to the Maven -SNAPSHOT versions)
+#EPICS_DEV_SNAPSHOT=
+EPICS_DEV_SNAPSHOT=-DEV
 #EPICS_DEV_SNAPSHOT=-pre1
 #EPICS_DEV_SNAPSHOT=-pre1-DEV
 #EPICS_DEV_SNAPSHOT=-pre2
@@ -54,7 +66,6 @@ EPICS_PATCH_LEVEL = 0
 #EPICS_DEV_SNAPSHOT=-rc1-DEV
 #EPICS_DEV_SNAPSHOT=-rc2
 #EPICS_DEV_SNAPSHOT=-rc2-DEV
-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 =  $($*_OBJLIBS) $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS) $($*_SRCS)))
+TARGET_OBJS =  $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS) $($*_SRCS)))
 
 PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(USR_OBJS) $(PROD_OBJS)))
-PROD_LD_OBJS = $(USR_OBJLIBS) $(PROD_OBJLIBS) $(TARGET_OBJS) $(PRODUCT_OBJS)
+PROD_LD_OBJS = $(TARGET_OBJS) $(PRODUCT_OBJS)
 
 LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(LIB_SRCS) $(LIBSRCS) $(USR_OBJS) $(LIB_OBJS)))
-LIBRARY_LD_OBJS = $(USR_OBJLIBS) $(LIB_OBJLIBS) $(TARGET_OBJS) $(LIBRARY_OBJS)
+LIBRARY_LD_OBJS = $(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,6 +47,9 @@ 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 =
+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/CONFIG_SITE_ENV

@@ -13,7 +13,7 @@
 #
 #	CONFIG_SITE_ENV - EPICS Environment Parameter Site configuration file
 #
-# This file is read by the script base/src/libCom/env/bldEnvdata.pl
+# This file is read by the script base/src/libCom/env/bldEnvData.pl
 # Variable definitions must take the form
 #	VAR = VALUE
 # or
@@ -26,31 +26,42 @@
 
 # Time service:
 # EPICS_TIMEZONE
-#	local timezone info for vxWorks and RTEMS IOCs.  The format is
-#	    <name>::<minutesWest>:<start daylight>:<end daylight>
-#	where the start and end are mmddhh - that is month,day,hour
-#	e.g. for ANL in 2016: EPICS_TIMEZONE=CST/CDT::360:031302:110602
+#	Local timezone info for vxWorks and RTEMS.  The format is
+#	    <name>::<minutesWest>:<startDST>:<endDST>
+#	where <name> is only used by strftime() for %Z conversions,
+#	and <startDST> and <endDST> are mmddhh - that is month,day,hour
+#	e.g. for ANL in 2018: EPICS_TIMEZONE=CUS::360:031102:110402
+#	The future dates below assume the rules don't get changed;
+#	see http://www.timeanddate.com/time/dst/2018.html to check.
 #
-#	DST for 2016  US: Mar 13 - Nov 06
-#	              EU: Mar 27 - Oct 30
-#	DST for 2017  US: Mar 12 - Nov 05
-#	              EU: Mar 26 - Oct 29
-#	DST for 2018  US: Mar 11 - Nov 04
-#	              EU: Mar 25 - Oct 28
 #	DST for 2019  US: Mar 10 - Nov 03
 #	              EU: Mar 31 - Oct 27
+EPICS_TIMEZONE = CUS::360:031002:110302
+#EPICS_TIMEZONE = MET::-60:033102:102703
+#
 #	DST for 2020  US: Mar 08 - Nov 01
 #	              EU: Mar 29 - Oct 25
+#EPICS_TIMEZONE = CUS::360:030802:110102
+#EPICS_TIMEZONE = MET::-60:032902:102503
+#
 #	DST for 2021  US: Mar 14 - Nov 07
 #	              EU: Mar 28 - Oct 31
-#	(see: http://www.timeanddate.com/time/dst/2016.html etc. )
+#EPICS_TIMEZONE = CUS::360:031402:110702
+#EPICS_TIMEZONE = MET::-60:032802:103103
 #
-# These values are for 2016:
-EPICS_TIMEZONE=CST/CDT::360:031302:110602
-#EPICS_TIMEZONE=CET/CEST::-60:032702:103002
+#	DST for 2022  US: Mar 13 - Nov 06
+#	              EU: Mar 27 - Oct 30
+#EPICS_TIMEZONE = CUS::360:031302:110602
+#EPICS_TIMEZONE = MET::-60:032702:103003
+#
+#	DST for 2023  US: Mar 13 - Nov 06
+#	              EU: Mar 27 - Oct 30
+#EPICS_TIMEZONE = CUS::360:031202:110502
+#EPICS_TIMEZONE = MET::-60:032602:102903
 
 # EPICS_TS_NTP_INET
-#	NTP time server ip address.  Uses boot host if not set.
+#	NTP time server ip address for VxWorks and RTEMS.
+#	IOC will use its boot host if this is not set.
 EPICS_TS_NTP_INET=
 
 # IOC Shell:

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 $(TOOLS)/dbdToHtml.pl
+$(COMMON_DIR)/%.html: %.dbd.pod
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/dbdToHtml.pl $(DBDFLAGS) -o $(notdir $@) $<
+	$(DBDTOHTML) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: %.pod $(TOOLS)/podToHtml.pl
+$(COMMON_DIR)/%.html: %.pod
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	$(PODTOHTML) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: %.pm $(TOOLS)/podToHtml.pl
+$(COMMON_DIR)/%.html: %.pm
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	$(PODTOHTML) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: ../%.pm $(TOOLS)/podToHtml.pl
+$(COMMON_DIR)/%.html: ../%.pm
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/podToHtml.pl -s -o $(notdir $@) $<
+	$(PODTOHTML) -s -o $(notdir $@) $<
 	@$(MKDIR) $(dir $@)
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: ../%.pl $(TOOLS)/podToHtml.pl
+$(COMMON_DIR)/%.html: ../%.pl
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/podToHtml.pl -s -o $(notdir $@) $<
+	$(PODTOHTML) -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
@@ -25,7 +26,6 @@ vpath %.html $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.skel.static $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.y $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.l $(USR_VPATH) $(ALL_SRC_DIRS)
-vpath %.pl $(USR_VPATH) $(ALL_SRC_DIRS)
 
 #---------------------------------------------------------------
 
@@ -43,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)
@@ -54,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)
@@ -80,9 +82,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
@@ -103,6 +122,7 @@ endif
 #   Products and Object libraries
 #
 PRODTARGETS += $(PRODNAME) $(MUNCHNAME) $(CTDT_SRCS) $(CTDT_OBJS) $(NMS)
+TESTPRODTARGETS += $(TESTPRODNAME) $(TESTMUNCHNAME)
 
 #---------------------------------------------------------------
 #   Test specifications and test result files
@@ -141,7 +161,7 @@ rebuild: clean install
 
 build: inc
 
-build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODNAME) \
+build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODTARGETS) \
 	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)
 
 inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS)
@@ -159,20 +179,21 @@ clean: build_clean
 
 build_clean:
 	$(ECHO) "Cleaning"
-	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) \
+	@$(RM) *.i *$(OBJ) *.a \
 	$(LIBNAME) $(TESTLIBNAME) $(SHRLIBNAME) $(TESTSHRLIBNAME) \
 	$(DLLSTUB_LIBNAME) $(TESTDLLSTUB_LIBNAME) \
 	$(LOADABLE_SHRLIBNAME) \
 	$(INC) $(TARGETS) $(TDS) $(CLEANS) \
 	*.out MakefileInclude *.manifest *.exp \
-	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) \
+	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) $(TESTPRODTARGETS) \
 	$(TESTSCRIPTS) $(TAPFILES) $(JUNITFILES)
 ifdef RES
 	@$(RM) *$(RES)
 endif
 
-$(DIRECTORY_TARGETS) :
-	$(MKDIR) $@
+# Sort mkdir targets to remove duplicates & make parents first
+$(DIRECTORY_TARGETS):
+	$(MKDIR) $(sort $@)
 
 # Install LIB_INSTALLS libraries before linking executables
 $(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS)
@@ -184,7 +205,7 @@ endif
 
 # RELEASE file consistency checking
 checkRelease:
-	$(CONVERTRELEASE) checkRelease
+	+$(CONVERTRELEASE) checkRelease
 warnRelease:
 	-$(CONVERTRELEASE) checkRelease
 noCheckRelease:
@@ -255,15 +276,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
@@ -322,6 +341,10 @@ $(MUNCHNAME): %$(MUNCH_SUFFIX): $(MUNCH_DEPENDS) %$(EXE)
 	@$(RM) $@
 	$(MUNCH_CMD)
 
+$(TESTMUNCHNAME): %$(MUNCH_SUFFIX): $(MUNCH_DEPENDS) %$(EXE)
+	@$(RM) $@
+	$(MUNCH_CMD)
+
 #---------------------------------------------------------------
 # GeSys modules for RTEMS
 $(MODNAME): %$(MODEXT): %$(EXE)
@@ -329,6 +352,12 @@ $(MODNAME): %$(MODEXT): %$(EXE)
 	@$(RM) $@
 	$(LINK.mod)
 
+#---------------------------------------------------------------
+# Generate Perl include path module
+%ModuleDirs.pm: $(wildcard $(TOP)/configure/RELEASE*)
+	@$(MKDIR) $(dir $@)
+	$(CONVERTRELEASE) -T $(TOP) $@
+
 #---------------------------------------------------------------
 # Automated testing
 
@@ -348,16 +377,19 @@ testspec: $(TESTSCRIPTS)
 test-results: tapfiles
 ifneq ($(TAPFILES),)
 ifdef RUNTESTS_ENABLED
-	prove --failures --ext .tap --exec cat --color $(TAPFILES)
+	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)
@@ -375,13 +407,13 @@ endif
 # If there's a perl test script (.plt) available, use it
 %.t: ../%.plt
 	@$(RM) $@
-	$(CP) $< $@
+	$(EXPAND_TOOL) -t $(INSTALL_LOCATION) -a $(T_A) $< $@
 
 # 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
@@ -466,6 +498,7 @@ 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)
@@ -473,6 +506,7 @@ $(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 $@"
@@ -518,7 +552,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)
@@ -527,5 +561,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 OBJLIBS LDOBJS SYS_LIBS , \
+$(foreach type, SRCS RCS OBJS LDFLAGS LDOBJS SYS_LIBS , \
 $(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY) , \
     $(eval $(call TARGET_template,$(strip $(target)),$(type)))))
 
@@ -38,6 +33,17 @@ $(foreach target, $(PROD) $(TESTPROD), \
 
 #-----------------------------------------------------------------------
 
+# These must be done before PROD2_template
+define TESTLIBRARY_template
+$(1)_DIR = .
+TESTBUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
+endef
+
+$(foreach target, $(TESTLIBRARY), \
+    $(eval $(call TESTLIBRARY_template,$(strip $(target)))))
+
+#-----------------------------------------------------------------------
+
 define TARGET2_template
 $(1)_LDLIBS += $$($(1)_LIBS)
 $(1)_LDLIBS += $$(if $$(strip $$($(1)_LIBS_$(OS_CLASS))), \
@@ -123,16 +129,6 @@ $(foreach target, $(LIBRARY), \
 
 #-----------------------------------------------------------------------
 
-define LIBRARY3_template
-$(1)_DIR = .
-TESTBUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
-endef
-
-$(foreach target, $(TESTLIBRARY), \
-    $(eval $(call LIBRARY3_template,$(strip $(target)))))
-
-#-----------------------------------------------------------------------
-
 define LOADABLE_LIBRARY_template
 LOADABLE_BUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
 
@@ -151,4 +147,3 @@ $(foreach target, $(LOADABLE_LIBRARY), \
     $(eval $(call LOADABLE_LIBRARY_template,$(strip $(target)))))
 
 #-----------------------------------------------------------------------
-

configure/RULES_TOP

@@ -15,12 +15,21 @@ 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)
 
 UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC) \
     $(INSTALL_HTML) $(INSTALL_TEMPLATES) $(INSTALL_DB) $(DIRECTORY_TARGETS)
+ifneq ($(INSTALL_LOCATION),$(TOP))
+ifneq ($(INSTALL_LOCATION),$(EPICS_BASE))
+UNINSTALL_DIRS += $(INSTALL_CONFIG)
+endif
+endif
 uninstallDirs:
 	$(RMDIR) $(UNINSTALL_DIRS)
 
@@ -70,12 +79,14 @@ 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 realuninstall archuninstall uninstallDirs
+.PHONY: cleandirs distclean cvsclean depclean
+.PHONY: 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,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
@@ -136,6 +140,13 @@ MOD_LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(POSIX_LDFLAGS) \
 LINK.mod = $(CCC) -o $@ $(PRODDIR_LDFLAGS) $(MOD_LDFLAGS)
 LINK.mod += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(MOD_LDLIBS)
 
+#--------------------------------------------------
+# Here munching means creating a bootable object binary
+ifdef MUNCH_SUFFIX
+  MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+  TESTMUNCHNAME = $(TESTPRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+endif
+
 #--------------------------------------------------
 # RTEMS has neither shared libraries nor dynamic loading
 STATIC_BUILD=YES

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
@@ -15,7 +16,6 @@ ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef

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
@@ -13,7 +14,6 @@ ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
 	gzip -f9 rtems

configure/os/CONFIG.Common.RTEMS-mvme2700

@@ -1,13 +1,13 @@
 #
 # Author: Matt Rippa
 #
+RTEMS_BSP = mvme2700
 RTEMS_TARGET_CPU = powerpc
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
 ARCH_DEP_CFLAGS += -DNVRAM_INDIRECT
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
 	gzip -f9 rtems

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
@@ -15,7 +16,6 @@ ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef

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
@@ -16,7 +17,6 @@ ARCH_DEP_CFLAGS += -DBSP_NVRAM_BASE_ADDR=0xf1110000
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef

configure/os/CONFIG.Common.RTEMS-pc386

@@ -5,15 +5,15 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_TARGET_CPU=i386
+RTEMS_BSP = pc386
+RTEMS_TARGET_CPU = i386
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 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,11 +5,11 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
+RTEMS_BSP = uC5282
 RTEMS_TARGET_CPU = m68k
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< $@
 endef

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.linux-xscale_be

@@ -15,5 +15,14 @@ ARCH_CLASS = xscale
 ifeq ($(BUILD_CLASS),CROSS)
     VALID_BUILDS = Ioc
     GNU_TARGET = xscale_be
-    CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
+    CMPLR_PREFIX = $(GNU_TARGET:%=%-)
+
+    # Configure for readline if requested
+    OP_SYS_INCLUDES += $(READLINE_DIR:%=-I%/include)
+    READLINE_LDFLAGS = $(READLINE_DIR:%=-L%/lib)
+    RUNTIME_LDFLAGS_READLINE_YES_NO = $(READLINE_DIR:%=-Wl,-rpath,%/lib)
+    RUNTIME_LDFLAGS += \
+        $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
+    SHRLIBDIR_LDFLAGS += $(READLINE_LDFLAGS)
+    PRODDIR_LDFLAGS += $(READLINE_LDFLAGS)
 endif

configure/os/CONFIG.Common.linuxCommon

@@ -23,13 +23,15 @@ STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 
-# Set runtime path for shared libraries
-SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
-SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
+# Set runtime path for shared libraries if USE_RPATH=YES and STATIC_BUILD=NO
+SHRLIBDIR_RPATH_LDFLAGS_YES_NO = $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+SHRLIBDIR_LDFLAGS += \
+    $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
 
-# Set runtime path for products
-PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
-PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
+# Set runtime path for products if USE_RPATH=YES and STATIC_BUILD=NO
+PRODDIR_RPATH_LDFLAGS_YES_NO = $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+PRODDIR_LDFLAGS += \
+    $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
 
 # Link libraries controlled by COMMANDLINE_LIBRARY
 # The newest Linux versions only need readline, older ones need both

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,30 +94,27 @@ 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))
 
 #--------------------------------------------------
-# Wind River moved nm out of GNU_BIN in some versions
+# This finds nm on any supported VxWorks version
 
-WORKBENCH_BIN = $(WIND_BASE)/workbench-$(WORKBENCH_VERSION)/$(WIND_HOST_TYPE)/bin
-UTILITIES_BIN = $(WIND_BASE)/utilities-$(UTILITIES_VERSION)/$(WIND_HOST_TYPE)/bin
-
-NM_DIR_6.4 = $(WORKBENCH_BIN)
-NM_DIR_6.5 = $(WORKBENCH_BIN)
-NM_DIR_6.6 = $(WORKBENCH_BIN)
-NM_DIR_6.7 = $(GNU_BIN)
-NM_DIR_6.8 = $(UTILITIES_BIN)
-NM_DIR_6.9 = $(UTILITIES_BIN)
-NM_DIR = $(firstword $(NM_DIR_$(VXWORKS_VERSION)) $(GNU_BIN))
-
-NM = $(NM_DIR)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
+NMPROG = $(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
+NM = $(firstword $(wildcard $(WIND_BASE)/*/$(WIND_HOST_TYPE)/bin/$(NMPROG)))
 
 #--------------------------------------------------
 # A linker script is essential for munching from vxWorks 6.6 onwards
@@ -119,13 +125,14 @@ MUNCH_LDFLAGS = $(MUNCH_LDFLAGS_$(VXWORKS_MAJOR_VERSION))
 #--------------------------------------------------
 # These are required by some of the Wind River tools
 export WIND_BASE
+export WIND_HOME = $(WIND_BASE)
 export WIND_HOST_TYPE
 export TOOL_FAMILY = GNU
 
 #--------------------------------------------------
 # Operating system flags
 OP_SYS_CPPFLAGS += -DvxWorks=vxWorks
-OP_SYS_CFLAGS += -fno-builtin
+OP_SYS_CFLAGS += -fno-builtin -fno-strict-aliasing
 
 # Fix for vxWorks headers that use macros defined in vxWorks.h but
 # which don't actually include vxWorks.h themselves, for example the
@@ -142,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
@@ -155,8 +173,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
@@ -164,6 +184,8 @@ OSITHREAD_USE_DEFAULT_STACK = NO
 
 #--------------------------------------------------
 # Link definitions
+CROSS_LDFLAGS =
+#
 LINK.cpp = $(LD) -o $@ $(STATIC_LDFLAGS) $(PRODDIR_LDFLAGS) $(LDFLAGS)
 LINK.cpp += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)
 
@@ -177,6 +199,10 @@ COMPILE.ctdt = $(CC) -c $(CPPFLAGS) $(CFLAGS_ctdt) $(INCLUDES) $(SOURCE_FLAG)
 VXCPPFLAGS = $(filter-out $(OP_SYS_INCLUDE_CPPFLAGS),$(CPPFLAGS))
 PREPROCESS.cpp = $(CPP) $(VXCPPFLAGS) $(INCLUDES) $< > $@
 
+#--------------------------------------------------
+# Use LEDLIB for command-line editing
+COMMANDLINE_LIBRARY = LEDLIB
+
 #--------------------------------------------------
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.vxWorksCommon

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 -flat_namespace -undefined suppress \
+SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -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.linux-x86.linux-arm

@@ -11,19 +11,14 @@ GNU_TARGET = arm-linux
 CMPLR_SUFFIX =
 CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
 
-# Provide a link-time path for shared libraries
-SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
-SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
-
-# Provide a link-time path for products
-PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
-PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
-
-# Provide a link-time path for readline 
-RUNTIME_LDFLAGS_READLINE_YES = -Wl,-rpath-link,$(GNU_DIR)/lib
-RUNTIME_LDFLAGS_READLINE = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
-RUNTIME_LDFLAGS_READLINE_CURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
-RUNTIME_LDFLAGS_READLINE_NCURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
+# Provide a link-time path for readline if needed
+OP_SYS_INCLUDES += $(READLINE_DIR:%=-I%/include)
+READLINE_LDFLAGS = $(READLINE_DIR:%=-L%/lib)
+RUNTIME_LDFLAGS_READLINE_YES_NO = $(READLINE_DIR:%=-Wl,-rpath,%/lib)
+RUNTIME_LDFLAGS += \
+    $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
+SHRLIBDIR_LDFLAGS += $(READLINE_LDFLAGS)
+PRODDIR_LDFLAGS += $(READLINE_LDFLAGS)
 
 # Library flags
 STATIC_LDFLAGS_YES= -Wl,-Bstatic

configure/os/CONFIG.win32-x86.Common

@@ -26,3 +26,5 @@ endif
 # Needed to find dlls for base installed build tools (antelope,eflex,...)
 PATH := $(EPICS_BASE_BIN):$(PATH)
 
+# Silence the tr1 namespace deprecation warnings
+USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING

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

@@ -79,16 +79,20 @@ CPP = cl -nologo -C -E
 
 # Configure OS vendor C++ compiler
 #
-# __STDC__=0 gives us both:
-# 1) define STDC for code (pretend ANSI conformance)
-# 2) set it to 0 to use MS C "extensions" (open for _open etc.)
-# because MS uses:   if __STDC__ ... disable many nice things
-#
 # -EHsc - generate code for exceptions
 # -GR - generate code for run time type identification
 #
 CCC = cl -EHsc -GR
-CODE_CPPFLAGS += -nologo -D__STDC__=0
+
+# Other compiler flags, used for CPP, C and C++
+#
+# -FC - Show absolute path of source file in diagnostics
+# -D__STDC__=0 gives us both:
+#   1) define STDC for code (pretend ANSI conformance)
+#   2) set it to 0 to use MS C "extensions" (open for _open etc.)
+#   because MS uses:   if __STDC__ ... disable many nice things
+#
+CODE_CPPFLAGS += -nologo -FC -D__STDC__=0
 CODE_CPPFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
 
 
@@ -136,6 +140,16 @@ STATIC_LDLIBS_NO=
 STATIC_LDFLAGS=
 RANLIB=
 
+#
+# option needed for parallel builds with Visual Studio 2015 onward
+#
+# -FS Force Synchronous PDB Writes
+ifneq ($(VisualStudioVersion),)
+  OPT_CXXFLAGS_NO += -FS
+  OPT_CFLAGS_NO += -FS
+endif
+
+
 #
 # add -profile here to run the ms profiler
 # -LTCG whole program optimization

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.linux-x86

@@ -54,3 +54,7 @@ OPT_CXXFLAGS_YES += -g
 # Tune GNU compiler output for a specific 32-bit cpu-type
 # (e.g. generic, native, i386, i686, pentium2/3/4, prescott, k6, athlon etc.)
 GNU_TUNE_CFLAGS = -mtune=generic
+
+
+# Developers using a suitable compiler may enable its address sanitizer:
+#ENABLE_ASAN = YES

configure/os/CONFIG_SITE.Common.linux-x86_64

@@ -50,3 +50,7 @@ OPT_CXXFLAGS_YES += -g
 # Tune GNU compiler output for a specific 64-bit cpu-type
 # (e.g. generic, native, core2, nocona, k8, opteron, athlon64, barcelona etc.)
 GNU_TUNE_CFLAGS = -mtune=generic
+
+
+# Developers using a suitable compiler may enable its address sanitizer:
+#ENABLE_ASAN = YES

configure/os/CONFIG_SITE.Common.linux-xscale_be

@@ -1,10 +1,4 @@
 # CONFIG_SITE.Common.linux-xscale_be
 #
-# Site specific definitions for linux-xscale_be target builds.
+# Site specific definitions for all linux-xscale_be target builds.
 #-------------------------------------------------------
-
-# Set GNU_DIR to point to directory containing the tool-chain
-
-# APS:
-GNU_DIR = /usr/local/vw/xscale_be
-

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -20,18 +20,7 @@ VXWORKS_VERSION = 6.9
 
 # WIND_BASE is where you installed the Wind River software.
 
-WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
+#WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
+#WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
 #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
-
-
-# WorkBench Version number, if you're using vxWorks 6.x
-
-#WORKBENCH_VERSION = 2.6
-#WORKBENCH_VERSION = 3.0
-#WORKBENCH_VERSION = 3.2
-WORKBENCH_VERSION = 3.3
-
-
-# Utilities Version number, required from vxWorks 6.8 and later
-
-UTILITIES_VERSION = 1.0
+WIND_BASE = /afs/psi.ch/project/vxworks/VxWorks$(VXWORKS_VERSION)