fix rpm dependencies

readthedocs build does not include these.

.appveyor.yml

@@ -52,8 +52,6 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
   - CMP: vs2015
   - CMP: vs2013
-  - CMP: vs2012
-  - CMP: vs2010
   - CMP: gcc
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     # TODO: static linking w/ readline isn't working.  Bypass auto-detect
@@ -67,11 +65,6 @@ platform:
 # Matrix configuration: exclude sets of jobs
 matrix:
   exclude:
-  # VS2012 and older installs don't have the 64 bit compiler
-  - platform: x64
-    CMP: vs2012
-  - platform: x64
-    CMP: vs2010
   # Exclude more jobs to reduce build time
   # Skip 32-bit for "middle-aged" compilers
   - platform: x86
@@ -89,8 +82,9 @@ matrix:
 #---------------------------------#
 
 install:
+  - cmd: set PATH=C:\Python38-x64;%PATH%
   - cmd: git submodule update --init --recursive
-  - cmd: pip install git+https://github.com/mdavidsaver/ci-core-dumper#egg=ci-core-dumper
+  - cmd: python -m pip install git+https://github.com/mdavidsaver/ci-core-dumper#egg=ci-core-dumper
   - cmd: python .ci/cue.py prepare
 
 build_script:
@@ -128,10 +122,4 @@ on_failure:
 #---------------------------------#
 
 notifications:
-
-  - provider: Email
-    to:
-      - core-talk@aps.anl.gov
-    on_build_success: false
-
   - provider: GitHubPullRequest

.appveyor/epics-base-7.yml

@@ -59,8 +59,6 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
   - CMP: vs2015
   - CMP: vs2013
-  - CMP: vs2012
-  - CMP: vs2010
   - CMP: gcc
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     # TODO: static linking w/ readline isn't working.  Bypass auto-detect
@@ -74,11 +72,6 @@ platform:
 # Matrix configuration: exclude sets of jobs
 matrix:
   exclude:
-  # VS2012 and older installs don't have the 64 bit compiler
-  - platform: x64
-    CMP: vs2012
-  - platform: x64
-    CMP: vs2010
   # Exclude more jobs to reduce build time
   # Skip 32-bit for "middle-aged" compilers
   - platform: x86
@@ -96,8 +89,9 @@ matrix:
 #---------------------------------#
 
 install:
+  - cmd: set PATH=C:\Python38-x64;%PATH%
   - cmd: git submodule update --init --recursive
-  - cmd: pip install git+https://github.com/mdavidsaver/ci-core-dumper#egg=ci-core-dumper
+  - cmd: python -m pip install git+https://github.com/mdavidsaver/ci-core-dumper#egg=ci-core-dumper
   - cmd: python .ci/cue.py prepare
 
 build_script:
@@ -135,10 +129,4 @@ on_failure:
 #---------------------------------#
 
 notifications:
-
-  - provider: Email
-    to:
-      - core-talk@aps.anl.gov
-    on_build_success: false
-
   - provider: GitHubPullRequest

.editorconfig

@@ -6,3 +6,7 @@ root = true
 # as some compilers complain about files not ending in newline
 [*]
 insert_final_newline = true
+
+# Part of readline test that needs file without final newline
+[modules/libcom/test/multiline-input.txt]
+insert_final_newline = false

.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/ci-scripts-build.yml

@@ -15,7 +15,6 @@ on:
       - 'startup/*'
       - '.appveyor/*'
       - '.tools/*'
-      - '.lgtm.yml'
       - '.gitattributes'
       - '**/*.html'
       - '**/*.md'
@@ -25,7 +24,6 @@ on:
       - 'startup/*'
       - '.appveyor/*'
       - '.tools/*'
-      - '.lgtm.yml'
       - '.gitattributes'
       - '**/*.html'
       - '**/*.md'
@@ -52,9 +50,9 @@ 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"
+          - name: "Ub-24 gcc c++20 Werror"
+            os: ubuntu-24.04
+            cmp: gcc
             # Turn all warnings into errors,
             # except for those we could not fix (yet).
             # Remove respective -Wno-error=... flag once it is fixed.
@@ -75,130 +73,144 @@ jobs:
                                   -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3'
                     CMD_LDFLAGS=-Wl,-z,relro"
 
-          - os: ubuntu-20.04
-            cmp: gcc
-            configuration: default
-            cross: "windows-x64-mingw"
-            name: "Ub-20 gcc-9 + MinGW"
-
-          - os: ubuntu-20.04
-            cmp: gcc
-            configuration: static
-            cross: "windows-x64-mingw"
-            name: "Ub-20 gcc-9 + MinGW, static"
-
-          - os: ubuntu-20.04
+          - name: "Ub-22 gcc C++11, static"
+            os: ubuntu-22.04
             cmp: gcc
             configuration: static
             extra: "CMD_CXXFLAGS=-std=c++11"
-            name: "Ub-20 gcc-9 C++11, static"
 
-          - os: ubuntu-20.04
+          - name: "Ub-22 gcc u-char"
+            os: ubuntu-22.04
             cmp: gcc
             configuration: static
             extra: "CMD_CFLAGS=-funsigned-char CMD_CXXFLAGS=-funsigned-char"
-            name: "Ub-20 gcc-9 unsigned char"
 
-          - os: ubuntu-20.04
+          - name: "Ub-22 clang"
+            os: ubuntu-22.04
             cmp: clang
             configuration: default
-            name: "Ub-20 clang-10"
 
-          - os: ubuntu-20.04
+          - name: "Ub-22 clang C++11"
+            os: ubuntu-22.04
             cmp: clang
             configuration: default
             extra: "CMD_CXXFLAGS=-std=c++11"
-            name: "Ub-20 clang-10 C++11"
 
-          - os: ubuntu-20.04
+          - name: "MacOS clang"
+            os: macos-latest
+            cmp: clang
+            configuration: default
+
+          # Cross builds
+
+          - name: "Ub gcc + linux-aarch64"
+            os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            cross: "linux-aarch64"
+
+          - name: "Ub gcc + linux-arm gnueabi"
+            os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            cross: "linux-arm@arm-linux-gnueabi"
+
+          - name: "Ub gcc + linux-arm gnueabihf"
+            os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            cross: "linux-arm@arm-linux-gnueabihf"
+
+          - name: "Ub-22 gcc + MinGW"
+            os: ubuntu-22.04
+            cmp: gcc
+            configuration: default
+            cross: "windows-x64-mingw"
+
+          - name: "Ub-22 gcc + MinGW, static"
+            os: ubuntu-22.04
+            cmp: gcc
+            configuration: static
+            cross: "windows-x64-mingw"
+
+          - name: "Ub-22 gcc + RT-4.9 pc386"
+            os: ubuntu-22.04
+            cmp: gcc
+            configuration: default
+            cross: "RTEMS-pc386-qemu@4.9"
+
+          - name: "Ub-22 gcc + RT-4.10 pc386"
+            os: ubuntu-22.04
+            cmp: gcc
+            configuration: default
+            cross: "RTEMS-pc386-qemu@4.10"
+            test: NO
+
+          - name: "Ub-22 gcc + RT-5.1 pc686"
+            os: ubuntu-22.04
             cmp: gcc
             configuration: default
             cross: "RTEMS-pc686-qemu@5"
-            name: "Ub-20 gcc-9 + RT-5.1 pc686"
 
-          - os: ubuntu-20.04
+          - name: "Ub-22 gcc + RT-5.1 beatnik"
+            os: ubuntu-22.04
             cmp: gcc
             configuration: default
             cross: "RTEMS-beatnik@5"
             test: NO
-            name: "Ub-20 gcc-9 + RT-5.1 beatnik"
 
-          - os: ubuntu-20.04
+          - name: "Ub-22 gcc + RT-5.1 xilinx_zynq_a9_qemu"
+            os: ubuntu-22.04
             cmp: gcc
             configuration: default
             cross: "RTEMS-xilinx_zynq_a9_qemu@5"
             test: NO
-            name: "Ub-20 gcc-9 + RT-5.1 xilinx_zynq_a9_qemu"
 
-          - os: ubuntu-20.04
+          - name: "Ub-22 gcc + RT-5.1 uC5282"
+            os: ubuntu-22.04
             cmp: gcc
             configuration: default
             cross: "RTEMS-uC5282@5"
             test: NO
-            name: "Ub-20 gcc-9 + RT-5.1 uC5282"
 
-          - os: ubuntu-20.04
-            cmp: gcc
-            configuration: default
-            name: "Ub-20 gcc-9 + RT-4.10"
-            cross: "RTEMS-pc386-qemu@4.10"
-            test: NO
+          # Windows builds
 
-          - os: ubuntu-20.04
-            cmp: gcc
-            configuration: default
-            name: "Ub-20 gcc-9 + RT-4.9"
-            cross: "RTEMS-pc386-qemu@4.9"
-
-          - os: macos-latest
-            cmp: clang
-            configuration: default
-            name: "MacOS clang-12"
-
-          - os: windows-2019
-            cmp: vs2019
+          - name: "Win-22 MSC-22"
+            os: windows-2022
+            cmp: vs2022
             configuration: debug
-            name: "Win2019 MSC-19"
-            extra: "CMD_CXXFLAGS=-analysis"
+            extra: "CMD_CXXFLAGS=-analyze"
 
-          - os: windows-2019
-            cmp: vs2019
+          - name: "Win-22 MSC-22, static"
+            os: windows-2022
+            cmp: vs2022
             configuration: static-debug
-            name: "Win2019 MSC-19, static"
-            extra: "CMD_CXXFLAGS=-analysis"
+            extra: "CMD_CXXFLAGS=-analyze"
 
-          - os: windows-2019
-            cmp: vs2019
+          - name: "Win-22 MSC-22, debug"
+            os: windows-2022
+            cmp: vs2022
             configuration: debug
-            name: "Win2019 MSC-19, debug"
 
-          - os: windows-2019
+          - name: "Win-22 MSC-22 c++14, debug"
+            os: windows-2022
+            cmp: vs2022
+            configuration: debug
+            extra: "CMD_CXXFLAGS='-analyze -Zc:__cplusplus -std:c++14'"
+
+          - name: "Win-22 MSC-22 c++17, debug"
+            os: windows-2022
+            cmp: vs2022
+            configuration: debug
+            extra: "CMD_CXXFLAGS='-analyze -Zc:__cplusplus -std:c++17'"
+
+          - name: "Win-22 mingw"
+            os: windows-2022
             cmp: gcc
             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@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Automatic core dumper analysis
@@ -216,7 +228,7 @@ jobs:
       run: python .ci/cue.py -T 60M test
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'
@@ -241,10 +253,15 @@ 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: "Rocky-9"
+            image: rockylinux:9
+            cmp: gcc
+            configuration: default
 
           - name: "Fedora-33"
             image: fedora:33
@@ -257,54 +274,87 @@ jobs:
             configuration: default
 
     steps:
-    - name: "Build newer Git"
-      # actions/checkout@v2 wants git >=2.18
-      # centos:7 has 1.8
-      if: matrix.image=='centos:7'
+    - name: "Fix repo URLs on CentOS-8"
+      # centos:8 is frozen, repos are in the vault
+      if: matrix.image=='centos:8'
       run: |
-        yum -y install curl make gcc curl-devel expat-devel gettext-devel openssl-devel zlib-devel perl-ExtUtils-MakeMaker
-        curl https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.29.0.tar.gz | tar -xz
-        cd git-*
-        make -j2 prefix=/usr/local all
-        make prefix=/usr/local install
-        cd ..
-        rm -rf git-*
-        type -a git
-        git --version
+        sed -i -e "s|mirrorlist=|#mirrorlist=|" \
+        -e "s|#baseurl=http://mirror|baseurl=http://vault|" \
+        /etc/yum.repos.d/CentOS-Linux-{BaseOS,AppStream,Extras,Plus}.repo
     - name: "Redhat setup"
       run: |
-        dnfyum() {
-            dnf -y "$@" || yum -y "$@"
-            return $?
-        }
-        dnfyum install python3 gdb make perl gcc-c++ glibc-devel readline-devel ncurses-devel perl-devel perl-Test-Simple
-        git --version || dnfyum install git
-        # rather than just bite the bullet and link python3 -> python,
-        # people would rather just break all existing scripts...
-        [ -e /usr/bin/python ] || ln -sf python3 /usr/bin/python
-        python --version
-    - uses: actions/checkout@v3
+        dnf -y install python3 gdb make perl gcc-c++ glibc-devel readline-devel ncurses-devel perl-devel perl-Test-Simple
+        git --version || dnf -y install git
+        python3 --version
+    - 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
+      run: python3 .ci/cue.py prepare
     - name: Build main module
-      run: python .ci/cue.py build
+      run: python3 .ci/cue.py build
     - name: Run main module tests
-      run: python .ci/cue.py -T 20M test
+      run: python3 .ci/cue.py -T 20M test
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'
         if-no-files-found: ignore
     - name: Collect and show test results
       if: ${{ always() }}
-      run: python .ci/cue.py -T 5M test-results
+      run: python3 .ci/cue.py -T 5M test-results
+
+  build-docker:
+    name: Docker CentOS-7
+    runs-on: ubuntu-latest
+    env:
+      CMP: gcc
+      BCFG: default
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    
+    - name: Run...
+      run: |
+        env > env.list
+        cat <<EOF > runit.sh
+        #!/bin/sh
+        set -e -x
+        cd /io
+        id
+
+        sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
+        sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
+        sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+        yum -y install epel-release
+        yum -y install \
+          curl make gcc curl-devel expat-devel gettext-devel openssl-devel zlib-devel perl-ExtUtils-MakeMaker \
+          python3 gdb make perl gcc-c++ glibc-devel readline-devel ncurses-devel perl-devel perl-Test-Simple \
+          libevent-devel sudo re2c perl-version
+        [ -e /usr/bin/python ] || ln -sf /usr/bin/python3 /usr/bin/python
+
+        # fake out cue.py
+        ln -s /bin/true /usr/bin/apt-get
+
+        # quiet warnings spam from perl
+        export LANG=C
+
+        python --version
+        python .ci/cue.py prepare
+        python .ci/cue.py build
+        python .ci/cue.py -T 15M test
+        python .ci/cue.py test-results
+        EOF
+        chmod +x runit.sh
+        docker run --rm --quiet \
+          --pull=always \
+          --env-file env.list \
+          -v `pwd`:/io \
+          centos:7 \
+          /io/runit.sh

.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

@@ -1,8 +1,11 @@
+# Before adding patterns here, please read the gitignore
+# documentation at https://git-scm.com/docs/gitignore
 /cfg/
 /bin/
 /lib/
 /db/
 /dbd/
+/doc/
 /html/
 /include/
 /templates/
@@ -10,14 +13,13 @@
 /modules/RELEASE.*.local
 /modules/Makefile.local
 O.*/
-/QtC-*
-/.qtc_*
-/.vscode/
-*.orig
 *.log
-.*.swp
-.DS_Store
 .iocsh_history
+
+# Common files generated by other tools
+.DS_Store
+
+# Files created by rpmbuild
 RPMS
 SRPMS
 BUILDROOT

.gitmodules

@@ -1,32 +1,31 @@
 [submodule "modules/pvData"]
     path = modules/pvData
-#    url = https://github.com/epics-base/pvDataCPP
-    url = git@git.psi.ch:epics_base/pvData.git
+    url = https://gitea.psi.ch/epics/pvData
     branch = master
 [submodule "modules/pvAccess"]
     path = modules/pvAccess
-    url = https://github.com/epics-base/pvAccessCPP
+    url = https://gitea.psi.ch/epics/pvAccess
     branch = master
 [submodule "modules/normativeTypes"]
     path = modules/normativeTypes
-    url = https://github.com/epics-base/normativeTypesCPP
+    url = https://gitea.psi.ch/epics/normativeTypes
     branch = master
 [submodule "modules/pvaClient"]
     path = modules/pvaClient
-    url = https://github.com/epics-base/pvaClientCPP
+    url = https://gitea.psi.ch/epics/pvaClient
     branch = master
 [submodule "modules/pvDatabase"]
     path = modules/pvDatabase
-    url = https://github.com/epics-base/pvDatabaseCPP
+    url = https://gitea.psi.ch/epics/pvDatabase
     branch = master
 [submodule "modules/pva2pva"]
     path = modules/pva2pva
-    url = https://github.com/epics-base/pva2pva
+    url = https://gitea.psi.ch/epics/pva2pva
     branch = master
 [submodule ".ci"]
     path = .ci
-    url = https://github.com/epics-base/ci-scripts
+    url = https://gitea.psi.ch/epics/ci-scripts
     branch = master
 [submodule "modules/pcas"]
     path = modules/pcas
-    url = https://github.com/epics-modules/pcas
+    url = https://gitea.psi.ch/epics/pcas

.lgtm.yml

@@ -1,50 +0,0 @@
-# Configuration for lgtm.com
-#
-
-path_classifiers:
-  test:
-    - exclude: /
-    - test
-    - "modules/*/test*"
-  library:
-    - modules/libcom/src/yacc
-    - modules/libcom/src/flex
-  template:
-    - src/template
-    - modules/ca/src/template
-    - modules/database/src/template
-
-extraction:
-  cpp:
-    prepare:
-      packages:
-        - "libreadline-dev"
-    index:
-      build_command:
-        - "g++ --version"
-        - "make --version"
-        - "perl --version"
-        - "make -sj2 || echo '*** Build failed, ignored for lgtm ***'"
-
-  python:
-    index:
-      include:
-        - src/tools
-
-  # Interpreted languages to be excluded
-  javascript:
-    index:
-      exclude:
-        - "*"
-
-  # Compiled languages to be excluded
-  java:
-    index:
-      build_command: "echo No Java code in this project"
-  csharp:
-    index:
-      build_command: "echo No C# code in this project"
-  go:
-    index:
-      build_command: "echo No Go code in this project"
-

.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

README

@@ -13,15 +13,7 @@ this distribution.
 
 ---------------------------------------------------------
 
-Installation and release information can be found in the
-various files in the documentation subdirectory.
-
-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
-	https://epics.anl.gov/
+For more information, see the README.md file.
 
 $Format:%cD$
 $Format:%H$
-https://code.launchpad.net/epics-base

README.md

@@ -0,0 +1,64 @@
+
+# EPICS Base
+
+EPICS (Experimental Physics and Industrial Control System) is a set of software
+tools and applications which provide a software infrastructure for use in
+building distributed control systems to operate devices such as Particle
+Accelerators, Large Experiments and major Telescopes. EPICS Base is the central
+core of the control system toolkit. More details can be found at the
+[About page of the official website](https://epics-controls.org/about-epics/)
+
+## Links
+
+- [Official Website](https://epics-controls.org/)
+- [Original Website](https://epics.anl.gov/)
+- [Repository](https://github.com/epics-base/epics-base)
+
+### Documentation
+
+- [Documentation](https://docs.epics-controls.org/en/latest/)
+- [Documentation Repository](https://github.com/epics-docs/epics-docs)
+
+### Community Communication
+
+- [Tech-Talk Mailing List](https://epics.anl.gov/tech-talk/)
+- [Matrix Rooms](https://matrix.to/#/#epics:epics-controls.org)
+- [News](https://epics-controls.org/news-and-events/)
+
+## Quick Install
+
+Download a release from the
+[Downloads page](https://epics-controls.org/resources-and-support/base/downloads)
+and unpack it. Inside the unpacked folder run:
+
+```bash
+make
+```
+
+For more information on how to install on your system see the
+[Installation page](https://docs.epics-controls.org/en/latest/getting-started/installation.html)
+of the documentation.
+
+### Quick run a softIOC
+
+After building, you can run an example soft-IOC (Input/Output Controller)
+which runs a Channel Access server.
+
+```bash
+./bin/*/softIoc -x first
+```
+
+Run the `dbl` command to list the records it provides:
+
+```bash
+epics> dbl
+first:BaseVersion
+first:exit
+epics> 
+```
+
+## License
+
+EPICS Base is distributed subject to a Software License
+Agreement found in the file [LICENSE](./LICENSE) that is included with
+this distribution.

configure/CONFIG.gnuCommon

@@ -65,7 +65,7 @@ LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC -Wl,-h$@
 
 GNU_LDLIBS_YES = -lgcc
 
-# Use compiler flags to generate header dependancies files
+# Use compiler flags to generate header dependencies files
 HDEPENDS_METHOD = COMP
 HDEPENDS_COMPFLAGS = -MM -MF $@
 

configure/CONFIG.msvcCommon

@@ -0,0 +1,280 @@
+# MSVC/clang-cl compiler defaults
+
+CMPLR_CLASS = msvc
+
+OPT_WHOLE_PROGRAM = YES
+
+#-------------------------------------------------------
+
+WINLINK = link
+
+RCCMD = $(MSVC_PREFIX)rc$(MSVC_SUFFIX) -nologo -l 0x409 $(INCLUDES) -fo $@ $<
+
+ARCMD = $(MSVC_PREFIX)lib$(MSVC_SUFFIX) -nologo -verbose -out:$@ $(LIB_OPT_LDFLAGS) $(LIBRARY_LD_OBJS)
+
+#
+# Configure OS vendor C compiler
+CC = cl
+
+# OS vendor c preprocessor
+CPP = $(CC) -C -E
+
+# Configure OS vendor C++ compiler
+#
+# -EHsc - generate code for exceptions
+# -GR - generate code for run time type identification
+#
+CCC = $(CC) -EHsc -GR -Zc:__cplusplus
+
+# Override CONFIG.gnuCommon settings for cross builds.
+GNU = NO
+HDEPENDS_METHOD = MKMF
+
+# Compiler flags for C files (C++ is below)
+
+#
+# -W<d> display warnings at level d
+#    -W4 is for maximum (lint type) warnings
+#    -W3 is for production quality warnings
+#    -W2 displays significant warnings
+#    -W1 is the default and shows severe warnings only
+# -w<d><n> Set warning C<n> to be shown at level <d>
+WARN_CFLAGS_YES = -W3
+WARN_CFLAGS_NO  = -W1
+
+#
+# -Ox maximum optimizations
+# -GL whole program optimization
+# -Oy- re-enable creation of frame pointers
+OPT_CFLAGS_YES_YES = -Ox -GL -Oy-
+OPT_CFLAGS_YES_NO = -Ox -Oy-
+OPT_CFLAGS_YES = $(OPT_CFLAGS_YES_$(OPT_WHOLE_PROGRAM))
+
+#
+# -Z7 generate C7 compatible debugging information (inside .obj)
+# -RTCsu enable run-time error checks
+OPT_CFLAGS_NO = -Z7 -RTCsu
+
+# specify object file name and location
+OBJ_CFLAG = -Fo
+
+#
+# the following options are required when
+# vis c++ compiles the code (and includes
+# the header files)
+#
+# -MT static multithreaded C RTL
+# -MTd static multithreaded C RTL (debug version)
+# -MD multithreaded C RTL in DLL
+# -MDd multithreaded C RTL in DLL (debug version)
+BUILD_DLL_CFLAGS_NO =
+BUILD_DLL_CFLAGS_YES = -DEPICS_BUILD_DLL
+BUILD_DLL_CFLAGS = $(BUILD_DLL_CFLAGS_$(SHARED_LIBRARIES))
+VISC_CFLAGS_DEBUG_NO = d
+VISC_CFLAGS_DEBUG_YES =
+VISC_CFLAGS_DEBUG = $(VISC_CFLAGS_DEBUG_$(HOST_OPT))
+STATIC_CFLAGS_YES= -MT$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS)
+STATIC_CFLAGS_NO= -MD$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS) -DEPICS_CALL_DLL
+
+# 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
+
+# Compiler flags for C++ files
+
+#
+# -W<n> disable warnings from levels > n
+# -w<n><m> set warning m to level n
+# -w44355 "'this' used in the base initializer list"
+# -w44344 "behavior change: use of explicit template arguments results in ..."
+# -w44251 "class needs to have dll-interface to be used by clients of ..."
+WARN_CXXFLAGS_YES = -W3 -w44355 -w44344 -w44251
+WARN_CXXFLAGS_NO  = -W1
+
+# Silence tr1 namespace deprecation warnings
+WARN_CXXFLAGS += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
+
+#
+# -Ox maximum optimizations
+# -GL whole program optimization
+# -Oy- re-enable creation of frame pointers
+OPT_CXXFLAGS_YES_YES = -Ox -GL -Oy-
+OPT_CXXFLAGS_YES_NO = -Ox -Oy-
+OPT_CXXFLAGS_YES = $(OPT_CXXFLAGS_YES_$(OPT_WHOLE_PROGRAM))
+
+#
+# -Z7 generate C7 compatible debugging information (inside .obj)
+# -RTCsu enable run-time error checks
+OPT_CXXFLAGS_NO = -RTCsu -Z7
+
+# specify object file name and location
+OBJ_CXXFLAG = -Fo
+
+#
+# the following options are required when
+# vis c++ compiles the code (and includes
+# the header files)
+#
+# -MT static multithreaded C RTL
+# -MTd static multithreaded C RTL (debug version)
+# -MD multithreaded C RTL in DLL
+# -MDd multithreaded C RTL in DLL (debug version)
+STATIC_CXXFLAGS_YES= -MT$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS)
+STATIC_CXXFLAGS_NO= -MD$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS) -DEPICS_CALL_DLL
+
+STATIC_LDLIBS_YES=ws2_32.lib advapi32.lib user32.lib kernel32.lib winmm.lib dbghelp.lib
+STATIC_LDLIBS_NO=
+STATIC_LDFLAGS=
+RANLIB=
+
+# add -profile here to run the ms profiler
+# -LTCG whole program optimization
+# -incremental:no full linking
+# -fixed:no generate relocatable code
+# -version:<major>.<minor> - only 2 components allowed, 0-65535 each
+# -debug generate debugging info
+LINK_OPT_FLAGS_WHOLE_YES = -LTCG
+LINK_OPT_FLAGS_YES = $(LINK_OPT_FLAGS_WHOLE_$(OPT_WHOLE_PROGRAM))
+LINK_OPT_FLAGS_YES += -incremental:no -opt:ref
+LINK_OPT_FLAGS_YES += -release $(PROD_VERSION:%=-version:%)
+LINK_OPT_FLAGS_NO = -debug -incremental:no -fixed:no
+OPT_LDFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT))
+
+LIB_OPT_FLAGS_YES = $(LINK_OPT_FLAGS_WHOLE_$(OPT_WHOLE_PROGRAM))
+LIB_OPT_LDFLAGS = $(LIB_OPT_FLAGS_$(HOST_OPT))
+
+ARCH_DEP_CFLAGS=
+SHRLIB_CFLAGS=
+
+OS_CLASS=WIN32
+POSIX=NO
+
+#	ifdef WIN32   looks better that  ifeq ($(OS_CLASS),WIN32)  ??
+WIN32=1
+
+EXE=.exe
+OBJ=.obj
+RES=.res
+
+# MS Visual C++ doesn't recognize *.cc as a C++ source file,
+# so C++ compiles get the flag -TP
+COMPILER_CXXFLAGS = -TP
+
+# Operating system flags
+OP_SYS_CFLAGS =
+OP_SYS_CXXFLAGS = $(COMPILER_CXXFLAGS)
+
+# Files and flags needed to link DLLs (used in RULES_BUILD)
+WIN32_DLLFLAGS = -subsystem:windows -dll $(OPT_LDFLAGS) \
+ $(USR_LDFLAGS) $(CMD_LDFLAGS) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
+
+# Specify dll .def file only if it exists
+DLL_DEF_FLAG = $(addprefix -def:,$(wildcard ../$(addsuffix .def,$*)))
+
+# A WIN32 dll has three parts:
+#	x.dll: the real dll (SHRLIBNAME)
+#	x.lib: what you link to progs that use the dll (DLLSTUB_LIBNAME)
+#	x.exp: what you need to build the dll (in no variable)
+LINK.shrlib = $(WINLINK) -nologo $(WIN32_DLLFLAGS) -out:$@ \
+    -implib:$(@:%$(SHRLIB_SUFFIX)=%$(LIB_SUFFIX)) \
+    $(DLL_DEF_FLAG) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
+
+# Adjust names of libraries to build
+SHRLIB_SUFFIX_BASE = .dll
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
+SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
+LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
+TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(SHRLIB_SUFFIX_BASE))
+
+# When SHARED_LIBRARIES is YES we are building a DLL shared library.
+# When SHARED_LIBRARIES is NO we are building an object library
+DLLSTUB_SUFFIX = .lib
+DLLSTUB_LIBNAME_YES = $(BUILD_LIBRARY:%=%.lib)
+DLLSTUB_LIBNAME = $(DLLSTUB_LIBNAME_$(SHARED_LIBRARIES))
+TESTDLLSTUB_LIBNAME_YES = $(TESTBUILD_LIBRARY:%=%.lib)
+TESTDLLSTUB_LIBNAME = $(TESTDLLSTUB_LIBNAME_$(SHARED_LIBRARIES))
+
+LIB_PREFIX=
+LIB_SUFFIX=.lib
+LIBNAME_NO = $(BUILD_LIBRARY:%=%.lib)
+LIBNAME = $(LIBNAME_$(SHARED_LIBRARIES))
+TESTLIBNAME_NO = $(TESTBUILD_LIBRARY:%=%.lib)
+TESTLIBNAME = $(TESTLIBNAME_$(SHARED_LIBRARIES))
+
+# dll install location
+INSTALL_SHRLIB = $(INSTALL_BIN)
+
+
+#--------------------------------------------------
+# Products dependancy definitions
+
+PROD_DEPLIBS = $(foreach lib, $(PROD_LIBS) $(USR_LIBS), \
+  $(firstword $(wildcard \
+      $(addsuffix /$(DLLSTUB_PREFIX)$(lib)$(DLLSTUB_SUFFIX), \
+        $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \
+      $(addsuffix /$(SHRLIB_PREFIX)$(lib)*$(SHRLIB_SUFFIX_BASE)*, \
+        $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \
+      $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
+        $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \
+    ) $(addsuffix /$(BUILDLIB_PREFIX)$(lib)$(BUILDLIB_SUFFIX), \
+    $(if $(filter $(lib),$(TESTLIBRARY)),.,$(INSTALL_LIB)))))
+
+
+PROD_LDLIBS += $($*_DEPLIBS) $(PROD_DEPLIBS)
+PROD_LDLIBS += $(addsuffix .lib, \
+    $($*_SYS_LIBS) $(PROD_SYS_LIBS) $(USR_SYS_LIBS))
+
+LDLIBS_STATIC_YES = LDLIBS
+LDLIBS_SHARED_NO = LDLIBS
+PROD_LDLIBS += $(STATIC_LDLIBS) \
+    $($(firstword $(LDLIBS_STATIC_$(STATIC_BUILD)) \
+      $(LDLIBS_SHARED_$(SHARED_LIBRARIES))))
+
+#--------------------------------------------------
+# Libraries dependancy definitions
+
+#   libs that we need to link the DLL with
+#   (it isnt necessary to rebuild the dll if these change)
+
+SHRLIB_DEPLIBS = $(foreach lib, $(LIB_LIBS) $(USR_LIBS), \
+  $(firstword $(wildcard \
+      $(addsuffix /$(DLLSTUB_PREFIX)$(lib)$(DLLSTUB_SUFFIX), \
+        $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \
+      $(addsuffix /$(SHRLIB_PREFIX)$(lib)*$(SHRLIB_SUFFIX_BASE)*, \
+        $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \
+      $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
+        $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \
+    ) $(addsuffix /$(BUILDLIB_PREFIX)$(lib)$(BUILDLIB_SUFFIX), \
+    $(if $(filter $(lib),$(TESTLIBRARY)),.,$(INSTALL_LIB)))))
+
+
+SHRLIB_LDLIBS += $($*_DLL_DEPLIBS) $($*_DEPLIBS) $(SHRLIB_DEPLIBS)
+SHRLIB_LDLIBS += $(addsuffix .lib, \
+         $($*_SYS_DLL_LIBS) \
+         $($*_SYS_LIBS) $(LIB_SYS_LIBS) $(USR_SYS_LIBS) )
+
+#--------------------------------------------------
+# Linker definition
+LINK.cpp = $(WINLINK) -nologo $(STATIC_LDFLAGS) $(LDFLAGS) $(PROD_LDFLAGS) \
+    -out:$@ $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)
+
+#--------------------------------------------------
+# UseManifestTool.pl checks MS Visual c++ compiler version number to
+# decide whether or not to use the Manifest Tool command to embed the
+# linker created .manifest file into a library or product target.
+# useManifestTool.pl returns 0(don't use) or 1(use).
+#
+MT.exe = $(MSVC_PREFIX)mt$(MSVC_SUFFIX) -nologo -manifest $@.manifest
+MT_DLL_COMMAND1 = $(MT.exe) "-outputresource:$@;\#2"
+MT_EXE_COMMAND_YES =
+MT_EXE_COMMAND_NO = $(MT.exe) "-outputresource:$@;\#1"
+MT_EXE_COMMAND1 = $(MT_EXE_COMMAND_$(STATIC_BUILD))
+MT_DLL_COMMAND = $(MT_DLL_COMMAND$(shell $(PERL) $(TOOLS)/useManifestTool.pl))
+MT_EXE_COMMAND = $(MT_EXE_COMMAND$(shell $(PERL) $(TOOLS)/useManifestTool.pl))

configure/CONFIG_ADDONS

@@ -24,7 +24,7 @@
 #    These rules apply to these Makefile-variables:
 #    USR_CFLAGS    C flags
 #    USR_CXXFLAGS  C++ flags
-#    USR_CPPFLAGS  c preprocesser flags
+#    USR_CPPFLAGS  c preprocessor flags
 #    SRCS          source files for building libraries and prods
 #    USR_SRCS      source files for building libraries and prods
 #    PROD_SRCS     source files for building prods

configure/CONFIG_BASE

@@ -45,10 +45,13 @@ FIND_PM = $(wildcard $(EPICS_BASE)/lib/perl/$(1))
 #---------------------------------------------------------------
 # EPICS Base build tools and tool flags
 
+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)
 
@@ -65,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,11 +48,11 @@ EPICS_VERSION = 7
 EPICS_REVISION = 0
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 8
+EPICS_MODIFICATION = 10
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included in the official EPICS version number if zero
-EPICS_PATCH_LEVEL = 2
+EPICS_PATCH_LEVEL = 1
 
 # Immediately after an official release the EPICS_PATCH_LEVEL is incremented
 # and the -DEV suffix is added (similar to the Maven -SNAPSHOT versions)
@@ -71,6 +71,3 @@ endif
 EPICS_SHORT_VERSION=$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)$(EPICS_PATCH_VSTRING)
 EPICS_VERSION_NUMBER=$(EPICS_SHORT_VERSION)$(EPICS_DEV_SNAPSHOT)$(EPICS_SITE_VSTRING)
 EPICS_VERSION_STRING="EPICS Version $(EPICS_VERSION_NUMBER)"
-
-# Provide this in case anyone is still using the old name
-COMMIT_DATE="-no-date-"

configure/CONFIG_CA_VERSION

@@ -1,8 +1,8 @@
 # Version number for the Channel Access API and shared library
 
 EPICS_CA_MAJOR_VERSION = 4
-EPICS_CA_MINOR_VERSION = 14
-EPICS_CA_MAINTENANCE_VERSION = 4
+EPICS_CA_MINOR_VERSION = 15
+EPICS_CA_MAINTENANCE_VERSION = 1
 
 # Development flag, set to zero for release versions
 

configure/CONFIG_COMMON

@@ -81,23 +81,6 @@ FINAL_LOCATION              = $(INSTALL_ABSOLUTE)
 # IOC's view of install path
 IOCS_APPL_TOP               = $(INSTALL_ABSOLUTE)
 
-#-------------------------------------------------------
-# How to portably check the flags to make
-makeflags := $(firstword $(filter-out -,$(filter-out --%,$(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,)
-
 #-------------------------------------------------------
 ifdef T_A
 
@@ -164,7 +147,7 @@ CMPLR_SRC_DIRS += . $(foreach dir, .. $(SRC_DIRS), \
 ALL_SRC_DIRS = $(CMPLR_SRC_DIRS) $(OS_SRC_DIRS) $(GENERIC_SRC_DIRS)
 
 #--------------------------------------------------
-# Directory for OS independant build created files
+# Directory for OS independent build created files
 COMMON_DIR = ../O.Common
 
 # compile line include directories
@@ -486,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

@@ -12,6 +12,7 @@ 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
@@ -21,6 +22,7 @@ REGRECDEVDRV_dep  = $(REGRECDEVDRV_pl)
 DBEXPAND                   = $(PERL) $(DBDEXPAND_pl)
 DBTORECORDTYPEH            = $(PERL) $(DBDTORECTYPEH_pl)
 DBTOMENUH                  = $(PERL) $(DBDTOMENUH_pl)
+DBDTOMD                    = $(PERL) $(DBDTOMD_pl)
 DBDTOHTML                  = $(PERL) $(DBDTOHTML_pl)
 REGISTERRECORDDEVICEDRIVER = $(PERL) $(REGRECDEVDRV_pl)
 

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 = 23
+EPICS_DATABASE_MINOR_VERSION = 25
 EPICS_DATABASE_MAINTENANCE_VERSION = 1
 
 # Development flag, set to zero for release versions

configure/CONFIG_ENV

@@ -53,3 +53,5 @@ EPICS_IOC_IGNORE_SERVERS=""
 # EPICS_IOC_LOG_PORT Log server port number etc.
 EPICS_IOC_LOG_PORT=7004
 
+# Posix priority scheduling
+EPICS_ALLOW_POSIX_THREAD_PRIORITY_SCHEDULING=YES

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 = 23
+EPICS_LIBCOM_MINOR_VERSION = 25
 EPICS_LIBCOM_MAINTENANCE_VERSION = 1
 
 # Development flag, set to zero for release versions

configure/CONFIG_SITE_ENV

@@ -71,7 +71,7 @@ EPICS_TS_NTP_INET=
 #	Number of lines of command history to keep.
 # IOCSH_HISTEDIT_DISABLE
 # 	Prevents use of readline or equivalent if defined.
-IOCSH_PS1="epics> "
+IOCSH_PS1=ANSI_GREEN("epics> ")
 IOCSH_HISTSIZE=50
 IOCSH_HISTEDIT_DISABLE=
 
@@ -92,3 +92,6 @@ EPICS_IOC_LOG_FILE_NAME=
 EPICS_IOC_LOG_FILE_COMMAND=
 EPICS_IOC_LOG_FILE_LIMIT=1000000
 
+# Set to 'YES' to call abort() rather than suspend the current thread
+# when an assert() fails
+EPICS_ABORT_ON_ASSERT=NO

configure/RULES.Db

@@ -55,7 +55,7 @@ DBD += $(foreach type, $(CROSS_TARGET_OS_TYPES), $(DBD_$(type)))
 # DBD_solaris += abcSolaris.dbd
 #
 # ---------------------------------------------------
-# DBD concatination files
+# DBD concatenation files
 
 COMMON_DBDCATS += $(addprefix $(COMMON_DIR)/,$(DBDCAT))
 DBDCAT_SOURCES += $(foreach file, $($*_DBD), $(DBDCAT_SOURCE) )
@@ -194,10 +194,10 @@ ifneq (,$(strip $(DBDDEPENDS_FILES)))
 endif
 
 #---------------------------------------------------------------
-# build dependancies, clean rule
+# build dependencies, 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) \
@@ -427,6 +427,26 @@ $(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
 

configure/RULES_ARCHS

@@ -32,7 +32,7 @@ ifneq ($(RELEASE_CFG_DIR_RULES),)
   include $(RELEASE_CFG_DIR_RULES)
 endif
 
-# Create EPICS_HOST_ARCH dependancies for GNU make -j option.
+# Create EPICS_HOST_ARCH dependencies for GNU make -j option.
 # Needed in dirs where EPICS_HOST_ARCH build creates a tool used in 
 # cross arch builds
 

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)
@@ -128,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)
@@ -182,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)
@@ -213,7 +214,7 @@ $(sort $(DIRECTORY_TARGETS)):
 	$(MKDIR) $@
 
 # Install LIB_INSTALLS libraries before linking executables
-$(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS)
+$(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS) $(TESTSHRLIBNAME)
 
 # Install built libraries too, unless Makefile says to wait
 ifneq ($(DELAY_INSTALL_LIBS),YES)
@@ -575,13 +576,17 @@ $(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)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_DOC)/%: ../%
 	$(ECHO) "Installing doc $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_HTML)/$(HTMLS_DIR)/%: $(COMMON_DIR)/%
 	$(ECHO) "Installing generated html $@"

configure/RULES_DIRS

@@ -44,7 +44,7 @@ $(foreach dir, $(DIRS), $(dir)$(DIVIDER)install): \
 rebuild: $(foreach dir, $(DIRS), $(dir)$(DIVIDER)install)
 endif
 
-# Create directory dependancies lines for GNU make -j option
+# Create directory dependencies lines for GNU make -j option
 # Only works with GNU make 3.81 or later (uses eval function)
 define DEP_template1
 $(1): $$($(1)_DEPEND_DIRS)

configure/RULES_MODULES

@@ -41,7 +41,7 @@ RELEASE.host: $(RELEASE_LOCAL)
 
 $(RELEASE_LOCAL): Makefile $(CONFIG)/CONFIG_SITE \
     $(wildcard $(CONFIG)/CONFIG_SITE.local)
-	$(ECHO) Creating $@ with
+	$(ECHO) "Creating $@ with"
 	$(ECHO) "    $(PARENT_MODULE) = $(INSTALL_ABSOLUTE)"
 	@echo $(PARENT_MODULE) = $(INSTALL_ABSOLUTE)> $@
 

configure/Sample.Makefile

@@ -82,7 +82,7 @@ INC         = file.h
 #	Platform specific files can also be put in
 #	separate os/OS_CLASS directories!
 #
-#	For almost every file the seach order is:
+#	For almost every file the search order is:
 #	./os/OS_CLASS
 #	./os/generic
 #	.
@@ -136,11 +136,11 @@ PROD_SRCS = ppp.c qqq.c
 a_file_SRCS = aa.c bb.c
 
 #
-#	EPICS libs needed to link PROD, TESTPROD and sharable library
+#	EPICS libs needed to link PROD, TESTPROD and shareable library
 #
 #	note that DLL_LIBS (the libraries needed to link a shareable
 #	library) is created by default from the PROD/SYS libraries specified 
-#	below minus the name of the sharable library (LIBRARY)
+#	below minus the name of the shareable library (LIBRARY)
 #	
 #
 # ----------  libraries for a specific product pppp
@@ -169,7 +169,7 @@ USR_LIBS_DEFAULT = foolib
 USR_LIBS_WIN32   = -nil-
 foolib_DIR = $(FOO_LIB)
 
-#	system libs needed to link PROD, TESTPROD and sharable library
+#	system libs needed to link PROD, TESTPROD and shareable library
 #
 # ---------- system libraries for all products
 # for all systems:

configure/os/CONFIG.Common.RHEL7-x86_64

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

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

configure/os/CONFIG.Common.RHEL8-x86_64

@@ -4,13 +4,14 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86_64
 BUILD_CLASS = HOST
 
 TOOLSET_LOCATION = /opt/rh
-TOOLSET = gcc-toolset-12
+TOOLSET = gcc-toolset-15
 STD_CXXFLAGS = -std=c++20
+STD_CFLAGS = -std=c17
 
 # 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)
+CPPFLAGS += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
+LDFLAGS  += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
 endif
 
 ifneq (($(TOOLSET)),)

configure/os/CONFIG.Common.RHEL9-x86_64

@@ -4,13 +4,14 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86_64
 BUILD_CLASS = HOST
 
 TOOLSET_LOCATION = /opt/rh
-TOOLSET = gcc-toolset-12
+TOOLSET = gcc-toolset-15
 STD_CXXFLAGS = -std=c++20
+STD_CFLAGS = -std=c17
 
 # 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)
+CPPFLAGS += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
+LDFLAGS  += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
 endif
 
 ifneq (($(TOOLSET)),)

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)
 
@@ -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
@@ -133,7 +165,8 @@ MOD_SYS_LDFLAGS += $(CPU_CFLAGS) -Wl,-r -nostdlib
 GESYS_LIBS += -lgcc
 GESYS_LIBS += -lc -lm -lrtemscpu -lrtemsbsp -lrtems++
 GESYS_LIBS += -lcexp -ltecla_r -lspencer_regexp -lpmelf -lpmbfd
-GESYS_LIBS += -lnfs -ltelnetd -lrtems-gdb-stub
+GESYS_LIBS += -lnfs -ltelnetd -lrtems-gdb-stub -lbsd -ltftpfs -lz
+GESYS_LIBS += -lnetworking
 
 # While not part of the Generic Image it provides symbols which
 # would conflict.

configure/os/CONFIG.Common.RTEMS-beagleboneblack

@@ -9,7 +9,7 @@ RTEMS_BSP = beagleboneblack
 RTEMS_TARGET_CPU = arm
 GNU_TARGET = arm-rtems
 
-OP_SYS_LDLIBS += -Wl,--gc-sections
+OP_SYS_LDFLAGS += -Wl,--gc-sections
 ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/$(GNU_TARGET)$(RTEMS_VERSION)/beagleboneblack/lib/
 
 include $(CONFIG)/os/CONFIG.Common.RTEMS

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
@@ -23,3 +22,9 @@ define MUNCH_CMD
 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

@@ -20,7 +20,6 @@ define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< $@ 
 endef
 
-OP_SYS_LDLIBS += -Wl,--gc-sections
 ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/$(GNU_TARGET)$(RTEMS_VERSION)/pc686/lib/
 
 include $(CONFIG)/os/CONFIG.Common.RTEMS
@@ -28,11 +27,11 @@ include $(CONFIG)/os/CONFIG.Common.RTEMS
 #
 # Put text segment where it will work with etherboot
 #
-OP_SYS_LDFLAGS += -Wl,-Ttext,0x100000
+OP_SYS_LDFLAGS += -Wl,-Ttext,0x100000 -Wl,--gc-sections
 
 
 # This check must appear after the above include
-ifneq ($(firstword $(subst ., ,$(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

@@ -20,7 +20,7 @@ ARCH_DEP_CFLAGS += -DRTEMS_HAS_ALTIVEC
 #ARCH_DEP_CFLAGS += -I$(RTEMS_BASE)/powerpc-rtems5/qoriq_e500/lib/include
 
 #OP_SYS_LDLIBS += -lbspExt #does not use posix stuff ... want to ignore
-OP_SYS_LDLIBS += -Wl,--gc-sections
+OP_SYS_LDFLAGS += -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)/$(GNU_TARGET)$(RTEMS_VERSION)/$(RTEMS_BSP)/lib
 

configure/os/CONFIG.Common.RTEMS-xilinx_zynq_a9_qemu

@@ -12,7 +12,7 @@ GNU_TARGET = arm-rtems
 #use dhcp/bootp
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 
-OP_SYS_LDLIBS += -Wl,--gc-sections
+OP_SYS_LDFLAGS += -Wl,--gc-sections
 ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/$(GNU_TARGET)$(RTEMS_VERSION)/xilinx_zynq_a9_qemu/lib/
 
 

configure/os/CONFIG.Common.RTEMS-xilinx_zynq_microzed

@@ -0,0 +1,16 @@
+#
+# CONFIG.Common.RTEMS-xilinx_zynq_microzed
+# Author: Chris Johns <chris@contemporary.software>
+#
+# All RTEMS targets use the same Makefile fragment
+#
+#EXE = .elf
+RTEMS_BSP = xilinx_zynq_microzed
+RTEMS_TARGET_CPU = arm
+GNU_TARGET = arm-rtems
+
+OP_SYS_LDLIBS += -Wl,--gc-sections
+ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/$(GNU_TARGET)$(RTEMS_VERSION)/xilinx_zynq_microzed/lib/
+
+
+include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-xilinx_zynq_zedboard

@@ -9,7 +9,7 @@ RTEMS_BSP = xilinx_zynq_zedboard
 RTEMS_TARGET_CPU = arm
 GNU_TARGET = arm-rtems
 
-OP_SYS_LDLIBS += -Wl,--gc-sections
+OP_SYS_LDFLAGS += -Wl,--gc-sections
 ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/$(GNU_TARGET)$(RTEMS_VERSION)/xilinx_zynq_zedboard/lib/
 
 

configure/os/CONFIG.Common.T2-ppc604

@@ -1,8 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
-VXWORKS_VERSION = 5.5.1
-WIND_BASE = /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.V62-ppc604

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

configure/os/CONFIG.Common.V63-ppc603

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

configure/os/CONFIG.Common.V63-ppc604

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

configure/os/CONFIG.Common.V64-ppc604

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

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

configure/os/CONFIG.Common.V66-ppc604

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

configure/os/CONFIG.Common.V67-ppc604

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

@@ -1,3 +0,0 @@
-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.eldk42-ppc4xxFP

@@ -11,13 +11,6 @@ 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
 

configure/os/CONFIG.Common.fslqoriq20-e6500_64

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

@@ -91,11 +91,6 @@ vpath %.m $(USR_VPATH) $(ALL_SRC_DIRS)
 %.o: %.m
 	$(COMPILE.c) -c $<
 
-#--------------------------------------------------
-# Header dependency file generation
-#
-HDEPENDS_METHOD = MKMF
-
 #--------------------------------------------------
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.iosCommon

configure/os/CONFIG.Common.mvl40-xscale_be

@@ -11,6 +11,9 @@ GNU_DIR=/opt/moxa/xscale_be/armv5teb-montavista-linuxeabi
 
 ARCH_DEP_CFLAGS += -funwind-tables
 
+# suppress strict alias warnings
+CODE_CPPFLAGS += -fno-strict-aliasing
+
 # have no C++11
 STD_CXXFLAGS =
 

configure/os/CONFIG.Common.nilrt7-armv7a

@@ -9,10 +9,10 @@ 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
+GNU_DIR = /opt/RHEL7
 
 # Needed on RHEL9:
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)/usr/$$LIB:/opt/RHEL7/$$LIB
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)/usr/$$LIB:$(GNU_DIR)/$$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

configure/os/CONFIG.Common.vxWorksCommon

@@ -145,12 +145,6 @@ CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VXWORKS_MAJOR_VERSION))
 SHRLIB_CFLAGS =
 SHRLIB_LDFLAGS =
 
-#--------------------------------------------------
-# 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
 OSITHREAD_USE_DEFAULT_STACK = NO

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

@@ -0,0 +1,18 @@
+# CONFIG.Common.win32-x86-clang
+#
+# Definitions for win32-x86-clang target build
+# Override these definitions in CONFIG_SITE.Common.win32-x86-clang
+#-------------------------------------------------------
+
+#Include definitions common to msvc compiler
+include $(CONFIG)/CONFIG.msvcCommon
+
+VALID_BUILDS = Ioc Host Command
+
+# Override CONFIG.msvcCommon settings:
+MSVC_PREFIX = llvm-
+CC = clang-cl$(MSVC_SUFFIX) --target=i686-pc-windows-msvc
+WINLINK = lld-link$(MSVC_SUFFIX)
+
+# clang-cl does not support /GL option
+OPT_WHOLE_PROGRAM = NO

configure/os/CONFIG.Common.windows-x64-clang

@@ -0,0 +1,18 @@
+# CONFIG.Common.windows-x64-clang
+#
+# Definitions for windows-x64-clang target builds
+# Sites may override these definitions in CONFIG_SITE.Common.windows-x64-clang
+#-------------------------------------------------------
+
+#Include definitions common to msvc compiler
+include $(CONFIG)/CONFIG.msvcCommon
+
+VALID_BUILDS = Ioc Host Command
+
+# Override CONFIG.msvcCommon settings:
+MSVC_PREFIX = llvm-
+CC = clang-cl$(MSVC_SUFFIX) --target=x86_64-pc-windows-msvc
+WINLINK = lld-link$(MSVC_SUFFIX)
+
+# clang-cl does not support /GL option
+OPT_WHOLE_PROGRAM = NO

configure/os/CONFIG.Common.yocto21-aarch64

@@ -1,15 +0,0 @@
-# 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.Linux.win32-x86

@@ -0,0 +1,4 @@
+include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
+
+PATH := /opt/wine-msvc-2017/bin/x86:$(PATH)
+export WINEPREFIX = $(HOME)/.wine32-$(EPICS_HOST_ARCH)

configure/os/CONFIG.Linux.windows-x64

@@ -4,7 +4,8 @@ VALID_BUILDS = Ioc Command
 
 MSVC_VERSION ?= 2019
 PATH := /opt/gfa-wine/bin:/opt/wine-msvc-$(MSVC_VERSION)/bin/x64:$(PATH)
+export WINE ?= wine64
 export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)
-export WINEDEBUG=fixme-all
-export WINEDLLOVERRIDES="mscoree,mshtml="
-export WINE = wine64
+export WINEDEBUG := err-all,warn-all,fixme-all$(WINEDEBUG:%=,%)
+export WINEDLLOVERRIDES := mscoree,mshtml=$(WINEDLLOVERRIDES:%=,%)
+export WINEPATH := $(WINEPATH:%=%;)$(abspath $(INSTALL_BIN))

configure/os/CONFIG.RHEL7-x86_64.Common

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

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

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

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

@@ -1,3 +0,0 @@
-# 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.RHEL7-x86_64

@@ -1,25 +0,0 @@
-# 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.windows-x64-mingw

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

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

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

@@ -14,9 +14,12 @@ SYSROOT = /opt/RHEL8
 # 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)
+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
+
+# Allow to run cross-tests which expect different lib versions
+export LD_PRELOAD=$(SYSROOT)/lib64/libreadline.so

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

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

configure/os/CONFIG.darwin-aarch64-debug.Common

@@ -0,0 +1,11 @@
+# CONFIG.darwin-aarch64-debug.Common
+#
+# Definitions for darwin-aarch64-debug host builds - darwin-aarch64 target build with debug compiler flags
+# Sites may override these definitions in CONFIG_SITE.darwin-aarch64-debug.Common
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.darwin-aarch64.Common
+
+# Removes -O optimization and adds -g compile option
+HOST_OPT=NO
+

configure/os/CONFIG.darwin-aarch64.darwin-aarch64-debug

@@ -0,0 +1,14 @@
+# CONFIG.darwin-aarch64.darwin-aarch64-debug
+#
+# Definitions for darwin-aarch64 host - darwin-aarch64-debug target build with debug compiler flags
+# Sites may override these definitions in CONFIG_SITE.darwin-aarch64.darwin-aarch64-debug
+#-------------------------------------------------------
+
+-include $(CONFIG)/os/CONFIG.Common.darwin-aarch64
+-include $(CONFIG)/os/CONFIG.darwin-aarch64.darwin-aarch64
+-include $(CONFIG)/os/CONFIG_SITE.Common.darwin-aarch64
+-include $(CONFIG)/os/CONFIG_SITE.darwin-aarch64.darwin-aarch64
+
+
+BUILD_CLASS=HOST
+HOST_OPT = NO

configure/os/CONFIG.darwin-x86-debug.Common

@@ -0,0 +1,11 @@
+# CONFIG.darwin-x86-debug.Common
+#
+# Definitions for darwin-x86-debug host builds - darwin-x86 target build with debug compiler flags
+# Sites may override these definitions in CONFIG_SITE.darwin-x86-debug.Common
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.darwin-x86.Common
+
+# Removes -O optimization and adds -g compile option
+HOST_OPT=NO
+

configure/os/CONFIG.darwinCommon.darwinCommon

@@ -82,11 +82,6 @@ vpath %.m $(USR_VPATH) $(ALL_SRC_DIRS)
 %.o: %.m
 	$(COMPILE.c) -c $<
 
-#
-# Header dependency file generation
-#
-HDEPENDS_METHOD = MKMF
-
 #--------------------------------------------------
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.darwinCommon.darwinCommon

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

@@ -2,13 +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/local
+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.win32-x86-clang.Common

@@ -0,0 +1,9 @@
+# CONFIG.win32-x86-clang.Common
+#
+# Definitions for win32-x86-clang host arch
+# Override these definitions in CONFIG_SITE.win32-x86-clang.Common
+#-------------------------------------------------------
+
+#Include definitions common to win32-x86 hosts
+include $(CONFIG)/os/CONFIG.win32-x86.Common
+

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

@@ -4,286 +4,7 @@
 # Override these definitions in CONFIG_SITE.win32-x86.win32-x86
 #-------------------------------------------------------
 
-# Win32 valid build types and include directory suffixes
+# Include common msvc compiler definitions
+include $(CONFIG)/CONFIG.msvcCommon
 
 VALID_BUILDS = Host Ioc Command
-
-CMPLR_CLASS = msvc
-
-OPT_WHOLE_PROGRAM = YES
-
-#-------------------------------------------------------
-
-WINLINK = link
-
-RCCMD = rc -nologo -l 0x409 $(INCLUDES) -fo $@ $<
-
-ARCMD = lib -nologo -verbose -out:$@ $(LIB_OPT_LDFLAGS) $(LIBRARY_LD_OBJS)
-
-#
-# Configure OS vendor C compiler
-CC = cl
-
-# Override CONFIG.gnuCommon settings for cross builds.
-GNU = NO
-HDEPENDS_METHOD = MKMF
-
-# Compiler flags for C files (C++ is below)
-
-#
-# -W<d> display warnings at level d
-#    -W4 is for maximum (lint type) warnings
-#    -W3 is for production quality warnings
-#    -W2 displays significant warnings
-#    -W1 is the default and shows severe warnings only
-# -w<d><n> Set warning C<n> to be shown at level <d>
-WARN_CFLAGS_YES = -W3
-WARN_CFLAGS_NO  = -W1
-
-#
-# -Ox maximum optimizations
-# -GL whole program optimization
-# -Oy- re-enable creation of frame pointers
-OPT_CFLAGS_YES_YES = -Ox -GL -Oy-
-OPT_CFLAGS_YES_NO = -Ox -Oy-
-OPT_CFLAGS_YES = $(OPT_CFLAGS_YES_$(OPT_WHOLE_PROGRAM))
-
-#
-# -Z7 generate C7 compatible debugging information (inside .obj)
-# -RTCsu enable run-time error checks
-OPT_CFLAGS_NO = -Z7 -RTCsu
-
-# specify object file name and location
-OBJ_CFLAG = -Fo
-
-#
-# the following options are required when
-# vis c++ compiles the code (and includes
-# the header files)
-#
-# -MT static multithreaded C RTL
-# -MTd static multithreaded C RTL (debug version)
-# -MD multithreaded C RTL in DLL
-# -MDd multithreaded C RTL in DLL (debug version)
-BUILD_DLL_CFLAGS_NO =
-BUILD_DLL_CFLAGS_YES = -DEPICS_BUILD_DLL
-BUILD_DLL_CFLAGS = $(BUILD_DLL_CFLAGS_$(SHARED_LIBRARIES))
-VISC_CFLAGS_DEBUG_NO = d
-VISC_CFLAGS_DEBUG_YES =
-VISC_CFLAGS_DEBUG = $(VISC_CFLAGS_DEBUG_$(HOST_OPT))
-STATIC_CFLAGS_YES= -MT$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS)
-STATIC_CFLAGS_NO= -MD$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS) -DEPICS_CALL_DLL
-
-# OS vendor c preprocessor
-CPP = cl -nologo -C -E
-
-# Configure OS vendor C++ compiler
-#
-# -EHsc - generate code for exceptions
-# -GR - generate code for run time type identification
-#
-CCC = cl -EHsc -GR
-
-# 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
-
-
-# Compiler flags for C++ files
-
-#
-# -W<n> disable warnings from levels > n
-# -w<n><m> set warning m to level n
-# -w44355 "'this' used in the base initializer list"
-# -w44344 "behavior change: use of explicit template arguments results in ..."
-# -w44251 "class needs to have dll-interface to be used by clients of ..."
-WARN_CXXFLAGS_YES = -W3 -w44355 -w44344 -w44251
-WARN_CXXFLAGS_NO  = -W1
-
-# Silence tr1 namespace deprecation warnings
-WARN_CXXFLAGS += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
-
-#
-# -Ox maximum optimizations
-# -GL whole program optimization
-# -Oy- re-enable creation of frame pointers
-OPT_CXXFLAGS_YES_YES = -Ox -GL -Oy-
-OPT_CXXFLAGS_YES_NO = -Ox -Oy-
-OPT_CXXFLAGS_YES = $(OPT_CXXFLAGS_YES_$(OPT_WHOLE_PROGRAM))
-
-#
-# -Z7 generate C7 compatible debugging information (inside .obj)
-# -RTCsu enable run-time error checks
-OPT_CXXFLAGS_NO = -RTCsu -Z7
-
-# specify object file name and location
-OBJ_CXXFLAG = -Fo
-
-#
-# the following options are required when
-# vis c++ compiles the code (and includes
-# the header files)
-#
-# -MT static multithreaded C RTL
-# -MTd static multithreaded C RTL (debug version)
-# -MD multithreaded C RTL in DLL
-# -MDd multithreaded C RTL in DLL (debug version)
-STATIC_CXXFLAGS_YES= -MT$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS)
-STATIC_CXXFLAGS_NO= -MD$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS) -DEPICS_CALL_DLL
-
-STATIC_LDLIBS_YES=ws2_32.lib advapi32.lib user32.lib kernel32.lib winmm.lib dbghelp.lib
-STATIC_LDLIBS_NO=
-STATIC_LDFLAGS=
-RANLIB=
-
-# add -profile here to run the ms profiler
-# -LTCG whole program optimization
-# -incremental:no full linking
-# -fixed:no generate relocatable code
-# -version:<major>.<minor> - only 2 components allowed, 0-65535 each
-# -debug generate debugging info
-LINK_OPT_FLAGS_WHOLE_YES = -LTCG
-LINK_OPT_FLAGS_YES = $(LINK_OPT_FLAGS_WHOLE_$(OPT_WHOLE_PROGRAM))
-LINK_OPT_FLAGS_YES += -incremental:no -opt:ref
-LINK_OPT_FLAGS_YES += -release $(PROD_VERSION:%=-version:%)
-LINK_OPT_FLAGS_NO = -debug -incremental:no -fixed:no
-OPT_LDFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT))
-
-LIB_OPT_FLAGS_YES = $(LINK_OPT_FLAGS_WHOLE_$(OPT_WHOLE_PROGRAM))
-LIB_OPT_LDFLAGS = $(LIB_OPT_FLAGS_$(HOST_OPT))
-
-ARCH_DEP_CFLAGS=
-SHRLIB_CFLAGS=
-
-OS_CLASS=WIN32
-POSIX=NO
-
-#	ifdef WIN32   looks better that  ifeq ($(OS_CLASS),WIN32)  ??
-WIN32=1
-
-EXE=.exe
-OBJ=.obj
-RES=.res
-
-# MS Visual C++ doesn't recognize *.cc as a C++ source file,
-# so C++ compiles get the flag -TP
-COMPILER_CXXFLAGS = -TP
-
-# Operating system flags
-OP_SYS_CFLAGS =
-OP_SYS_CXXFLAGS = $(COMPILER_CXXFLAGS)
-
-# Files and flags needed to link DLLs (used in RULES_BUILD)
-WIN32_DLLFLAGS = -subsystem:windows -dll $(OPT_LDFLAGS) \
- $(USR_LDFLAGS) $(CMD_LDFLAGS) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
-
-# Specify dll .def file only if it exists
-DLL_DEF_FLAG = $(addprefix -def:,$(wildcard ../$(addsuffix .def,$*)))
-
-# A WIN32 dll has three parts:
-#	x.dll: the real dll (SHRLIBNAME)
-#	x.lib: what you link to progs that use the dll (DLLSTUB_LIBNAME)
-#	x.exp: what you need to build the dll (in no variable)
-LINK.shrlib = $(WINLINK) -nologo $(WIN32_DLLFLAGS) -out:$@ \
-    -implib:$(@:%$(SHRLIB_SUFFIX)=%$(LIB_SUFFIX)) \
-    $(DLL_DEF_FLAG) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
-
-# Adjust names of libraries to build
-SHRLIB_SUFFIX_BASE = .dll
-SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
-SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
-LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
-TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(SHRLIB_SUFFIX_BASE))
-
-# When SHARED_LIBRARIES is YES we are building a DLL shared library.
-# When SHARED_LIBRARIES is NO we are building an object library
-DLLSTUB_SUFFIX = .lib
-DLLSTUB_LIBNAME_YES = $(BUILD_LIBRARY:%=%.lib)
-DLLSTUB_LIBNAME = $(DLLSTUB_LIBNAME_$(SHARED_LIBRARIES))
-TESTDLLSTUB_LIBNAME_YES = $(TESTBUILD_LIBRARY:%=%.lib)
-TESTDLLSTUB_LIBNAME = $(TESTDLLSTUB_LIBNAME_$(SHARED_LIBRARIES))
-
-LIB_PREFIX=
-LIB_SUFFIX=.lib
-LIBNAME_NO = $(BUILD_LIBRARY:%=%.lib)
-LIBNAME = $(LIBNAME_$(SHARED_LIBRARIES))
-TESTLIBNAME_NO = $(TESTBUILD_LIBRARY:%=%.lib)
-TESTLIBNAME = $(TESTLIBNAME_$(SHARED_LIBRARIES))
-
-# dll install location
-INSTALL_SHRLIB = $(INSTALL_BIN)
-
-
-#--------------------------------------------------
-# Products dependancy definitions
-
-PROD_DEPLIBS = $(foreach lib, $(PROD_LIBS) $(USR_LIBS), \
-  $(firstword $(wildcard \
-      $(addsuffix /$(DLLSTUB_PREFIX)$(lib)$(DLLSTUB_SUFFIX), \
-        $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \
-      $(addsuffix /$(SHRLIB_PREFIX)$(lib)*$(SHRLIB_SUFFIX_BASE)*, \
-        $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \
-      $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
-        $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \
-    ) $(addsuffix /$(BUILDLIB_PREFIX)$(lib)$(BUILDLIB_SUFFIX), \
-    $(if $(filter $(lib),$(TESTLIBRARY)),.,$(INSTALL_LIB)))))
-
-
-PROD_LDLIBS += $($*_DEPLIBS) $(PROD_DEPLIBS)
-PROD_LDLIBS += $(addsuffix .lib, \
-    $($*_SYS_LIBS) $(PROD_SYS_LIBS) $(USR_SYS_LIBS))
-
-LDLIBS_STATIC_YES = LDLIBS
-LDLIBS_SHARED_NO = LDLIBS
-PROD_LDLIBS += $(STATIC_LDLIBS) \
-    $($(firstword $(LDLIBS_STATIC_$(STATIC_BUILD)) \
-      $(LDLIBS_SHARED_$(SHARED_LIBRARIES))))
-
-#--------------------------------------------------
-# Libraries dependancy definitions
-
-#   libs that we need to link the DLL with
-#   (it isnt necessary to rebuild the dll if these change)
-
-SHRLIB_DEPLIBS = $(foreach lib, $(LIB_LIBS) $(USR_LIBS), \
-  $(firstword $(wildcard \
-      $(addsuffix /$(DLLSTUB_PREFIX)$(lib)$(DLLSTUB_SUFFIX), \
-        $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \
-      $(addsuffix /$(SHRLIB_PREFIX)$(lib)*$(SHRLIB_SUFFIX_BASE)*, \
-        $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \
-      $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
-        $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \
-    ) $(addsuffix /$(BUILDLIB_PREFIX)$(lib)$(BUILDLIB_SUFFIX), \
-    $(if $(filter $(lib),$(TESTLIBRARY)),.,$(INSTALL_LIB)))))
-
-
-SHRLIB_LDLIBS += $($*_DLL_DEPLIBS) $($*_DEPLIBS) $(SHRLIB_DEPLIBS)
-SHRLIB_LDLIBS += $(addsuffix .lib, \
-         $($*_SYS_DLL_LIBS) \
-         $($*_SYS_LIBS) $(LIB_SYS_LIBS) $(USR_SYS_LIBS) )
-
-#--------------------------------------------------
-# Linker definition
-LINK.cpp = $(WINLINK) -nologo $(STATIC_LDFLAGS) $(LDFLAGS) $(PROD_LDFLAGS) \
-    -out:$@ $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)
-
-#--------------------------------------------------
-# UseManifestTool.pl checks MS Visual c++ compiler version number to
-# decide whether or not to use the Manifest Tool command to embed the
-# linker created .manifest file into a library or product target.
-# useManifestTool.pl returns 0(don't use) or 1(use).
-#
-MT.exe = mt.exe -nologo -manifest $@.manifest
-MT_DLL_COMMAND1 = $(MT.exe) "-outputresource:$@;\#2"
-MT_EXE_COMMAND_YES =
-MT_EXE_COMMAND_NO = $(MT.exe) "-outputresource:$@;\#1"
-MT_EXE_COMMAND1 = $(MT_EXE_COMMAND_$(STATIC_BUILD))
-MT_DLL_COMMAND = $(MT_DLL_COMMAND$(shell $(PERL) $(TOOLS)/useManifestTool.pl))
-MT_EXE_COMMAND = $(MT_EXE_COMMAND$(shell $(PERL) $(TOOLS)/useManifestTool.pl))

configure/os/CONFIG.windows-x64-clang.Common

@@ -0,0 +1,9 @@
+# CONFIG.windows-x64-clang.Common
+#
+# Definitions for windows-x64-clang host arch
+# Override these definitions in CONFIG_SITE.windows-x64-clang.Common
+#-------------------------------------------------------
+
+#Include definitions common to windows-x64 hosts
+include $(CONFIG)/os/CONFIG.windows-x64.Common
+

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

@@ -4,9 +4,10 @@
 # Override these definitions in CONFIG_SITE.windows-x64.windows-x64
 #-------------------------------------------------------
 
-#Include definitions common to win32-x86 builds
-include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
--include $(CONFIG)/os/CONFIG_SITE.win32-x86.win32-x86
+# Include common msvc compiler definitions
+include $(CONFIG)/CONFIG.msvcCommon
+
+VALID_BUILDS = Host Ioc Command
 
 OPT_LDFLAGS += -MACHINE:X64
 #	-MACHINE:X64

configure/os/CONFIG_SITE.Common.linuxCommon

@@ -12,11 +12,12 @@ COMMANDLINE_LIBRARY = READLINE
 
 USR_CXXFLAGS += $(STD_CXXFLAGS)
 STD_CXXFLAGS = -std=c++11
+USR_CFLAGS += $(STD_CFLAGS)
 
 TOOLSET_DIR      = $(TOOLSET:%=$(TOOLSET_LOCATION)/%/root)
 GNU_DIR = $(SYSROOT)$(TOOLSET_DIR)
-TARGET_CPPFLAGS += $(SYSROOT:%=--sysroot=%)
-TARGET_LDFLAGS  += $(SYSROOT:%=--sysroot=%)
+CPPFLAGS += $(SYSROOT:%=--sysroot=%)
+LDFLAGS  += $(SYSROOT:%=--sysroot=%)
 
 # backward compatibility: Keep unversioned libs
 # in order to prevent dynamic linking problems

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -18,70 +18,6 @@ VXWORKS_VERSION = 6.9
 # architecture by adding it to an appropriate
 # CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file.
 
-#### Fixes for CONFIG.Common.vxWorksCommon  #######
-
-VX_GNU_VERSION_7 = 4.8.1.11
-
-
-# These are needed for vxWorks 6.x; the GNU toolset version number
-# is in the path to the compiler tools:
-VX_GNU_VERSION_5   = 2.96
-VX_GNU_VERSION_6 = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
-VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_MAJOR_VERSION))
-VX_GNU_MAJOR_VERSION = $(firstword $(subst ., ,$(VX_GNU_VERSION)))
-VX_GNU_MINOR_VERSION = $(word 2,$(subst ., ,$(VX_GNU_VERSION)))
-
-# gcc version before 3.4 are "old" and need special treatment
-VX_OLD_GCC_2   = OLD
-VX_OLD_GCC_3.3 = OLD
-VX_OLD_GCC_3   = $(VX_OLD_GCC_3.$(VX_GNU_MINOR_VERSION))
-VX_OLD_GCC = $(VX_OLD_GCC_$(VX_GNU_MAJOR_VERSION))
-
-# vxWorks directory definitions
-VX_DIR_5 = $(WIND_BASE)
-VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
-VX_DIR_7 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/pkgs/os
-VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
-
-VX_INCLUDE_DIRS_5  = $(VX_DIR)/target/h
-VX_INCLUDE_DIRS_6  = $(VX_DIR)/target/h
-VX_INCLUDE_DIRS_6 += $(VX_DIR)/target/h/wrn/coreip
-VX_INCLUDE_DIRS_7  = $(VX_DIR)/core/kernel-1.2.8.0/h
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/lang-lib/libc-1.0.0.1/libc-kernel-1.0.8.0/h
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/utils/ostools-1.0.5.0/h
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/utils/ostools-1.0.5.0/shareh
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/arch/ppc-1.3.4.0/kernel/base/h/
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/arch/ppc-1.3.4.0/kernel/60x/h/arch/ppc/
-VX_INCLUDE_DIRS_7 += $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/samples/prebuilt_projects/vsb_vxsim_linux/krnl/h/public
-GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
-
-TARGET_CPPFLAGS_5 = -isystem $(VX_DIR)/target/h
-TARGET_CPPFLAGS_6 = -isystem $(VX_DIR)/target/h
-TARGET_CPPFLAGS_7 = -isystem $(VX_DIR)/core/kernel-1.2.8.0/h -D_VSB_CONFIG_FILE='<$(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/samples/prebuilt_projects/vsb_vxsim_linux/h/config/vsbConfig.h>'
-TARGET_CPPFLAGS = $(TARGET_CPPFLAGS_$(VXWORKS_MAJOR_VERSION))
-
-# vxWorks GNU directories
-
-GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
-GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
-GNU_DIR_7 = $(WIND_BASE)/compilers/gnu-$(VX_GNU_VERSION)/$(WIND_HOST_TYPE)
-GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
-
-# Operating system flags
-
-OP_SYS_INCLUDE_CPPFLAGS_5 += -include $(VX_DIR)/target/h/vxWorks.h
-OP_SYS_INCLUDE_CPPFLAGS_5 += -I$(EPICS_BASE)/include/os/vxWorks/vxWorks5
-OP_SYS_INCLUDE_CPPFLAGS_6 += -include $(VX_DIR)/target/h/vxWorks.h
-OP_SYS_INCLUDE_CPPFLAGS_7 += -include vxWorks.h
-OP_SYS_INCLUDE_CPPFLAGS = $(OP_SYS_INCLUDE_CPPFLAGS_$(VXWORKS_MAJOR_VERSION))
-
-OP_SYS_LDFLAGS += $(OP_SYS_LDFLAGS_$@)
-OP_SYS_LDFLAGS_softIoc = -whole-archive
-OP_SYS_LDFLAGS_softIocPVA = -whole-archive
-
-# code flags (delete -fno-implicit-templates)
-CODE_CXXFLAGS =
-
 # WIND_BASE is where you installed the Wind River software.
 
 #WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
@@ -89,14 +25,8 @@ CODE_CXXFLAGS =
 #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
 WIND_BASE = /opt/VxWorks/VxWorks$(VXWORKS_VERSION)
 
-#--------------------------------------------------
-# Modules we cannot build with old compiler
-
 # For the license counter
 export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
 
-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))
+softIoc_LDFLAGS += -whole-archive
+softIocPVA_LDFLAGS += -whole-archive

configure/os/CONFIG_SITE.RHEL7-x86_64.Common

@@ -1,5 +0,0 @@
-include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
-
-# Improved error checking with clang
-CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang
-CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64-clang

configure/os/CONFIG_SITE.RHEL8-x86_64.Common

@@ -2,6 +2,4 @@ include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
 
 # Improved error checking with clang
 CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64-clang
-
-# Build for old RHEL7 64 bit
-CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64
+CROSS_COMPILER_RUNTEST_ARCHS += RHEL8-x86_64-clang

configure/os/CONFIG_SITE.RHEL8-x86_64.windows-x64-mingw

@@ -0,0 +1 @@
+include  $(CONFIG)/os/CONFIG_SITE.linux-x86_64.windows-x64-mingw

configure/os/CONFIG_SITE.RHEL9-x86_64.Common

@@ -2,9 +2,8 @@ include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
 
 # Improved error checking with clang
 CROSS_COMPILER_TARGET_ARCHS += RHEL9-x86_64-clang
+CROSS_COMPILER_RUNTEST_ARCHS += RHEL9-x86_64-clang
 
 # Build for old RHEL8 64 bit
 CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64
-
-# Build for old RHEL7 64 bit
-CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64
+CROSS_COMPILER_RUNTEST_ARCHS += RHEL8-x86_64

configure/os/CONFIG_SITE.RHEL9-x86_64.windows-x64-mingw

@@ -0,0 +1 @@
+include  $(CONFIG)/os/CONFIG_SITE.linux-x86_64.windows-x64-mingw

configure/os/CONFIG_SITE.darwinCommon.darwinCommon

@@ -6,24 +6,17 @@
 # These settings are designed for users of Homebrew.
 # Users of other third-party package managers are welcome to
 # provide patches appropriate for their manager.
-ifneq (,$(wildcard /opt/homebrew))
-  # Default location on aarch64
-  HOMEBREW_DIR = /opt/homebrew
-else ifneq (,$(wildcard /usr/local/Homebrew))
-  # Default location on x86_64
-  HOMEBREW_DIR = /usr/local
-else ifneq (,$(wildcard /opt/local/include/readline))
-  # MacPorts
-  READLINE_DIR = /opt/local
-endif
+HOMEBREW_DIR := $(shell brew --prefix 2>/dev/null)
+INCLUDES += $(HOMEBREW_DIR:%=-I%/include)
+LDFLAGS += $(HOMEBREW_DIR:%=-L%/lib)
 
 # Look for Homebrew's readline
 ifneq (,$(wildcard $(HOMEBREW_DIR)/opt/readline))
-  READLINE_DIR = $(HOMEBREW_DIR)/opt/readline
+  INCLUDES_READLINE += -I$(HOMEBREW_DIR)/opt/readline/include
+  LDFLAGS_READLINE += -L$(HOMEBREW_DIR)/opt/readline/lib
 endif
 
-# Use GNU readline if it's avaiilable
-ifneq (,$(wildcard $(READLINE_DIR)/include/readline/readline.h))
-  INCLUDES_READLINE = -I$(READLINE_DIR)/include
-  LDFLAGS_READLINE = -L$(READLINE_DIR)/lib
-endif
+# Look for MacPorts
+MACPORT_DIR := $(patsubst %/bin/port,%,$(shell which port))
+INCLUDES += $(MACPORT_DIR:%=-I%/include)
+LDFLAGS += $(MACPORT_DIR:%=-L%/lib)

configure/os/CONFIG_SITE.linux-x86.Common

@@ -12,13 +12,7 @@ GNU_HOST_ARCH=i686
 GNU_HOST_OS=linux
 
 # vxWorks for MVxxxx boards
-#CROSS_COMPILER_TARGET_ARCHS += T2-ppc604
-#CROSS_COMPILER_TARGET_ARCHS += V67-ppc604
 CROSS_COMPILER_TARGET_ARCHS += V69-ppc604
-#CROSS_COMPILER_TARGET_ARCHS += V69-ppc32
-
-# NI compact RIO
-#CROSS_COMPILER_TARGET_ARCHS += V63-ppc603
 
 # MOXA montavista linux (No PVA because of missing boost support)
 CROSS_COMPILER_TARGET_ARCHS += mvl40-xscale_be
@@ -36,14 +30,6 @@ CROSS_COMPILER_TARGET_ARCHS += eldk52-e500v2
 CROSS_COMPILER_TARGET_ARCHS += eldk42-ppc4xxFP
 CROSS_COMPILER_TARGET_ARCHS += eldk53-ppc4xxFP
 
-# Test other vxWorks versions
-#CROSS_COMPILER_TARGET_ARCHS += V66-ppc603
-#CROSS_COMPILER_TARGET_ARCHS += V66-ppc604
-#CROSS_COMPILER_TARGET_ARCHS += V63-ppc604
-#CROSS_COMPILER_TARGET_ARCHS += V64-ppc604
-# (No PVA because of old compiler)
-#CROSS_COMPILER_TARGET_ARCHS += V62-ppc604
-
 # RTEMS (Can only have 1 RTEMS major version in 1 EPICS installation
 # because they overwrite their header files.)
 #CROSS_COMPILER_TARGET_ARCHS += RTEMS49-pc386

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

@@ -3,7 +3,7 @@
 # Site specific definitions for linux-x86 host - linux-x86 target builds
 #-------------------------------------------------------
 
-# Uncomment the followings lines to build with CLANG instead of GCC.
+# Uncomment the following lines to build with CLANG instead of GCC.
 #
 #GNU         = NO
 #CMPLR_CLASS = clang

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

@@ -14,7 +14,7 @@
 #GNU_DIR = /usr/local
 
 # Different distribution cross-build packages use different prefixes:
-# Ubuntu, RHEL7:
+# Ubuntu, RHEL:
 CMPLR_PREFIX = i686-w64-mingw32-
 # RHEL6:
 #CMPLR_PREFIX = i686-pc-mingw32-

configure/os/CONFIG_SITE.linux-x86_64.Common

@@ -13,12 +13,13 @@ GNU_HOST_ARCH_64=x86_64
 
 # Windows cross builds using Wine
 CROSS_COMPILER_TARGET_ARCHS += windows-x64
+CROSS_COMPILER_RUNTEST_ARCHS += windows-x64
 
-# IOxOS IFC1211
-#CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64
+# Windows cross builds using mingw
+CROSS_COMPILER_TARGET_ARCHS += windows-x64-mingw
+CROSS_COMPILER_RUNTEST_ARCHS += windows-x64-mingw
 
 # Zynq
-#CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64
 CROSS_COMPILER_TARGET_ARCHS += yocto40-aarch64
 
 # Debian

configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64

@@ -3,7 +3,7 @@
 # Site specific definitions for linux-x86_64 host - linux-x86_64 target builds
 #-------------------------------------------------------
 
-# Uncomment the followings lines to build with CLANG instead of GCC.
+# Uncomment the following lines to build with CLANG instead of GCC.
 #
 #GNU         = NO
 #CMPLR_CLASS = clang

configure/os/CONFIG_SITE.linux-x86_64.win32-x86-mingw

@@ -6,3 +6,9 @@
 # Inherit from the linux-x86 host architecture
 include $(CONFIG)/os/CONFIG_SITE.linux-x86.win32-x86-mingw
 
+MINGWLIBS ?= /usr/i686-w64-mingw32/sys-root/mingw/bin
+export WINE ?= wine
+export WINEPREFIX = $(HOME)/.wine32-$(EPICS_HOST_ARCH)
+export WINEDEBUG := err-all,warn-all,fixme-all$(WINEDEBUG:%=,%)
+export WINEDLLOVERRIDES := mscoree,mshtml=$(WINEDLLOVERRIDES:%=,%)
+export WINEPATH := $(WINEPATH:%=%;)$(MINGWLIBS);$(abspath $(INSTALL_BIN))

configure/os/CONFIG_SITE.linux-x86_64.windows-x64-mingw

@@ -6,3 +6,9 @@
 # Inherit from the linux-x86 host architecture
 include $(CONFIG)/os/CONFIG_SITE.linux-x86.windows-x64-mingw
 
+MINGWLIBS ?= /usr/x86_64-w64-mingw32/sys-root/mingw/bin
+export WINE ?= wine64
+export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)
+export WINEDEBUG := err-all,warn-all,fixme-all$(WINEDEBUG:%=,%)
+export WINEDLLOVERRIDES := mscoree,mshtml=$(WINEDLLOVERRIDES:%=,%)
+export WINEPATH := $(WINEPATH:%=%;)$(MINGWLIBS);$(abspath $(INSTALL_BIN))

configure/toolchain.c

@@ -30,9 +30,26 @@ MSVC_VER = _MSC_VER
 #ifdef __rtems__
 #include <rtems/score/cpuopts.h>
 #  if __RTEMS_MAJOR__>=5
-OS_API = posix
+     OS_API = posix
 #  else
-OS_API = score
+     OS_API = score
+#  endif
+#  if defined(RTEMS_NETWORKING)
+     /* legacy stack circa RTEMS <= 5 and networking internal to RTEMS */
+     RTEMS_LEGACY_NETWORKING_INTERNAL = yes
+#  else
+#    if !defined(__has_include)
+       /* assume old GCC implies RTEMS < 5 with mis-configured BSP */
+#      error rebuild BSP with --enable-network
+#    elif __has_include(<machine/rtems-net-legacy.h>)
+       /* legacy stack circa RTEMS > 5 */
+       RTEMS_LEGACY_NETWORKING = yes
+#    elif __has_include(<machine/rtems-bsd-version.h>)
+       /* libbsd stack */
+       RTEMS_BSD_NETWORKING = yes
+#    else
+#      error Cannot determine RTEMS network configuration
+#    endif
 #  endif
 #endif
 
@@ -47,8 +64,3 @@ COMMANDLINE_LIBRARY ?= EPICS
 #else
 COMMANDLINE_LIBRARY ?= $(strip $(if $(wildcard $(if $(GNU_DIR),$(GNU_DIR)/include/readline/readline.h)), READLINE, EPICS))
 #endif
-
-#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE>2
-OP_SYS_CPPFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-#endif
-

documentation/.gitignore

@@ -1,3 +0,0 @@
-*.db
-epics-base.tag
-html/

documentation/Doxyfile@

@@ -759,10 +759,10 @@ WARN_LOGFILE           =
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = ../mainpage.dox \
-                         ../RELEASE_NOTES.md \
+INPUT                  = ../RELEASE_NOTES.md \
                          ../README.md \
-                         @TOP@/include
+                         @TOP@/include \
+                         @TOP@/doc
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1105,7 +1105,7 @@ HTML_STYLESHEET        =
 # cascading style sheets that are included after the standard style sheets
 # created by doxygen. Using this option one can overrule certain style aspects.
 # This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefor more robust against future updates.
+# standard style sheet and is therefore more robust against future updates.
 # Doxygen will copy the style sheet files to the output directory.
 # Note: The order of the extra stylesheet files is of importance (e.g. the last
 # stylesheet in the list overrules the setting of the previous ones in the
@@ -1648,8 +1648,8 @@ EXTRA_PACKAGES         =
 # Note: Only use a user-defined header if you know what you are doing! The
 # following commands have a special meaning inside the header: $title,
 # $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string,
-# for the replacement values of the other commands the user is refered to
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty string,
+# for the replacement values of the other commands the user is referred to
 # HTML_HEADER.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1833,7 +1833,7 @@ MAN_LINKS              = NO
 # captures the structure of the code including all documentation.
 # The default value is: NO.
 
-GENERATE_XML           = NO
+GENERATE_XML           = YES
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -1841,7 +1841,7 @@ GENERATE_XML           = NO
 # The default directory is: xml.
 # This tag requires that the tag GENERATE_XML is set to YES.
 
-XML_OUTPUT             = xml
+XML_OUTPUT             = @RTD_SRC@/xml
 
 # If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
 # listings (including syntax highlighting and cross-referencing information) to
@@ -1946,7 +1946,7 @@ ENABLE_PREPROCESSING   = YES
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
 # the macro expansion is limited to the macros specified with the PREDEFINED and
@@ -1986,7 +1986,20 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = __cplusplus
+PREDEFINED             = __cplusplus \
+                         LIBCOM_API \
+                         DBCORE_API \
+                         LIBCA_API \
+                         DBRECSTD_API \
+                         EPICS_ALWAYS_INLINE \
+                         EPICS_NORETURN \
+                         EPICS_PRINTF_FMT(x)=x \
+                         EPICS_PRINTF_STYLE(a,b)= \
+                         epicsShareExtern \
+                         epicsShareClass \
+                         epicsShareFunc \
+                         epicsShareAPI \
+                         epicsStdCall
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

documentation/HEADER_h.md

@@ -0,0 +1,4 @@
+# @HEADER@.h
+
+```{doxygenfile} @HEADER@.h
+```