bump rpm release

This reverts commit 7d73932dc8.

.appveyor.yml

@@ -25,17 +25,6 @@ init:
 # Set clone depth (do not fetch complete history)
 clone_depth: 5
 
-# Skipping commits affecting only specific files
-skip_commits:
-  files:
-    - 'documentation/*'
-    - 'startup/*'
-    - '.github/*'
-    - '.tools/*'
-    - '.gitattributes'
-    - '**/*.html'
-    - '**/*.md'
-
 #---------------------------------#
 #   build matrix configuration    #
 #---------------------------------#
@@ -67,6 +56,8 @@ environment:
   - CMP: vs2010
   - CMP: gcc
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    # TODO: static linking w/ readline isn't working.  Bypass auto-detect
+    COMMANDLINE_LIBRARY: EPICS
 
 # Platform: processor architecture
 platform:

.appveyor/epics-base-7.yml

@@ -32,17 +32,6 @@ init:
 # Set clone depth (do not fetch complete history)
 clone_depth: 5
 
-# Skipping commits affecting only specific files
-skip_commits:
-  files:
-    - 'documentation/*'
-    - 'startup/*'
-    - '.github/*'
-    - '.tools/*'
-    - '.gitattributes'
-    - '**/*.html'
-    - '**/*.md'
-
 #---------------------------------#
 #   build matrix configuration    #
 #---------------------------------#
@@ -73,6 +62,9 @@ environment:
   - CMP: vs2012
   - CMP: vs2010
   - CMP: gcc
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    # TODO: static linking w/ readline isn't working.  Bypass auto-detect
+    COMMANDLINE_LIBRARY: EPICS
 
 # Platform: processor architecture
 platform:

.editorconfig

@@ -0,0 +1,8 @@
+# Documentation for this file: https://EditorConfig.org
+
+root = true
+
+# Unix-style newlines ending every file,
+# as some compilers complain about files not ending in newline
+[*]
+insert_final_newline = true

.gitattributes

@@ -1,9 +1,11 @@
-.ci/          export-ignore
-.tools/       export-ignore
-.github/      export-ignore
-.appveyor/    export-ignore
-.appveyor.yml export-ignore
-README        export-subst
+.appveyor.yml       export-ignore
+.appveyor/          export-ignore
+.ci/                export-ignore
+.github/            export-ignore
+.gitmodules         export-ignore
+.readthedocs.yml    export-ignore
+.tools/             export-ignore
+README              export-subst
 
 #Which files need CRLF handling
 # default to automatic

.github/codeql/config.yml

@@ -0,0 +1,22 @@
+name: "CodeQL Config"
+
+# Queries and the suites they belong to are documented at
+#    https://codeql.github.com/codeql-query-help/cpp/
+
+queries:
+  - uses: security-and-quality
+  # Choose the above from 3 query suites:
+  #   default
+  #      The default set of queries
+  #   security-extended
+  #      `default` suite plus lower severity and precision queries
+  #   security-and-quality
+  #      `security-extended`, plus maintainability and reliability queries
+
+query-filters:
+-
+  exclude:
+    id: cpp/use-of-goto
+-
+  exclude:
+    problem.severity: recommendation

.github/workflows/check-editorconfig.yml

@@ -0,0 +1,13 @@
+name: Check EditorConfig
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  editorconfig:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: EditorConfig-Action
+        uses: greut/eclint-action@v0

.github/workflows/ci-scripts-build.yml

@@ -27,6 +27,7 @@ on:
       - '.gitattributes'
       - '**/*.html'
       - '**/*.md'
+  workflow_dispatch:
 
 env:
     SETUP_PATH: .ci-local:.ci
@@ -41,9 +42,7 @@ jobs:
     env:
       CMP: ${{ matrix.cmp }}
       BCFG: ${{ matrix.configuration }}
-      WINE: ${{ matrix.wine }}
-      RTEMS: ${{ matrix.rtems }}
-      RTEMS_TARGET: ${{ matrix.rtems_target }}
+      CI_CROSS_TARGETS: ${{ matrix.cross }}
       EXTRA: ${{ matrix.extra }}
       TEST: ${{ matrix.test }}
     strategy:
@@ -51,114 +50,120 @@ jobs:
       matrix:
         # Job names also name artifacts, character limitations apply
         include:
+          - os: ubuntu-22.04
+            cmp: gcc-12
+            name: "Ub-22 gcc-12 c++20 Werror"
+            # Turn all warnings into errors,
+            # except for those we could not fix (yet).
+            # Remove respective -Wno-error=... flag once it is fixed.
+            extra: "CMD_CXXFLAGS=-std=c++20
+                    CMD_CPPFLAGS='-fdiagnostics-color
+                                  -fstack-protector-strong
+                                  -Wformat
+                                  -Werror
+                                  -Werror=format-security
+                                  -Wno-error=deprecated-declarations
+                                  -Wno-error=stringop-truncation
+                                  -Wno-error=restrict
+                                  -Wno-error=sizeof-pointer-memaccess
+                                  -Wno-error=nonnull
+                                  -Wno-error=dangling-pointer
+                                  -Wno-error=format-overflow
+                                  -Wno-error=stringop-overread
+                                  -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3'
+                    CMD_LDFLAGS=-Wl,-z,relro"
+
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            wine: "64"
-            name: "Ub-20 gcc-9 + MinGW"
+            cross: "windows-x64-mingw"
+            name: "Ub-20 gcc + MinGW"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: static
-            wine: "64"
-            name: "Ub-20 gcc-9 + MinGW, static"
+            cross: "windows-x64-mingw"
+            name: "Ub-20 gcc + MinGW, static"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: static
             extra: "CMD_CXXFLAGS=-std=c++11"
-            name: "Ub-20 gcc-9 C++11, static"
+            name: "Ub-20 gcc C++11, static"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: static
+            extra: "CMD_CFLAGS=-funsigned-char CMD_CXXFLAGS=-funsigned-char"
+            name: "Ub-20 gcc unsigned char"
 
           - os: ubuntu-20.04
             cmp: clang
             configuration: default
-            name: "Ub-20 clang-10"
+            name: "Ub-20 clang"
 
           - os: ubuntu-20.04
             cmp: clang
             configuration: default
             extra: "CMD_CXXFLAGS=-std=c++11"
-            name: "Ub-20 clang-10 C++11"
+            name: "Ub-20 clang C++11"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            rtems: "5"
-            rtems_target: RTEMS-pc686-qemu
-            name: "Ub-20 gcc-9 + RT-5.1 pc686"
+            cross: "RTEMS-pc686-qemu@5"
+            name: "Ub-20 gcc + RT-5.1 pc686"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            rtems: "5"
-            rtems_target: RTEMS-beatnik
+            cross: "RTEMS-beatnik@5"
             test: NO
-            name: "Ub-20 gcc-9 + RT-5.1 beatnik"
-
-          # Only build one RTEMS target per CPU family
-          # unless it's running the tests
-          #
-          # - os: ubuntu-20.04
-          #   cmp: gcc
-          #   configuration: default
-          #   rtems: "5"
-          #   rtems_target: RTEMS-mvme3100
-          #   test: NO
-          #   name: "Ub-20 gcc-9 + RT-5.1 mvme3100"
-          #
-          # - os: ubuntu-20.04
-          #   cmp: gcc
-          #   configuration: default
-          #   rtems: "5"
-          #   rtems_target: RTEMS-qoriq_e500
-          #   test: NO
-          #   name: "Ub-20 gcc-9 + RT-5.1 qoriq_e500"
+            name: "Ub-20 gcc + RT-5.1 beatnik"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            rtems: "5"
-            rtems_target: RTEMS-xilinx_zynq_a9_qemu
+            cross: "RTEMS-xilinx_zynq_a9_qemu@5"
             test: NO
-            name: "Ub-20 gcc-9 + RT-5.1 xilinx_zynq_a9_qemu"
+            name: "Ub-20 gcc + RT-5.1 xilinx_zynq_a9_qemu"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            rtems: "5"
-            rtems_target: RTEMS-uC5282
+            cross: "RTEMS-uC5282@5"
             test: NO
-            name: "Ub-20 gcc-9 + RT-5.1 uC5282"
+            name: "Ub-20 gcc + RT-5.1 uC5282"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            rtems: "4.10"
-            name: "Ub-20 gcc-9 + RT-4.10"
-            rtems_target: RTEMS-pc386-qemu
+            name: "Ub-20 gcc + RT-4.10"
+            cross: "RTEMS-pc386-qemu@4.10"
             test: NO
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            rtems: "4.9"
-            name: "Ub-20 gcc-9 + RT-4.9"
-            rtems_target: RTEMS-pc386-qemu
+            name: "Ub-20 gcc + RT-4.9"
+            cross: "RTEMS-pc386-qemu@4.9"
 
           - os: macos-latest
             cmp: clang
             configuration: default
-            name: "MacOS clang-12"
+            name: "MacOS clang"
 
           - os: windows-2019
             cmp: vs2019
-            configuration: default
+            configuration: debug
             name: "Win2019 MSC-19"
+            extra: "CMD_CXXFLAGS=-analysis"
 
           - os: windows-2019
             cmp: vs2019
-            configuration: static
+            configuration: static-debug
             name: "Win2019 MSC-19, static"
+            extra: "CMD_CXXFLAGS=-analysis"
 
           - os: windows-2019
             cmp: vs2019
@@ -170,8 +175,28 @@ jobs:
             configuration: default
             name: "Win2019 mingw"
 
+          # Cross builds
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            name: "Cross linux-aarch64"
+            cross: linux-aarch64
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            name: "Cross linux-arm gnueabi"
+            cross: linux-arm@arm-linux-gnueabi
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            name: "Cross linux-arm gnueabihf"
+            cross: linux-arm@arm-linux-gnueabihf
+
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Automatic core dumper analysis
@@ -189,7 +214,7 @@ jobs:
       run: python .ci/cue.py -T 60M test
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'
@@ -214,15 +239,10 @@ jobs:
       matrix:
         # Job names also name artifacts, character limitations apply
         include:
-          - name: "CentOS-7"
-            image: centos:7
-            cmp: gcc
-            configuration: default
-
-          - name: "CentOS-8"
-            image: centos:8
-            cmp: gcc
-            configuration: default
+          #- name: "CentOS-7"
+          #  image: centos:7
+          #  cmp: gcc
+          #  configuration: default
 
           - name: "Fedora-33"
             image: fedora:33
@@ -261,11 +281,15 @@ jobs:
         # people would rather just break all existing scripts...
         [ -e /usr/bin/python ] || ln -sf python3 /usr/bin/python
         python --version
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Automatic core dumper analysis
       uses: mdavidsaver/ci-core-dumper@master
+      if: matrix.image!='centos:7'
+    - name: Automatic core dumper analysis
+      uses: mdavidsaver/ci-core-dumper@node16
+      if: matrix.image=='centos:7'
     - name: Prepare and compile dependencies
       run: python .ci/cue.py prepare
     - name: Build main module
@@ -274,7 +298,7 @@ jobs:
       run: python .ci/cue.py -T 20M test
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'

.github/workflows/codeql.yml

@@ -0,0 +1,64 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: 7.0
+    tags: 'R7.0.*'
+  pull_request:
+    branches: 7.0
+    paths-ignore:
+      - '.appveyor/*'
+      - '.tools/*'
+      - 'documentation/*'
+      - 'startup/*'
+      - '**/*.md'
+      - '**/*.html'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on:
+      - ubuntu-latest
+    # - windows-latest
+    # Supported by CodeQL which would check the Windows
+    # port, but needs more work here to set it up
+
+    permissions:
+      # Required for all workflows:
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ cpp ]
+
+    steps:
+      - name: Checkout Repositories
+        uses: actions/checkout@v4
+        with:
+          submodules: false
+
+      - name: Install Packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install --yes libreadline-dev
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          config-file: ./.github/codeql/config.yml
+
+      - name: Build C/C++
+        run: |
+          echo '*** Building with these versions >>>'
+          g++ --version
+          make --version
+          perl --version
+          echo '<<<'
+          make -sj2 || echo '*** Ignoring build failure for CodeQL ***'
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{ matrix.language }}"

.gitignore

@@ -3,6 +3,7 @@
 /lib/
 /db/
 /dbd/
+/doc/
 /html/
 /include/
 /templates/
@@ -11,8 +12,14 @@
 /modules/Makefile.local
 O.*/
 /QtC-*
+/.qtc_*
 /.vscode/
 *.orig
 *.log
 .*.swp
 .DS_Store
+.iocsh_history
+RPMS
+SRPMS
+BUILDROOT
+*.rpm

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "modules/pvData"]
     path = modules/pvData
-    url = https://github.com/epics-base/pvDataCPP
+#    url = https://github.com/epics-base/pvDataCPP
+    url = git@git.psi.ch:epics_base/pvData.git
     branch = master
 [submodule "modules/pvAccess"]
     path = modules/pvAccess
@@ -26,3 +27,6 @@
     path = .ci
     url = https://github.com/epics-base/ci-scripts
     branch = master
+[submodule "modules/pcas"]
+    path = modules/pcas
+    url = https://github.com/epics-modules/pcas

.readthedocs.yaml

@@ -0,0 +1,36 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+      python: "3.9"
+  apt_packages:
+    - graphviz
+    - rsync
+  jobs:
+    pre_build:
+      - make inc
+      - make -C documentation rtd
+
+# Build documentation in the documentation/O.Common directory with Sphinx
+sphinx:
+  configuration: documentation/O.Common/rtd-src/conf.py
+
+# Build documentation with MkDocs
+#mkdocs:
+#  configuration: mkdocs.yml
+
+# Optionally build your docs in additional formats such as PDF and ePub
+#formats: []
+
+submodules:
+    exclude: all
+
+python:
+   install:
+      - requirements: documentation/requirements.txt

.tools/make-tar.sh

@@ -20,9 +20,9 @@ maybedie() {
 
 usage() {
    cat <<EOF >&2
-usage: $0 [-v] [-s] <rev> [<outfile> [<prefix>]]
+usage: $0 [-v] [-d] <rev> [<outfile> [<prefix>]]
 
-  <rev> may be any git revision spec. (tag, branch, or commit id).
+  <rev> may be any git revision spec. (tag or, using -d, branch or commit id).
 
   If provided, <outfile> must end with ".tar", ".tar.gz" or ".tar.bz2".
   If <outfile> is omitted, "base-<rev>.tar.gz" will be used.
@@ -136,17 +136,20 @@ sed -i -e 's|^\./||' "$TDIR"/list.1
 
 # Exclude files
 sed \
-  -e '/\/\.ci\//d' \
-  -e '/\/\.ci-local\//d' \
-  -e '/\/\.tools\//d' \
-  -e '/\/jenkins\//d' \
-  -e '/\/\.git/d' \
-  -e '/\/\.hgtags$/d' \
-  -e '/\/\.cproject$/d' \
-  -e '/\/\.project$/d' \
-  -e '/\/\.travis\.yml$/d' \
   -e '/\/\.appveyor\.yml$/d' \
+  -e '/\/\.appveyor\//d' \
+  -e '/\/\.ci-local\//d' \
+  -e '/\/\.ci\//d' \
+  -e '/\/\.cproject$/d' \
+  -e '/\/\.github\//d' \
+  -e '/\/\.gitmodules$/d' \
+  -e '/\/\.hgtags$/d' \
+  -e '/\/\.lgtm\.yml$/d' \
+  -e '/\/\.project$/d' \
   -e '/\/\.readthedocs\.yml$/d' \
+  -e '/\/\.tools\//d' \
+  -e '/\/\.travis\.yml$/d' \
+  -e '/\/jenkins\//d' \
   "$TDIR"/list.1 > "$TDIR"/list.2
 
 if ! diff -U 0 "$TDIR"/list.1 "$TDIR"/list.2

Makefile

@@ -23,3 +23,13 @@ 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)
+
+rpm:
+	rpmbuild -bb epics-base.spec

configure/CONFIG

@@ -34,6 +34,11 @@ ifeq ($(origin EPICS_HOST_ARCH), undefined)
   EHA :=
 endif
 
+# Make Perl hash iteration reproducible.
+# See: https://reproducible-builds.org/docs/stable-outputs/
+#
+export PERL_HASH_SEED = 0
+
 -include $(CONFIG)/RELEASE
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH)
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH).Common

configure/CONFIG.gnuCommon

@@ -27,13 +27,17 @@ RANLIB = $(GNU_BIN)/$(CMPLR_PREFIX)ranlib$(CMPLR_SUFFIX)
 ASAN_FLAGS_YES = -fsanitize=address
 ASAN_LDFLAGS_YES = $(ASAN_FLAGS_YES)
 
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
 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 -Werror-implicit-function-declaration
 WARN_CFLAGS_NO = -w
-OPT_CFLAGS_YES = -O3
+OPT_CFLAGS_YES = -O3 -g
 OPT_CFLAGS_NO = -g
 
 PROF_CXXFLAGS_YES = -p
@@ -42,11 +46,12 @@ CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
 CODE_CXXFLAGS += $(ASAN_FLAGS_$(ENABLE_ASAN))
 WARN_CXXFLAGS_YES = -Wall
 WARN_CXXFLAGS_NO = -w
-OPT_CXXFLAGS_YES = -O3
+OPT_CXXFLAGS_YES = -O3 -g
 OPT_CXXFLAGS_NO = -g
 
 CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
 CODE_LDFLAGS += $(ASAN_LDFLAGS_$(ENABLE_ASAN))
+OPT_LDFLAGS_NO = -g
 
 PIPE_CFLAGS_YES_YES = -pipe
 PIPE_CFLAGS = $(PIPE_CFLAGS_$(GCC_PIPE)_$(GNU))

configure/CONFIG_BASE

@@ -38,11 +38,20 @@ TOOLS = $(abspath $(EPICS_BASE_HOST_BIN))
 FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) \
     $(TOP)/src/tools/$(1)) $(EPICS_BASE)/src/tools/$(1))
 
+#---------------------------------------------------------------
+# Find Perl modules for dependencies
+FIND_PM = $(wildcard $(EPICS_BASE)/lib/perl/$(1))
+
 #---------------------------------------------------------------
 # EPICS Base build tools and tool flags
 
-PODTOHTML        = $(PERL) $(TOOLS)/podToHtml.pl
+PODTOMD_pl       = $(TOOLS)/podToMD.pl
+PODTOMD          = $(PERL) $(PODTOMD_pl)
+PODTOHTML_pl     = $(TOOLS)/podToHtml.pl
+PODTOHTML_dep    = $(PODTOHTML_pl) $(call FIND_PM,EPICS/PodHtml.pm)
+PODTOHTML        = $(PERL) $(PODTOHTML_pl)
 CONVERTRELEASE   = $(PERL) $(call FIND_TOOL,convertRelease.pl)
+FILTERMAKEFLAGS  = $(PERL) $(call FIND_TOOL,filterMakeflags.pl)
 FULLPATHNAME     = $(PERL) $(TOOLS)/fullPathName.pl
 GENVERSIONHEADER = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG) $(QUESTION_FLAG)
 
@@ -59,6 +68,24 @@ INSTALL_LIBRARY = $(INSTALL)
 MKMF       = $(PERL) $(TOOLS)/mkmf.pl
 REPLACEVAR = $(PERL) $(TOOLS)/replaceVAR.pl
 
+#---------------------------------------------------------------
+# How to portably check the flags to make
+# GNUmake versions before 4.0 gave different values
+makeflags := $(shell $(FILTERMAKEFLAGS) $(MAKEFLAGS))
+define checkflags
+  make-$1 := $(findstring $1,$(makeflags))
+endef
+# This is extensible to most single letter flags:
+$(foreach flag,s q, $(eval $(call checkflags,$(flag))))
+
+# Silent builds - suppress messages during 'make -s'
+NOP = :
+ECHO = @$(if $(make-s),$(NOP),echo)
+QUIET_FLAG := $(if $(make-s),-q,)
+
+# Convert 'make -q' flag into '-i' for genVersionHeader.pl
+QUESTION_FLAG := $(if $(make-q),-i,)
+
 #---------------------------------------------------------------
 # tools for cleaning out unwanted files
 CVSCLEAN = $(call FIND_TOOL,cvsclean.pl)

configure/CONFIG_BASE_VERSION

@@ -48,7 +48,7 @@ EPICS_VERSION = 7
 EPICS_REVISION = 0
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 6
+EPICS_MODIFICATION = 8
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included in the official EPICS version number if zero

configure/CONFIG_CA_VERSION

@@ -2,7 +2,7 @@
 
 EPICS_CA_MAJOR_VERSION = 4
 EPICS_CA_MINOR_VERSION = 14
-EPICS_CA_MAINTENANCE_VERSION = 2
+EPICS_CA_MAINTENANCE_VERSION = 4
 
 # Development flag, set to zero for release versions
 

configure/CONFIG_COMMON

@@ -81,16 +81,6 @@ FINAL_LOCATION              = $(INSTALL_ABSOLUTE)
 # IOC's view of install path
 IOCS_APPL_TOP               = $(INSTALL_ABSOLUTE)
 
-#-------------------------------------------------------
-# Silencing the build - suppress messages during 'make -s'
-NOP = :
-ECHO = @$(if $(filter -s,$(MFLAGS)),$(NOP),echo)
-QUIET_FLAG := $(if $(filter -s,$(MFLAGS)),-q,)
-
-#-------------------------------------------------------
-# Convert 'make -q' flag into '-i' for genVersionHeader.pl
-QUESTION_FLAG := $(if $(filter -q,$(MFLAGS)),-i,)
-
 #-------------------------------------------------------
 ifdef T_A
 
@@ -267,6 +257,7 @@ WARN_CXXFLAGS = $(WARN_CXXFLAGS_$($(BUILD_CLASS)_WARN))
 OPT_CPPFLAGS = $(OPT_CPPFLAGS_$($(BUILD_CLASS)_OPT))
 OPT_CFLAGS = $(OPT_CFLAGS_$($(BUILD_CLASS)_OPT))
 OPT_CXXFLAGS = $(OPT_CXXFLAGS_$($(BUILD_CLASS)_OPT))
+OPT_LDFLAGS = $(OPT_LDFLAGS_$($(BUILD_CLASS)_OPT))
 
 # Static build flags
 STATIC_CFLAGS = $(STATIC_CFLAGS_$(STATIC_BUILD))
@@ -288,7 +279,6 @@ TARGET_LIB_LDFLAGS = $(if $(findstring $*, $(LOADABLE_LIBRARY)), \
 
 #--------------------------------------------------
 # Command-line input support default
-COMMANDLINE_LIBRARY = EPICS
 OP_SYS_LDLIBS += $(LDLIBS_$(COMMANDLINE_LIBRARY))
 OP_SYS_LDFLAGS += $(LDFLAGS_$(COMMANDLINE_LIBRARY))
 RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
@@ -415,9 +405,9 @@ INSTALL_LIB_INSTALLS = $(addprefix $(INSTALL_LIB)/,$(notdir $(LIB_INSTALLS)))
 
 #---------------------------------------------------------------
 # Installed file permissions
-BIN_PERMISSIONS = 555
-LIB_PERMISSIONS = 444
-SHRLIB_PERMISSIONS = 555
+BIN_PERMISSIONS = 755
+LIB_PERMISSIONS = 644
+SHRLIB_PERMISSIONS = 755
 INSTALL_PERMISSIONS = 444
 
 #---------------------------------------------------------------
@@ -479,4 +469,9 @@ COMMON_INC += $(filter $(COMMON_DIR)/%, \
             $(foreach dir, $(ALL_SRC_DIRS), \
                 $(addsuffix /$(file), $(dir)))) $(COMMON_DIR)/$(file))))
 
+COMMON_DOCS += $(filter $(COMMON_DIR)/%, \
+    $(foreach file, $(DOCS), \
+        $(firstword $(wildcard $(file) \
+            $(foreach dir, $(ALL_SRC_DIRS), \
+                $(addsuffix /$(file), $(dir)))) $(COMMON_DIR)/$(file))))
 endif

configure/CONFIG_DATABASE_MODULE

@@ -5,22 +5,30 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# Set EPICS_DATABASE if necessary
-ifndef EPICS_DATABASE
-  EPICS_DATABASE = $(if $(BUILDING_DATABASE),$(INSTALL_LOCATION),$(EPICS_BASE))
+# Installed perl scripts and dependent modules that have
+# a significant effect on the script's output
+DBDEXPAND_pl      = $(EPICS_BASE_HOST_BIN)/dbdExpand.pl
+DBDTORECTYPEH_pl  = $(EPICS_BASE_HOST_BIN)/dbdToRecordtypeH.pl
+DBDTORECTYPEH_dep = $(DBDTORECTYPEH_pl) $(call FIND_PM,DBD/Rec*.pm)
+DBDTOMENUH_pl     = $(EPICS_BASE_HOST_BIN)/dbdToMenuH.pl
+DBDTOMENUH_dep    = $(DBDTOMENUH_pl) $(call FIND_PM,DBD/Menu.pm)
+DBDTOMD_pl        = $(EPICS_BASE_HOST_BIN)/dbdToMD.pl
+DBDTOHTML_pl      = $(EPICS_BASE_HOST_BIN)/dbdToHtml.pl
+DBDTOHTML_dep     = $(DBDTOHTML_pl) $(call FIND_PM,EPICS/Pod*Html.pm)
+REGRECDEVDRV_pl   = $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl
+REGRECDEVDRV_dep  = $(REGRECDEVDRV_pl)
 
-  # Paths to tools built here
-  EPICS_DATABASE_HOST_BIN = $(EPICS_DATABASE)/bin/$(EPICS_HOST_ARCH)
-endif
+# Commands for running scripts in recipes
+DBEXPAND                   = $(PERL) $(DBDEXPAND_pl)
+DBTORECORDTYPEH            = $(PERL) $(DBDTORECTYPEH_pl)
+DBTOMENUH                  = $(PERL) $(DBDTOMENUH_pl)
+DBDTOMD                    = $(PERL) $(DBDTOMD_pl)
+DBDTOHTML                  = $(PERL) $(DBDTOHTML_pl)
+REGISTERRECORDDEVICEDRIVER = $(PERL) $(REGRECDEVDRV_pl)
 
-# Set location of locally-built tools
-MAKEBPT                    = $(EPICS_DATABASE_HOST_BIN)/makeBpt$(HOSTEXE)
-DBEXPAND                   = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdExpand.pl
-DBTORECORDTYPEH            = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToRecordtypeH.pl
-DBTOMENUH                  = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToMenuH.pl
-DBDTOHTML                  = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToHtml.pl
-REGISTERRECORDDEVICEDRIVER = $(PERL) $(EPICS_DATABASE_HOST_BIN)/registerRecordDeviceDriver.pl
-MSI3_15                    = $(EPICS_DATABASE_HOST_BIN)/msi$(HOSTEXE)
+# Installed binary executables, quoted for running on Windows
+MAKEBPT = "$(EPICS_BASE_HOST_BIN)/makeBpt$(HOSTEXE)"
+MSI3_15 = "$(EPICS_BASE_HOST_BIN)/msi$(HOSTEXE)"
 
 # Libraries needed to link a basic IOC
 EPICS_BASE_IOC_LIBS = dbRecStd dbCore ca Com

configure/CONFIG_DATABASE_VERSION

@@ -1,7 +1,7 @@
 # Version number for the database APIs and shared library
 
 EPICS_DATABASE_MAJOR_VERSION = 3
-EPICS_DATABASE_MINOR_VERSION = 21
+EPICS_DATABASE_MINOR_VERSION = 23
 EPICS_DATABASE_MAINTENANCE_VERSION = 1
 
 # Development flag, set to zero for release versions

configure/CONFIG_LIBCOM_MODULE

@@ -5,9 +5,10 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# Set location of locally generated tools
-YACC = $(abspath $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH))/antelope$(HOSTEXE)
-LEX = $(abspath $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH))/e_flex$(HOSTEXE) \
+# Our locally-built tools
+# Windows can need these paths to be quoted
+YACC = "$(EPICS_BASE_HOST_BIN)/antelope$(HOSTEXE)"
+LEX  = "$(EPICS_BASE_HOST_BIN)/e_flex$(HOSTEXE)" \
         -S$(EPICS_BASE)/include/flex.skel.static
 
 # Default stack size for osiThread

configure/CONFIG_LIBCOM_VERSION

@@ -1,7 +1,7 @@
 # Version number for the libcom APIs and shared library
 
 EPICS_LIBCOM_MAJOR_VERSION = 3
-EPICS_LIBCOM_MINOR_VERSION = 21
+EPICS_LIBCOM_MINOR_VERSION = 23
 EPICS_LIBCOM_MAINTENANCE_VERSION = 1
 
 # Development flag, set to zero for release versions

configure/CONFIG_SITE

@@ -157,7 +157,9 @@ USE_POSIX_THREAD_PRIORITY_SCHEDULING = YES
 
 # Site version number, if set will append '-' and this string to the
 #  EPICS version number string that is reported by many tools.
-EPICS_SITE_VERSION =
+ifeq ($(INSTALL_LOCATION),$(EPICS_BASE))
+EPICS_SITE_VERSION=$(shell $(PERL) -MPOSIX -e 'print strftime "%Y-%m-%d", localtime')
+endif
 
 # For GNU compiler, use pipes rather than temporary files for
 #  communication between the various stages of compilation.

configure/Makefile

@@ -34,5 +34,9 @@ CFG += TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A)
 
 include $(TOP)/configure/RULES
 
+ifeq ($(GNU),YES)
+  # Pass compiler flags to preprocessor to enable _FORTIFY_SOURCE
+  TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A): CPPFLAGS += $(CFLAGS)
+endif
 TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A): toolchain.c
 	$(PREPROCESS.cpp)

configure/RULES.Db

@@ -17,7 +17,7 @@ TEMPL_SUFFIX ?= .template
 # vpath
 
 vpath %.pm $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
-vpath %.pod $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
+vpath %.pod $(USR_VPATH) $(SRC_DIRS) .. $(dir $(DBD))
 vpath %.dbd $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.db $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
 vpath %.vdb $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
@@ -197,7 +197,7 @@ endif
 # build dependancies, clean rule
 
 inc: $(COMMON_INC) $(INSTALL_INC) $(COMMON_DBDS) $(COMMON_DBDCATS) \
-	$(INSTALL_DBDS) $(INSTALL_DBD_INSTALLS)
+	$(INSTALL_DBDS) $(INSTALL_DBD_INSTALLS) $(COMMON_DOCS)
 
 build: $(COMMON_DBS) $(INSTALL_DBS) \
 	$(DBDDEPENDS_FILES) $(TARGETS) \
@@ -217,32 +217,32 @@ realclean: clean
 #---------------------------------------------------------------
 # Dependency files
 
-%Record.h$(DEP): $(COMMON_DIR)/%Record.dbd
+%Record.h$(DEP): $(COMMON_DIR)/%Record.dbd $(DBDTORECTYPEH_dep)
 	@$(RM) $@
 	@$(DBTORECORDTYPEH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-%Record.h$(DEP): %Record.dbd
+%Record.h$(DEP): %Record.dbd $(DBDTORECTYPEH_dep)
 	@$(RM) $@
 	@$(DBTORECORDTYPEH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-%Record.h$(DEP): ../%Record.dbd
+%Record.h$(DEP): ../%Record.dbd $(DBDTORECTYPEH_dep)
 	@$(RM) $@
 	@$(DBTORECORDTYPEH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-menu%.h$(DEP): $(COMMON_DIR)/menu%.dbd
+menu%.h$(DEP): $(COMMON_DIR)/menu%.dbd $(DBDTOMENUH_dep)
 	@$(RM) $@
 	@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-menu%.h$(DEP): menu%.dbd
+menu%.h$(DEP): menu%.dbd $(DBDTOMENUH_dep)
 	@$(RM) $@
 	@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-menu%.h$(DEP): ../menu%.dbd
+menu%.h$(DEP): ../menu%.dbd $(DBDTOMENUH_dep)
 	@$(RM) $@
 	@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
@@ -261,7 +261,7 @@ menu%.h$(DEP): ../menu%.dbd
 	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-%.dbd$(DEP):
+%.dbd$(DEP): $($*_DBD)
 	@$(RM) $@
 	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $($*_DBD) > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
@@ -330,32 +330,32 @@ $(INSTALL_DB)/%$(TEMPL_SUFFIX): ../%$(TEMPL_SUFFIX)
 #---------------------------------------------------------------
 # INC files
 
-$(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd
+$(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd $(DBDTORECTYPEH_dep)
 	@$(RM) $(notdir $@)
 	$(DBTORECORDTYPEH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%Record.h: %Record.dbd
+$(COMMON_DIR)/%Record.h: %Record.dbd $(DBDTORECTYPEH_dep)
 	@$(RM) $(notdir $@)
 	$(DBTORECORDTYPEH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%Record.h: ../%Record.dbd
+$(COMMON_DIR)/%Record.h: ../%Record.dbd $(DBDTORECTYPEH_dep)
 	@$(RM) $(notdir $@)
 	$(DBTORECORDTYPEH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/menu%.h: $(COMMON_DIR)/menu%.dbd
+$(COMMON_DIR)/menu%.h: $(COMMON_DIR)/menu%.dbd $(DBDTOMENUH_dep)
 	@$(RM) $(notdir $@)
 	$(DBTOMENUH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/menu%.h: menu%.dbd
+$(COMMON_DIR)/menu%.h: menu%.dbd $(DBDTOMENUH_dep)
 	@$(RM) $(notdir $@)
 	$(DBTOMENUH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/menu%.h: ../menu%.dbd
+$(COMMON_DIR)/menu%.h: ../menu%.dbd $(DBDTOMENUH_dep)
 	@$(RM) $(notdir $@)
 	$(DBTOMENUH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
@@ -366,6 +366,7 @@ $(COMMON_DIR)/menu%.h: ../menu%.dbd
 # DBD files
 
 $(COMMON_DIR)/bpt%.dbd: bpt%.data
+	$(ECHO) "Converting data from $<"
 	@$(RM) $(notdir $@)
 	$(MAKEBPT) $< $(notdir $@)
 	@$(MV) $(notdir $@) $@
@@ -399,7 +400,7 @@ $(COMMON_DBDCATS):$(COMMON_DIR)/%.dbd:
 	$(DBDCAT_COMMAND)
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.dbd:
+$(COMMON_DIR)/%.dbd: $($*_DBD)
 	$(ECHO) "Creating dbd file $(notdir $@)"
 	@$(RM) $(notdir $@)
 	$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $($*_DBD)
@@ -426,31 +427,51 @@ $(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))
 
 .PRECIOUS: $(COMMON_DBDS) $(COMMON_DIR)/%.dbd
 
+#---------------------------------------------------------------
+# Markdown files
+
+$(COMMON_DIR)/%.md: %.dbd.pod $(DBDTOMD_pl)
+	@$(RM) $(notdir $@)
+	$(DBDTOMD) $(DBDFLAGS) -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
+
+$(COMMON_DIR)/%.md: %.pod $(PODTOMD_pl)
+	@$(RM) $(notdir $@)
+	$(PODTOMD) -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
+
+$(COMMON_DIR)/%.md: ../%.pl $(PODTOMD_pl)
+	@$(RM) $(notdir $@)
+	$(PODTOMD) -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
+
+.PRECIOUS: $(COMMON_DIR)/%.md
+
 #---------------------------------------------------------------
 # HTML files
 
-$(COMMON_DIR)/%.html: %.dbd.pod
+$(COMMON_DIR)/%.html: %.dbd.pod $(DBDTOHTML_pl)
 	@$(RM) $(notdir $@)
 	$(DBDTOHTML) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: %.pod
+$(COMMON_DIR)/%.html: %.pod $(PODTOHTML_dep)
 	@$(RM) $(notdir $@)
 	$(PODTOHTML) -s -s -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: %.pm
+$(COMMON_DIR)/%.html: %.pm $(PODTOHTML_dep)
 	@$(RM) $(notdir $@)
 	$(PODTOHTML) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: ../%.pm
+$(COMMON_DIR)/%.html: ../%.pm $(PODTOHTML_dep)
 	@$(RM) $(notdir $@)
 	$(PODTOHTML) -s -o $(notdir $@) $<
 	@$(MKDIR) $(dir $@)
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: ../%.pl
+$(COMMON_DIR)/%.html: ../%.pl $(PODTOHTML_dep)
 	@$(RM) $(notdir $@)
 	$(PODTOHTML) -s -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
@@ -526,16 +547,19 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 #---------------------------------------------------------------
 # register record,device,driver support
 
-%_registerRecordDeviceDriver.cpp: $(COMMON_DIR)/%.dbd
+%_registerRecordDeviceDriver.cpp: $(COMMON_DIR)/%.dbd $(REGRECDEVDRV_dep)
 	@$(RM) $@
-	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ $< $(basename $@) $(IOCS_APPL_TOP)
+	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ \
+            $< $(basename $@) $(IOCS_APPL_TOP)
 
-%_registerRecordDeviceDriver.cpp: %.dbd
+%_registerRecordDeviceDriver.cpp: %.dbd $(REGRECDEVDRV_dep)
 	@$(RM) $@
-	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ $< $(basename $@) $(IOCS_APPL_TOP)
+	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ \
+            $< $(basename $@) $(IOCS_APPL_TOP)
 
-%_registerRecordDeviceDriver.cpp: ../%.dbd
+%_registerRecordDeviceDriver.cpp: ../%.dbd $(REGRECDEVDRV_dep)
 	@$(RM) $@
-	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ $< $(basename $@) $(IOCS_APPL_TOP)
+	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ \
+            $< $(basename $@) $(IOCS_APPL_TOP)
 
 .PRECIOUS: %_registerRecordDeviceDriver.cpp

configure/RULES_BUILD

@@ -22,7 +22,8 @@ vpath %.cpp $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.rc $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.h $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.hpp $(USR_VPATH) $(ALL_SRC_DIRS)
-vpath %.html $(USR_VPATH) $(ALL_SRC_DIRS)
+vpath %.html $(USR_VPATH) $(ALL_SRC_DIRS) $(COMMON_DIR)
+vpath %.md $(USR_VPATH) $(ALL_SRC_DIRS) $(COMMON_DIR)
 vpath %.skel.static $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.y $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.l $(USR_VPATH) $(ALL_SRC_DIRS)
@@ -100,6 +101,23 @@ include $(CONFIG)/RULES_FILE_TYPE
 
 include $(CONFIG)/RULES.Db
 
+#---------------------------------------------------------------
+# Do not build anything if current path matches SKIP_BUILDS
+
+ifneq (,$(strip $(SKIP_BUILDS)))
+CURRENT_MODULE=$(subst modules/,,$(subst $(realpath $(TOP)/..)/,,$(subst $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)/,,$(realpath ..))))
+ifneq ($(filter $(SKIP_BUILDS) $(addsuffix /%,$(SKIP_BUILDS)),$(CURRENT_MODULE)),)
+$(info Skipping $(CURRENT_MODULE) for $(T_A))
+PROD=
+TESTPROD=
+LIBRARY=
+TESTLIBRARY=
+LOADABLE_LIBRARY=
+TESTS=
+SRC_FILES=
+endif
+endif
+
 #---------------------------------------------------------------
 # Include defines and rules for prod, library and test* targets
 
@@ -111,7 +129,7 @@ endif
 #---------------------------------------------------------------
 # Read dependency files
 
-ifneq (inc,$(strip $(MAKECMDGOALS)))
+ifneq ($(filter-out inc,$(strip $(MAKECMDGOALS))),)
 ifneq (,$(strip $(HDEPENDS_FILES)))
 $(filter-out $(wildcard *$(DEP)), $(HDEPENDS_FILES)): | $(COMMON_INC)
 -include $(HDEPENDS_FILES)
@@ -165,12 +183,12 @@ build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODTARGETS) \
 	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)
 
 inc: $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS) $(INSTALLS_CFG) \
-	$(INSTALL_HTMLS) $(INSTALLS_PERL_MODULES) $(INSTALL_SCRIPTS)
+	$(INSTALL_HTMLS) $(INSTALLS_PERL_MODULES) $(INSTALL_SCRIPTS) \
+	$(INSTALL_DOCS)
 
 buildInstall: \
 	$(INSTALL_PROD) $(INSTALL_MUNCHS) \
 	$(INSTALL_TCLLIBS) $(INSTALL_TCLINDEX) \
-	$(INSTALL_DOCS) \
 	$(INSTALL_OBJS) \
 	$(INSTALL_TEMPLATE) \
 	$(INSTALL_BIN_INSTALLS)
@@ -207,7 +225,7 @@ endif
 checkRelease:
 	+$(CONVERTRELEASE) checkRelease
 warnRelease:
-	$(CONVERTRELEASE) checkRelease
+	-$(CONVERTRELEASE) checkRelease
 noCheckRelease:
 ifeq ($(EPICS_HOST_ARCH),$(T_A))
 	$(info Warning: RELEASE file consistency checks have been disabled)
@@ -226,7 +244,7 @@ $(LOADABLE_SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)
 
 $(TESTPRODNAME) $(PRODNAME): $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)
 
-$(TESTPRODNAME) $(PRODNAME): %$(EXE): | $(INSTALL_LIB)
+$(TESTPRODNAME) $(PRODNAME): %$(EXE):
 	@$(RM) $@
 	$(LINK.cpp)
 	$(MT_EXE_COMMAND)
@@ -329,10 +347,6 @@ $(LOADABLE_SHRLIBNAME): $(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX):
 	$(LINK.shrlib)
 	$(MT_DLL_COMMAND)
 
-$(LIBNAME) $(SHRLIBNAME) $(LOADABLE_SHRLIBNAME): | $(INSTALL_LIB)
-$(INSTALL_LIB):
-	@$(MKDIR) $@
-
 #---------------------------------------------------------------
 # C++ munching for VxWorks
 
@@ -373,11 +387,11 @@ $(MODNAME): %$(MODEXT): %$(EXE)
 # Automated testing
 
 runtests: run-tap-tests
-run-tap-tests: $(TESTSCRIPTS.t)
+run-tap-tests: | build
 ifneq ($(TESTSCRIPTS.t),)
 ifdef RUNTESTS_ENABLED
-	$(ECHO) "$(PROVE) $^"
-	@$(PROVE) $^ || $(PROVE_FAILURE)
+	$(ECHO) "$(PROVE) $(TESTSCRIPTS.t)"
+	@$(PROVE) $(TESTSCRIPTS.t) || $(PROVE_FAILURE)
 endif
 endif
 
@@ -390,8 +404,8 @@ test-results: tap-results
 tap-results: $(TAPFILES)
 ifneq ($(strip $(TAPFILES)),)
 ifdef RUNTESTS_ENABLED
-	$(ECHO) "$(PROVE.tap) $^"
-	@$(PROVE.tap) $^ || $(PROVE_FAILURE)
+	$(ECHO) "$(PROVE.tap) $(TAPFILES)"
+	@$(PROVE.tap) $(TAPFILES) || $(PROVE_FAILURE)
 endif
 
 CURRENT_TAPFILES := $(wildcard $(TAPFILES))
@@ -407,7 +421,7 @@ ifneq ($(CURRENT_JUNITFILES),)
 endif
 
 # A .tap file is the output from running the associated test script
-$(TAPFILES.t): %.tap: %.t
+$(TAPFILES.t): %.tap: %.t | build
 ifdef RUNTESTS_ENABLED
 	$(ECHO) "$(PERL) $< -tap > $@"
 	@$(PERL) $< -tap > $@ || $(TAPFILE_FAILURE)
@@ -501,6 +515,13 @@ ifneq (,$(strip $(SHRLIB_VERSION)))
 	@$(RM) $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 	ln -s $< $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 endif # SHRLIB_VERSION
+else  # SHRLIB_SUFFIX
+ifeq ($(BUILD_CLASS),HOST)
+ifneq (,$(strip $(SHRLIB_VERSION)))
+	@$(RM) $@.$(SHRLIB_VERSION)
+	ln -s $< $@.$(SHRLIB_VERSION)
+endif # HOST
+endif # SHRLIB_VERSION
 endif # SHRLIB_SUFFIX
 
 ifneq ($(INSTALL_TCLLIB),$(INSTALL_BIN))
@@ -532,11 +553,11 @@ endif # LOADABLE_SHRLIB_SUFFIX
 ifneq ($(INSTALL_CONFIGS),)
 $(INSTALL_CONFIG)/%: %
 	$(ECHO) "Installing config file $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $(abspath $< $(@D))
 
 $(INSTALL_CONFIG)/%: ../%
 	$(ECHO) "Installing config file $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $(abspath $< $(@D))
 endif
 
 $(INSTALL_INCLUDE)/%: $(COMMON_DIR)/%
@@ -555,6 +576,10 @@ $(INSTALL_INCLUDE)/compiler/$(CMPLR_CLASS)/%: %
 	$(ECHO) "Installing compiler dependent include file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
+$(INSTALL_DOC)/%: $(COMMON_DIR)/%
+	$(ECHO) "Installing generated doc $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+
 $(INSTALL_DOC)/%: %
 	$(ECHO) "Installing doc $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)

configure/RULES_COMMON

@@ -27,7 +27,7 @@ $(foreach file,$(MAKEFILE_LIST), \
 
 PRINT_Var = $(@:PRINT.%=%)
 PRINT.%:
-	@echo $(PRINT_Var) = '$($(PRINT_Var))'
+	@+echo $(PRINT_Var) = '$($(PRINT_Var))'
 
 .PHONY: PRINT PRINT.%
 

configure/RULES_EXPAND

@@ -47,7 +47,7 @@ vpath %@ $(USR_VPATH) $(ALL_SRC_DIRS)
 #        INC += myVersion.h
 
 # Default settings
-EXPAND_TOOL ?= $(PERL) $(TOOLS)/expandVars.pl
+EXPAND_TOOL ?= $(PERL) $(TOOLS)/expandVars.pl $(QUIET_FLAG)
 
 EXPANDARCH = -a $(T_A)
 EXPANDFLAGS += -t $(INSTALL_LOCATION)
@@ -55,22 +55,17 @@ EXPANDFLAGS += $(addprefix -D ,$(EXPAND_VARS) $($@_EXPAND_VARS))
 EXPANDFLAGS += $(foreach var, $(EXPAND_ME) $($@_EXPAND_ME), \
     -D$(var)="$(strip $($(var)))")
 
-# The names of files to be expanded must end with '@'
+# Output files
 EXPANDED = $(EXPAND:%@=%)
-EXPANDED_COM = $(EXPAND_COMMON:%@=%)
-EXPANDED_COMMON = $(EXPANDED_COM:%=$(COMMON_DIR)/%)
+EXPANDED_COMMON = $(EXPAND_COMMON:%@=$(COMMON_DIR)/%)
 
 $(EXPANDED): %: %@
 	$(ECHO) "Expanding $< to $@"
-	@$(RM) $@
 	$(EXPAND_TOOL) $(EXPANDARCH) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
 
-$(EXPANDED_COM): %: %@
+$(EXPANDED_COMMON): $(COMMON_DIR)/%: %@
 	$(ECHO) "Expanding $< to $(COMMON_DIR)/$@"
-	@$(RM) $@
 	$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
-$(EXPANDED_COMMON): $(COMMON_DIR)/%: %
-	@$(MV) $< $@
 
 clean: expand_clean
 

configure/RULES_MODULES

@@ -22,9 +22,11 @@
 #    7. Submodules must have a configure/CONFIG_SITE file that contains
 #           -include $(TOP)/../CONFIG_SITE.local
 
-# Add checked-out submodules to DIRS
-LIVE_SUBMODULES = $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
-DIRS += $(LIVE_SUBMODULES)
+# Add checked-out submodules to DIRS, unless INSTALL_LOCATION is empty
+LIVE_SUBMODULES = $(subst /Makefile,, \
+    $(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
+live = $(if $(wildcard $(INSTALL_CONFIG)/RULES_TOP),LIVE,DEAD)
+DIRS += $($(live)_SUBMODULES)
 
 include $(CONFIG)/RULES_DIRS
 
@@ -37,14 +39,13 @@ all host $(DIRS) $(ARCHS) $(ACTIONS) $(dirActionTargets) $(dirArchTargets) \
 # Convenience target
 RELEASE.host: $(RELEASE_LOCAL)
 
-$(RELEASE_LOCAL): Makefile CONFIG_SITE.local
+$(RELEASE_LOCAL): Makefile $(CONFIG)/CONFIG_SITE \
+    $(wildcard $(CONFIG)/CONFIG_SITE.local)
 	$(ECHO) Creating $@ with
 	$(ECHO) "    $(PARENT_MODULE) = $(INSTALL_ABSOLUTE)"
 	@echo $(PARENT_MODULE) = $(INSTALL_ABSOLUTE)> $@
-realclean:
-	$(RM) $(wildcard RELEASE.*.local)
 
-.PHONY: RELEASE.host realclean
+.PHONY: RELEASE.host
 
 # Testing: Combine test failure logs from the live submodules
 TESTS_FAILED_LOGS = $(wildcard $(addsuffix /$(TESTS_FAILED_LOG), \

configure/RULES_TOP

@@ -23,35 +23,42 @@ ifndef DISABLE_TOP_RULES
   # Rules for a regular application top directory
   #
 
-distclean: realclean cvsclean realuninstall
+  # When run by 'make distclean' the realuninstall target also
+  # removes any modules/RELEASE.<host>.local files
+  distclean: realclean cvsclean realuninstall
 
-realuninstall: uninstallDirs
+  realuninstall: uninstallDirs
 	$(RMDIR) $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB)
+  ifeq (modules,$(filter modules,$(DIRS)))
+    ifeq (distclean,$(filter distclean,$(MAKECMDGOALS)))
+	$(RM) $(wildcard modules/RELEASE.*.local)
+    endif
+  endif
 
-UNINSTALL_DIRS += $(INSTALL_DB) $(INSTALL_DBD) $(INSTALL_DOC) $(INSTALL_HTML)
-UNINSTALL_DIRS += $(INSTALL_INCLUDE) $(INSTALL_TEMPLATES) $(DIRECTORY_TARGETS)
-ifneq ($(INSTALL_LOCATION),$(TOP))
-  UNINSTALL_DIRS += $(INSTALL_CONFIG)
-endif
-uninstallDirs: | clean
+  UNINSTALL_DIRS += $(INSTALL_DB) $(INSTALL_DBD) $(INSTALL_DOC) $(INSTALL_HTML)
+  UNINSTALL_DIRS += $(INSTALL_INCLUDE) $(INSTALL_TEMPLATES) $(DIRECTORY_TARGETS)
+  ifneq ($(INSTALL_LOCATION),$(TOP))
+    UNINSTALL_DIRS += $(INSTALL_CONFIG)
+  endif
+  uninstallDirs:
 	$(RMDIR) $(UNINSTALL_DIRS)
 
   # Remove the bin and lib directories if they have no sub-directories
   #
-EMPTY_INSTALL_DIRS = \
-    $(if $(wildcard $(INSTALL_LOCATION_BIN)/*),,$(INSTALL_LOCATION_BIN)) \
-    $(if $(wildcard $(INSTALL_LOCATION_LIB)/*),,$(INSTALL_LOCATION_LIB))
-uninstall: archuninstall uninstallDirs | clean
+  EMPTY_INSTALL_DIRS = \
+      $(if $(wildcard $(INSTALL_LOCATION_BIN)/*),,$(INSTALL_LOCATION_BIN)) \
+      $(if $(wildcard $(INSTALL_LOCATION_LIB)/*),,$(INSTALL_LOCATION_LIB))
+  uninstall: archuninstall uninstallDirs
 	$(RMDIR) $(EMPTY_INSTALL_DIRS)
 
-archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))
+  archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))
 
-uninstall$(DIVIDER)%: | clean
+  uninstall$(DIVIDER)%:
 	$(RMDIR) $(addsuffix /$(subst uninstall$(DIVIDER),,$@), \
 	    $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB))
 
-# Only run this at the top of the parent
-runtests test-results:
+  # Only run this at the top of the parent
+  runtests test-results:
 	@$(SHOWTESTFAILURES)
 
 else
@@ -76,7 +83,6 @@ help:
 	@echo "     inc            - Installs header, dbd and html files"
 	@echo "     build          - Builds and installs all targets"
 	@echo "     install        - Builds and installs all targets"
-	@echo "     buildInstall   - Same as install (deprecated)"
 	@echo "     clean          - Removes the O.<arch> dirs created by running make"
 	@echo "                      In O.<arch> dir, clean removes build created files"
 	@echo "     realclean      - Removes ALL O.<arch> dirs"
@@ -101,7 +107,8 @@ ifndef DISABLE_TOP_RULES
 	@echo "     uninstall$(DIVIDER)<arch> - Remove bin & lib directories for <arch> only."
 	@echo "     uninstall      - Remove install directories created by this hostarch."
 	@echo "     realuninstall  - Removes ALL install dirs"
-	@echo "     distclean      - Same as realclean cvsclean realuninstall."
+	@echo "     distclean      - Does realclean cvsclean realuninstall and deletes any"
+	@echo "                      generated modules/RELEASE.<host>.local files"
 endif
 	@echo "     help           - Prints this list of valid make targets "
 	@echo "Object targets are supported by the O.<arch> level Makefile .e.g"

configure/os/CONFIG.Common.RHEL7-x86_64

@@ -0,0 +1,8 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+BUILD_CLASS = HOST
+
+TOOLSET_LOCATION = /opt/rh
+TOOLSET = devtoolset-12
+STD_CXXFLAGS = -std=c++20

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

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

configure/os/CONFIG.Common.RHEL8-x86_64

@@ -0,0 +1,20 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+BUILD_CLASS = HOST
+
+TOOLSET_LOCATION = /opt/rh
+TOOLSET = gcc-toolset-12
+STD_CXXFLAGS = -std=c++20
+
+# Fix bug in gcc-toolset-11 calling the old assembler
+ifneq ($(filter %-11,$(TOOLSET)),)
+TARGET_CPPFLAGS += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
+TARGET_LDFLAGS  += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
+endif
+
+ifneq (($(TOOLSET)),)
+# Perl requests (native) annobin incompatible with the annobin from any TOOLSET
+# Disable Perl specific CFLAGS
+override Cap5_CFLAGS=
+endif

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

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang
+
+BUILD_CLASS = HOST
+
+STD_CXXFLAGS = -std=c++2a

configure/os/CONFIG.Common.RHEL9-x86_64

@@ -0,0 +1,20 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+BUILD_CLASS = HOST
+
+TOOLSET_LOCATION = /opt/rh
+TOOLSET = gcc-toolset-12
+STD_CXXFLAGS = -std=c++20
+
+# Fix bug in gcc-toolset-11 calling the old assembler
+ifneq ($(filter %-11,$(TOOLSET)),)
+TARGET_CPPFLAGS += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
+TARGET_LDFLAGS  += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
+endif
+
+ifneq (($(TOOLSET)),)
+# Perl requests (native) annobin incompatible with the annobin from any TOOLSET
+# Disable Perl specific CFLAGS
+override Cap5_CFLAGS=
+endif

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

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang
+
+BUILD_CLASS = HOST
+
+STD_CXXFLAGS = -std=c++2a

configure/os/CONFIG.Common.RTEMS

@@ -65,7 +65,7 @@ CXXFLAGS = $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS)\
  $(USR_CXXFLAGS) $(CMD_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS)\
  $(STATIC_CXXFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS)
 
-LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(CMD_LDFLAGS)\
+LDFLAGS += $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(CMD_LDFLAGS)\
  $(POSIX_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS)\
  $($(BUILD_CLASS)_LDFLAGS) $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
 
@@ -77,7 +77,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 $(filter -s,$(MFLAGS)),$(NOP),echo)
+ECHO = @$(if $(make-s),$(NOP),echo)
 
 # Originally set in os/CONFIG.UnixCommon.Common
 MKDIR = mkdir -p
@@ -102,15 +102,47 @@ OS_CLASS = RTEMS
 # Operating system compile & link flags
 OP_SYS_CFLAGS += -D__LINUX_ERRNO_EXTENSIONS__
 
-OP_SYS_CFLAGS_NET_yes = -DRTEMS_LEGACY_STACK
-OP_SYS_CFLAGS += $(OP_SYS_CFLAGS_NET_$(RTEMS_HAS_NETWORKING))
-
-ifeq ($(RTEMS_HAS_POSIX_API),yes)
-POSIX_CPPFLAGS = -D_GNU_SOURCE -D_DEFAULT_SOURCE
+# Has RTEMS been built with the internal legacy stack?
+ifeq ($(RTEMS_LEGACY_NETWORKING_INTERNAL),yes)
+RTEMS_HAS_NETWORKING = yes
+RTEMS_NETWORKING = legacy_internal
 endif
 
-OP_SYS_LDLIBS_posix_NET_yes = -ltftpfs -lnfs -lz -ltelnetd
-OP_SYS_LDLIBS_posix_NET_no = -ltftpfs -lbsd -lz
+# Has RTEMS been built with the legacy stack as a separate package?
+ifeq ($(RTEMS_LEGACY_NETWORKING),yes)
+RTEMS_HAS_NETWORKING = yes
+RTEMS_NETWORKING = legacy
+endif
+
+# Has RTEMS been built with the libbsd stack as a separate package?
+ifeq ($(RTEMS_BSD_NETWORKING),yes)
+RTEMS_HAS_NETWORKING = yes
+RTEMS_NETWORKING = bsd
+endif
+
+RTEMS_LEGACY_NET_LIB_no=
+
+# Legacy network with RTEMS 5 and earlier
+RTEMS_NET_LIB_legacy_internal=-lnfs
+OP_SYS_CFLAGS_NET_legacy_internal = -DRTEMS_LEGACY_STACK
+
+# Legacy network with RTEMS 6 is a separate package and library
+RTEMS_NET_LIB_legacy=-lnfs -lnetworking -lnfs
+OP_SYS_CFLAGS_NET_legacy = -DRTEMS_LEGACY_STACK
+
+# LibBSD network with RTEMS 5 and 6 is a separate package and library
+RTEMS_NET_LIB_bsd=-lbsd
+OP_SYS_CFLAGS_NET_bsd = -DRTEMS_LIBBSD_STACK
+
+# Set the networking flags
+OP_SYS_CFLAGS += $(OP_SYS_CFLAGS_NET_$(RTEMS_NETWORKING))
+
+POSIX_CPPFLAGS_posix = -D_GNU_SOURCE -D_DEFAULT_SOURCE
+POSIX_CPPFLAGS = $(POSIX_CPPFLAGS_$(OS_API))
+
+OP_SYS_LDLIBS_posix_NET_yes = -ltftpfs -lz -ltelnetd
+OP_SYS_LDLIBS_posix_NET_yes += $(RTEMS_NET_LIB_$(RTEMS_NETWORKING))
+OP_SYS_LDLIBS_posix_NET_no = -ltftpfs -lz
 OP_SYS_LDLIBS_score_NET_yes = -lnfs
 OP_SYS_LDLIBS_score_NET_no = -lnfs
 OP_SYS_LDLIBS += -lrtemsCom -lCom

configure/os/CONFIG.Common.RTEMS-mvme2700

@@ -1,7 +1,6 @@
 #
 # Author: Matt Rippa
 #
-RTEMS_BSP = mvme2307
 RTEMS_TARGET_CPU = powerpc
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
@@ -11,14 +10,21 @@ MUNCH_SUFFIX = .boot
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
 	gzip -f9 rtems
-	$(RTEMS_TOOLS)/bin/$(LD_FOR_TARGET) -o $@ \
+	$(RTEMS_TOOLS)/bin/$(LD_FOR_TARGET) -o $@.elf \
 		 $(PROJECT_RELEASE)/lib/bootloader.o \
 		--just-symbols=$< \
 		-b binary rtems.gz \
-                --no-warn-mismatch \
+		--no-warn-mismatch \
 		-T $(PROJECT_RELEASE)/lib/ppcboot.lds \
 		-Map $<.map
-	rm -f rtems.gz
+	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $@.elf $@
+	rm -f rtems.gz $@.elf
 endef
 
 include $(CONFIG)/os/CONFIG.Common.RTEMS
+
+ifeq ($(shell test $(RTEMS_VERSION) -ge 5; echo $$?),0)
+RTEMS_BSP = mvme2700
+else
+RTEMS_BSP = mvme2307
+endif

configure/os/CONFIG.Common.RTEMS-pc386

@@ -25,7 +25,7 @@ include $(CONFIG)/os/CONFIG.Common.RTEMS
 OP_SYS_LDFLAGS += -Wl,-Ttext,0x100000
 
 # This check must appear after the above include
-ifeq ($(RTEMS_VERSION),5)
+ifeq ($(shell test $(RTEMS_VERSION) -ge 5; echo $$?),0)
   $(info *** This target is not compatible with the configured RTEMS version.)
   $(info *** Build the RTEMS-pc686 (-qemu) target for RTEMS 5.x)
   $(error Can't continue)

configure/os/CONFIG.Common.RTEMS-pc686

@@ -32,7 +32,7 @@ OP_SYS_LDFLAGS += -Wl,-Ttext,0x100000
 
 
 # This check must appear after the above include
-ifneq ($(RTEMS_VERSION),5)
+ifeq ($(shell test $(RTEMS_VERSION) -lt 5; echo $$?),0)
   $(info *** This target is not compatible with the configured RTEMS version.)
   $(info *** Build the RTEMS-pc386 (-qemu) target for RTEMS 4.x)
   $(error Can't continue)

configure/os/CONFIG.Common.RTEMS-qoriq_e500

@@ -22,7 +22,7 @@ ARCH_DEP_CFLAGS += -DRTEMS_HAS_ALTIVEC
 #OP_SYS_LDLIBS += -lbspExt #does not use posix stuff ... want to ignore
 OP_SYS_LDLIBS += -Wl,--gc-sections
 #ARCH_DEP_LDFLAGS = -mcpu=8540 -meabi -msdata=sysv -mstrict-align -mspe -mabi=spe -mfloat-gprs=double 
-ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/powerpc-rtems5/qoriq_e500/lib  
+ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/$(GNU_TARGET)$(RTEMS_VERSION)/$(RTEMS_BSP)/lib
 
 MUNCH_SUFFIX = .img
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))

configure/os/CONFIG.Common.RTEMS49-pc386

@@ -0,0 +1,2 @@
+RTEMS_VERSION = 4.9
+include $(CONFIG)/os/CONFIG.Common.RTEMS-pc386

configure/os/CONFIG.Common.RTEMS51-pc686

@@ -0,0 +1,2 @@
+RTEMS_VERSION = 5
+include $(CONFIG)/os/CONFIG.Common.RTEMS-pc686

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 = /opt/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

@@ -8,7 +8,7 @@
 #-------------------------------------------------------
 
 # Unix valid build types
-VALID_BUILDS = Host Ioc Command
+VALID_BUILDS = $(if $(filter HOST,$(BUILD_CLASS)),Host) Ioc Command
 
 #-------------------------------------------------------
 # Unix prefix and suffix definitions

configure/os/CONFIG.Common.V62-ppc604

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

configure/os/CONFIG.Common.V63-ppc603

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

configure/os/CONFIG.Common.V63-ppc604

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

configure/os/CONFIG.Common.V64-ppc604

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

configure/os/CONFIG.Common.V66-ppc603

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

configure/os/CONFIG.Common.V66-ppc604

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

configure/os/CONFIG.Common.V67-ppc604

@@ -0,0 +1,8 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.7
+
+# needed when including memPartLib.h, e.g. through moduleLib.h or loadLib.h
+ARCH_DEP_CFLAGS += -D_VSB_CONFIG_FILE='<../lib/h/config/vsbConfig.h>'
+
+# compiler tries to access license server (even though no license isneeded)
+export LM_LICENSE_FILE=37000@lic-windriver.psi.ch

configure/os/CONFIG.Common.V69-ppc32

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

configure/os/CONFIG.Common.V69-ppc604

@@ -0,0 +1,6 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.9
+#export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH:%=%:)($(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
+
+# -fno-implicit-fp causes error: "unable to find a register to spill in class 'FLOAT_REGS'"
+ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align

configure/os/CONFIG.Common.deb10-x86_64

@@ -0,0 +1,16 @@
+# Debian 10
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+BUILD_CLASS = HOST
+
+STD_CXXFLAGS = -std=c++17
+
+ifneq ($(EPICS_HOST_ARCH),$(T_A))
+# Cross compile
+GNU_DIR = /opt/xgcc/gcc-8.3.0-deb10
+GNU_TARGET = x86_64-deb10-linux-gnu
+SYSROOT = $(GNU_DIR)/$(GNU_TARGET)/sys-root
+CMPLR_PREFIX = $(GNU_TARGET)-
+endif

configure/os/CONFIG.Common.deb12-x86_64

@@ -0,0 +1,17 @@
+# Debian 12
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+BUILD_CLASS = HOST
+
+STD_CXXFLAGS = -std=c++17
+
+ifneq ($(EPICS_HOST_ARCH),$(T_A))
+# Cross compile
+GNU_DIR = /opt/xgcc/gcc-12.2.0-deb12
+GNU_TARGET = x86_64-deb12-linux-gnu
+SYSROOT = $(GNU_DIR)/$(GNU_TARGET)/sys-root
+CMPLR_PREFIX = $(GNU_TARGET)-
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SYSROOT)/lib/x86_64-linux-gnu
+endif

configure/os/CONFIG.Common.eldk42-ppc4xxFP

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

configure/os/CONFIG.Common.eldk51-ppc4xxSF

@@ -0,0 +1,17 @@
+# Virtex FPGA embedded Processor with ELDK 5.1
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.1
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_TARGET = powerpc-4xx-softfloat
+GNU_ARCH = ppc405-linux
+GNU_DIR = $(SDK_DIR)/$(GNU_TARGET)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
+
+# have no full C++11
+STD_CXXFLAGS = -std=c++0x

configure/os/CONFIG.Common.eldk52-e500v2

@@ -0,0 +1,18 @@
+# IOxOS IFC1210 with ELDK 5.2
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.2
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_TARGET = powerpc-e500v2
+GNU_ARCH = ppce500v2-linux-gnuspe
+GNU_DIR = $(SDK_DIR)/$(GNU_TARGET)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
+GNU_TARGET_INCLUDE_DIR =
+
+# have no full C++11
+STD_CXXFLAGS = -std=c++0x

configure/os/CONFIG.Common.eldk53-ppc4xxFP

@@ -0,0 +1,20 @@
+# DeltaTau PowerPMAC with ELDK 5.3
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.3
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_ARCH = ppc440e-linux
+SDKTARGETSYSROOT=$(SDK_DIR)/powerpc-4xx/sysroots
+GNU_DIR = $(SDKTARGETSYSROOT)/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
+GNU_TARGET_INCLUDE_DIR =
+GNU_TARGET=powerpc-linux
+SYSROOT = $(SDKTARGETSYSROOT)/$(GNU_ARCH)
+
+ARCH_DEP_CPPFLAGS =  -m32 -mcpu=440fp -mhard-float
+AS=$(GNU_BIN)/$(GNU_TARGET)-as

configure/os/CONFIG.Common.freebsdCommon

@@ -7,6 +7,10 @@
 
 # Include definitions common to all Unix targets
 include $(CONFIG)/os/CONFIG.Common.UnixCommon
+GNU         = NO
+CMPLR_CLASS = clang
+CC          = clang
+CCC         = clang++
 
 OS_CLASS = freebsd
 

configure/os/CONFIG.Common.fslqoriq20-e6500_64

@@ -0,0 +1,17 @@
+# IOxOS IFC1211 with Freescale QorIQ 2.0 toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = fslsdk
+SDK_DIR = /opt/fsl-qoriq/2.0
+SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
+SDK_TARGET = ppc64e6500-fsl-linux
+GNU_TARGET = powerpc64-fsl-linux
+SYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
+
+ARCH_DEP_CFLAGS = -mcpu=e6500 -m64 -mhard-float

configure/os/CONFIG.Common.gcc8-ppc4xxFP

@@ -0,0 +1,14 @@
+# DeltaTau PowerPMAC with gcc 8.5
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+GNU_DIR    = /opt/xgcc/gcc-8.5.0
+GNU_TARGET = powerpc-ppmac-linux-gnu
+
+ARCH_DEP_CPPFLAGS = -m32 -mcpu=440fp -mhard-float
+ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(GNU_DIR)/$(GNU_TARGET)/sys-root/lib/powerpc-linux-gnu
+
+STD_CXXFLAGS = -std=c++17

configure/os/CONFIG.Common.iosCommon

@@ -42,12 +42,6 @@ ARCH_DEP_LDFLAGS += $(ARCH_DEP_FLAGS)
 OP_SYS_CFLAGS += -isysroot $(SDK_DIR)
 OP_SYS_LDFLAGS += -isysroot $(SDK_DIR)
 
-#--------------------------------------------------
-# Always compile in debugging symbol table information
-#
-OPT_CFLAGS_YES += -g
-OPT_CXXFLAGS_YES += -g
-
 #-------------------------------------------------------
 # Compiler definitions:
 

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

@@ -24,13 +24,13 @@ STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 
 # Set runtime path for shared libraries if LINKER_USE_RPATH=YES
-SHRLIBDIR_RPATH_LDFLAGS_YES = $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+SHRLIBDIR_RPATH_LDFLAGS_YES = $(subst $(abspath $(LINKER_ORIGIN_ROOT)),$(FINAL_LOCATION),$(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)) $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
 SHRLIBDIR_RPATH_LDFLAGS_ORIGIN = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(SHRLIB_DEPLIB_DIRS))
 SHRLIBDIR_LDFLAGS += \
     $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
 
 # Set runtime path for products if LINKER_USE_RPATH=YES
-PRODDIR_RPATH_LDFLAGS_YES = $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+PRODDIR_RPATH_LDFLAGS_YES = $(subst $(abspath $(LINKER_ORIGIN_ROOT)),$(FINAL_LOCATION),$(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)) $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
 PRODDIR_RPATH_LDFLAGS_ORIGIN = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(PROD_DEPLIB_DIRS))
 PRODDIR_LDFLAGS += \
     $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))

configure/os/CONFIG.Common.moxa42-armv6l

@@ -0,0 +1,25 @@
+# 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=/opt/moxa/arm-linux-4.4.2-v4
+GNU_TARGET=arm
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(GNU_DIR)/arm-none-linux-gnueabi/lib
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# suppress note "the mangling of 'va_list' has changed in GCC 4.4"
+ARCH_DEP_CXXFLAGS += -Wno-psabi
+
+ARCH_DEP_CFLAGS += -funwind-tables
+
+# have no full C++11
+STD_CXXFLAGS = -std=c++0x
+
+# suppress strict alias warnings
+CODE_CPPFLAGS += -fno-strict-aliasing
+
+# accept4() exists but does not work
+# Give fake __rtems__ macro to posix/osdSock.c because that disables accept4()
+osdSock_CFLAGS += -D__rtems__

configure/os/CONFIG.Common.mvl40-xscale_be

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

configure/os/CONFIG.Common.nilrt7-armv7a

@@ -0,0 +1,21 @@
+# National Instruments CompactRIO running LabView RT 19.5.1
+# requires RPM gcc-c++-arm-linux-gnu
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = arm
+
+GNU_TARGET = arm-linux-gnu
+
+SYSROOT = /opt/LabVIEW-RT-19.5.1/arm/sysroots/armv7a-vfp-neon-nilrt-linux-gnueabi
+GNU_BIN = /opt/RHEL7/bin
+
+# Needed on RHEL9:
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)/usr/$$LIB:/opt/RHEL7/$$LIB
+
+ARCH_DEP_CPPFLAGS += -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon
+ARCH_DEP_CXXFLAGS += -I=/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi
+ARCH_DEP_CXXFLAGS += -I=/usr/include/c++/4.7.2
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES

configure/os/CONFIG.Common.raspbian-arm

@@ -0,0 +1,44 @@
+# 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)/$(SDK_TARGET)/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)/$(SDK_TARGET)/arm-linux-gnueabihf/libc/usr/include/
+
+ARCH_CLASS = arm
+
+SDK_DIR = /opt/raspberrypi/arm-bcm2708
+
+# Available SDK_TARGETs:
+
+# gcc 4.8.3 for 32 bit hosts with GLIBC 2.3 or higher
+# SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian
+
+# gcc 4.8.3 for 64 bit hosts with GLIBC 2.14 or higher
+SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian-x64
+
+# gcc 4.7.1 for 64 bit hosts with GLIBC 2.8 or higher
+# SDK_TARGET = arm-linux-gnueabihf
+
+# gcc 4.7.1 for 32 bit hosts with GLIBC 2.4 or higher
+# SDK_TARGET = arm-bcm2708hardfp-linux-gnueabi
+# SDK_TARGET = arm-bcm2708-linux-gnueabi
+
+# gcc 4.9.3 for 64 bit hosts
+# arm-rpi-4.9.3-linux-gnueabihf
+
+GNU_DIR = $(SDK_DIR)/$(SDK_TARGET)
+GNU_TARGET = $(if $(filter arm-bcm2708%,SDK_TARGET),$(SDK_TARGET),arm-linux-gnueabihf)

configure/os/CONFIG.Common.vxWorks-e500v2

@@ -0,0 +1,21 @@
+# CONFIG.Common.vxWorks-e500v2
+#
+# Definitions for vxWorks-e500v2 target archs (MVME2500)
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-e500v2
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks target archs
+include $(CONFIG)/os/CONFIG.Common.vxWorksCommon
+
+# Vx GNU cross compiler suffix
+CMPLR_SUFFIX = ppc
+
+ARCH_CLASS = ppc
+
+# Architecture specific build flags
+ARCH_DEP_CFLAGS += -te500v2 -mhard-float
+ARCH_DEP_CPPFLAGS += -DCPU=PPC85XX
+ARCH_DEP_CFLAGS += -DCPU_VARIANT=_ppc85XX_e500v2
+ARCH_DEP_CFLAGS += -mlongcall
+
+GNU_TARGET = powerpc-wrs-vxworks

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

@@ -12,7 +12,7 @@ ARCH_CLASS = x86
 POSIX = NO
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
-LDLIBS_READLINE = -lreadline -lcurses
+LDLIBS_READLINE = -lreadline -ltermcap
 
 ARCH_DEP_CFLAGS += -m32
 ARCH_DEP_LDFLAGS += -m32

configure/os/CONFIG.Common.yocto21-aarch64

@@ -0,0 +1,15 @@
+# XILINX Zynq with Yocto 2.1 / Petalinux toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = arm64
+
+SDK = petalinux
+SDK_DIR = /opt/petalinux-gfa/2018.1
+SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
+SDK_TARGET = aarch64-xilinx-linux
+GNU_TARGET = $(SDK_TARGET)
+SYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)

configure/os/CONFIG.Common.yocto40-aarch64

@@ -0,0 +1,19 @@
+# XILINX Zynq with Yocto 4.0 toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = arm64
+
+SDK = pokysdk
+SDK_DIR = /opt/yocto40-aarch64
+SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
+SDK_TARGET = cortexa53-poky-linux
+GNU_TARGET = aarch64-poky-linux
+SYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
+
+ARCH_DEP_CPPFLAGS = -mcpu=cortex-a53 -march=armv8-a+crc
+
+STD_CXXFLAGS = -std=c++23

configure/os/CONFIG.Linux.windows-x64

@@ -0,0 +1,10 @@
+include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
+
+VALID_BUILDS = Ioc Command
+
+MSVC_VERSION ?= 2019
+PATH := /opt/gfa-wine/bin:/opt/wine-msvc-$(MSVC_VERSION)/bin/x64:$(PATH)
+export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)
+export WINEDEBUG=fixme-all
+export WINEDLLOVERRIDES="mscoree,mshtml="
+export WINE = wine64

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.windows-x64

@@ -0,0 +1,3 @@
+# MSVC_VERSION 2019 in wine 4 for on RHEL7 would require winetricks
+MSVC_VERSION = 2017
+include $(CONFIG)/os/CONFIG.Linux.windows-x64

configure/os/CONFIG.RHEL8-x86_64.Common

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

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

@@ -0,0 +1,25 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+
+# "Cross compile" for RHEL7-x86_64
+# Expects RHEL7 RPMs c++ and readline-devel installed
+# in $(SYSROOT)
+# This can be installed on RHEL7 with:
+#    yum install --installroot=$(SYSROOT) <packages>
+# (Assuming $(SYSROOT) is on a shared network volume.)
+# Optionally use a newer TOOLSET (installed on $(SYSROOT)).
+
+SYSROOT = /opt/RHEL7
+
+# "Cross" TOOLSET progs need to find their libraries
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB)
+
+# The linker has problems to find indirectly referenced libraries
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB)
+
+# These programs have library problems when using them
+# from SYSROOT but without TOOLSET.
+# But provinding LD_LIBRARY PATH crashes other progams.
+# Our host versions work just fine.
+AR = ar -rc
+RANLIB = ranlib

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

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

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

@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Linux.windows-x64

configure/os/CONFIG.RHEL9-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.RHEL9-x86_64.RHEL7-x86_64

@@ -0,0 +1,18 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+
+# "Cross compile" for RHEL7-x86_64
+# Expects RHEL7 RPMs c++ and readline-devel installed
+# in $(SYSROOT)
+# This can be installed on RHEL7 with:
+#    yum install --installroot=$(SYSROOT) <packages>
+# (Assuming $(SYSROOT) is on a shared network volume.)
+# Optionally use a newer TOOLSET (installed on $(SYSROOT)).
+
+SYSROOT = /opt/RHEL7
+
+# "Cross" TOOLSET progs need to find their libraries
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB:)/usr/$$LIB:$(SYSROOT)/usr/$$LIB
+
+# The linker has problems to find indirectly referenced libraries
+PROD_LDLIBS += $(LDLIBS)

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

@@ -0,0 +1,22 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+
+# "Cross compile" for RHEL8-x86_64
+# Expects RHEL8 RPMs gcc-toolset-12-gcc-c++ and readline-devel
+# to be installed in $(SYSROOT)
+# These can be installed on RHEL8 with:
+#    yum install --installroot=$(SYSROOT) <packages>
+# (Assuming $(SYSROOT) is on a shared network volume.)
+
+SYSROOT = /opt/RHEL8
+
+# "Cross" TOOLSET progs need to find their libraries.
+# But linker gets confused with LD_LIBRARY_PATH.
+# Thus only wrap the compiler.
+WRAPPER = -wrapper env,LD_LIBRARY_PATH=$(TOOLSET_DIR:%=$(SYSROOT)%/usr/lib64:)/usr/lib64:$(SYSROOT)/usr/lib64
+TARGET_CPPFLAGS += $(WRAPPER)
+
+# These programs as cross tools would also need LD_LIBRARY_PATH.
+# But but our host versions work just fine.
+AR = ar -rc
+RANLIB = ranlib

configure/os/CONFIG.RHEL9-x86_64.RHEL9-x86_64

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

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

@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Linux.windows-x64

configure/os/CONFIG.darwinCommon.darwinCommon

@@ -39,12 +39,6 @@ OP_SYS_CFLAGS += -fno-common
 #
 OP_SYS_CPPFLAGS += -Ddarwin
 
-#
-# Always compile in debugging symbol table information
-#
-OPT_CFLAGS_YES += -g
-OPT_CXXFLAGS_YES += -g
-
 #
 # Libraries for command-line editing.
 #
@@ -66,7 +60,7 @@ GNU = NO
 #
 # Darwin shared libraries
 #
-SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined dynamic_lookup \
+SHRLIB_LDFLAGS = -dynamiclib -flat_namespace \
     -install_name $(abspath $(INSTALL_LIB))/$@ \
     $(addprefix -compatibility_version , $(SHRLIB_VERSION)) \
     $(addprefix -current_version , $(SHRLIB_VERSION))

configure/os/CONFIG.deb10-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.deb10-x86_64.deb10-x86_64

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

configure/os/CONFIG.deb12-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.deb12-x86_64.deb12-x86_64

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

configure/os/CONFIG.freebsd-x86.Common

@@ -5,3 +5,4 @@
 
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
+CMPLR_CLASS = clang

configure/os/CONFIG.freebsd-x86.freebsd-x86

@@ -2,6 +2,7 @@
 # Definitions for freebsd-x86 host - freebsd-x86 target builds
 # Sites may override these definitions in CONFIG_SITE.freebsd-x86.freebsd-x86
 #-------------------------------------------------------
+GNU_DIR=/usr/local
 
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon

configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64

@@ -2,12 +2,23 @@
 # Definitions for freebsd-x86_64 host - freebsd-x86_64 target builds
 # Sites may override these definitions in CONFIG_SITE.freebsd-x86_64.freebsd-x86_64
 #-------------------------------------------------------
+GNU_DIR=/usr
 
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon
 
+GNU_BIN = $(GNU_DIR)/bin
+GNU_LIB = $(GNU_DIR)/lib
+
+CMPLR_CLASS = clang
+
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)c++$(CMPLR_SUFFIX)
+CPP = $(CC) -x c -E
+
+GNU_LDLIBS_YES =
+
 STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 STATIC_LDLIBS_NO=
-

configure/os/CONFIG.linux-arm.linux-arm

@@ -6,3 +6,8 @@
 
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon
+
+STATIC_LDFLAGS_YES= -Wl,-Bstatic
+STATIC_LDFLAGS_NO=
+STATIC_LDLIBS_YES= -Wl,-Bdynamic
+STATIC_LDLIBS_NO=

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

@@ -21,4 +21,4 @@ LOADABLE_SHRLIB_LDFLAGS = -shared \
 GNU_LDLIBS_YES =
 
 # Link with system libraries
-OP_SYS_LDLIBS = -lpsapi -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm -ldbghelp
+OP_SYS_LDLIBS += -lpsapi -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm -ldbghelp

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

@@ -32,4 +32,4 @@ LOADABLE_SHRLIB_LDFLAGS = -shared \
 GNU_LDLIBS_YES =
 
 # Link with system libraries
-OP_SYS_LDLIBS = -lpsapi -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm -ldbghelp
+OP_SYS_LDLIBS += -lpsapi -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm -ldbghelp