fix for buggy int8_t in vxWorks 6.9

2021-12-14 16:25:39 +01:00
1002 changed files with 16389 additions and 36136 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -25,6 +25,17 @@ init:
 # Set clone depth (do not fetch complete history)
 clone_depth: 5

+# Skipping commits affecting only specific files
+skip_commits:
+  files:
+    - 'documentation/*'
+    - 'startup/*'
+    - '.github/*'
+    - '.tools/*'
+    - '.gitattributes'
+    - '**/*.html'
+    - '**/*.md'
+
 #---------------------------------#
 #   build matrix configuration    #
 #---------------------------------#
@@ -52,10 +63,10 @@ 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
-    COMMANDLINE_LIBRARY: EPICS

 # Platform: processor architecture
 platform:
@@ -65,6 +76,11 @@ 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
@@ -82,9 +98,8 @@ matrix:
 #---------------------------------#

 install:
-  - cmd: set PATH=C:\Python38-x64;%PATH%
  - cmd: git submodule update --init --recursive
-  - cmd: python -m pip install git+https://github.com/mdavidsaver/ci-core-dumper#egg=ci-core-dumper
+  - cmd: pip install git+https://github.com/mdavidsaver/ci-core-dumper#egg=ci-core-dumper
  - cmd: python .ci/cue.py prepare

 build_script:
@@ -122,4 +137,10 @@ on_failure:
 #---------------------------------#

 notifications:
+
+  - provider: Email
+    to:
+      - core-talk@aps.anl.gov
+    on_build_success: false
+
  - provider: GitHubPullRequest
--- a/.appveyor/epics-base-7.yml
+++ b/.appveyor/epics-base-7.yml
@@ -32,6 +32,17 @@ init:
 # Set clone depth (do not fetch complete history)
 clone_depth: 5

+# Skipping commits affecting only specific files
+skip_commits:
+  files:
+    - 'documentation/*'
+    - 'startup/*'
+    - '.github/*'
+    - '.tools/*'
+    - '.gitattributes'
+    - '**/*.html'
+    - '**/*.md'
+
 #---------------------------------#
 #   build matrix configuration    #
 #---------------------------------#
@@ -59,10 +70,9 @@ 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
-    COMMANDLINE_LIBRARY: EPICS

 # Platform: processor architecture
 platform:
@@ -72,6 +82,11 @@ 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,9 +104,8 @@ matrix:
 #---------------------------------#

 install:
-  - cmd: set PATH=C:\Python38-x64;%PATH%
  - cmd: git submodule update --init --recursive
-  - cmd: python -m pip install git+https://github.com/mdavidsaver/ci-core-dumper#egg=ci-core-dumper
+  - cmd: pip install git+https://github.com/mdavidsaver/ci-core-dumper#egg=ci-core-dumper
  - cmd: python .ci/cue.py prepare

 build_script:
@@ -129,4 +143,10 @@ on_failure:
 #---------------------------------#

 notifications:
+
+  - provider: Email
+    to:
+      - core-talk@aps.anl.gov
+    on_build_success: false
+
  - provider: GitHubPullRequest
--- a/.ci
+++ b/.ci
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,12 +0,0 @@
-# Documentation for this file: https://EditorConfig.org
-
-root = true
-
-# Unix-style newlines ending every file,
-# as some compilers complain about files not ending in newline
-[*]
-insert_final_newline = true
-
-# Part of readline test that needs file without final newline
-[modules/libcom/test/multiline-input.txt]
-insert_final_newline = false
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,11 +1,9 @@
-.appveyor.yml       export-ignore
-.appveyor/          export-ignore
-.ci/                export-ignore
-.github/            export-ignore
-.gitmodules         export-ignore
-.readthedocs.yml    export-ignore
-.tools/             export-ignore
-README              export-subst
+.ci/          export-ignore
+.tools/       export-ignore
+.github/      export-ignore
+.appveyor/    export-ignore
+.appveyor.yml export-ignore
+README        export-subst

 #Which files need CRLF handling
 # default to automatic
--- a/.github/codeql/config.yml
+++ b/.github/codeql/config.yml
@@ -1,22 +0,0 @@
-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
--- a/.github/workflows/check-editorconfig.yml
+++ b/.github/workflows/check-editorconfig.yml
@@ -1,13 +0,0 @@
-name: Check EditorConfig
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  editorconfig:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: EditorConfig-Action
-        uses: greut/eclint-action@v0
--- a/.github/workflows/ci-scripts-build.yml
+++ b/.github/workflows/ci-scripts-build.yml
@@ -27,7 +27,6 @@ on:
      - '.gitattributes'
      - '**/*.html'
      - '**/*.md'
-  workflow_dispatch:

 env:
    SETUP_PATH: .ci-local:.ci
@@ -35,14 +34,16 @@ env:
    EPICS_TEST_IMPRECISE_TIMING: YES

 jobs:
-  native:
+  build-base:
    name: ${{ matrix.name }}
    runs-on: ${{ matrix.os }}
    # Set environment variables from matrix parameters
    env:
      CMP: ${{ matrix.cmp }}
      BCFG: ${{ matrix.configuration }}
-      CI_CROSS_TARGETS: ${{ matrix.cross }}
+      WINE: ${{ matrix.wine }}
+      RTEMS: ${{ matrix.rtems }}
+      RTEMS_TARGET: ${{ matrix.rtems_target }}
      EXTRA: ${{ matrix.extra }}
      TEST: ${{ matrix.test }}
    strategy:
@@ -50,167 +51,156 @@ jobs:
      matrix:
        # Job names also name artifacts, character limitations apply
        include:
-          - name: "Ub-24 gcc c++20 Werror"
-            os: ubuntu-24.04
+          - os: ubuntu-20.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.
-            extra: "CMD_CXXFLAGS=-std=c++20
-                    CMD_CPPFLAGS='-fdiagnostics-color
-                                  -fstack-protector-strong
-                                  -Wformat
-                                  -Werror
-                                  -Werror=format-security
-                                  -Wno-error=deprecated-declarations
-                                  -Wno-error=stringop-truncation
-                                  -Wno-error=restrict
-                                  -Wno-error=sizeof-pointer-memaccess
-                                  -Wno-error=nonnull
-                                  -Wno-error=dangling-pointer
-                                  -Wno-error=format-overflow
-                                  -Wno-error=stringop-overread
-                                  -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3'
-                    CMD_LDFLAGS=-Wl,-z,relro"
+            configuration: default
+            wine: "64"
+            name: "Ub-20 gcc-9 + MinGW"

-          - name: "Ub-22 gcc C++11, static"
-            os: ubuntu-22.04
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: static
+            wine: "64"
+            name: "Ub-20 gcc-9 + MinGW, static"
+
+          - os: ubuntu-20.04
            cmp: gcc
            configuration: static
            extra: "CMD_CXXFLAGS=-std=c++11"
+            name: "Ub-20 gcc-9 C++11, static"

-          - name: "Ub-22 gcc u-char"
-            os: ubuntu-22.04
-            cmp: gcc
-            configuration: static
-            extra: "CMD_CFLAGS=-funsigned-char CMD_CXXFLAGS=-funsigned-char"
-
-          - name: "Ub-22 clang"
-            os: ubuntu-22.04
+          - os: ubuntu-16.04
            cmp: clang
            configuration: default
+            name: "Ub-16 clang-9"

-          - name: "Ub-22 clang C++11"
-            os: ubuntu-22.04
+          - os: ubuntu-20.04
            cmp: clang
            configuration: default
            extra: "CMD_CXXFLAGS=-std=c++11"
+            name: "Ub-20 clang-10 C++11"

-          - name: "MacOS clang"
-            os: macos-latest
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            rtems: "5"
+            rtems_target: RTEMS-pc686-qemu
+            test: NO
+            name: "Ub-20 gcc-9 + RT-5.1 pc686"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            rtems: "5"
+            rtems_target: RTEMS-beatnik
+            test: NO
+            name: "Ub-20 gcc-9 + RT-5.1 beatnik"
+
+          # Only build one RTEMS target per CPU family
+          # unless it's running the tests
+          #
+          # - os: ubuntu-20.04
+          #   cmp: gcc
+          #   configuration: default
+          #   rtems: "5"
+          #   rtems_target: RTEMS-mvme3100
+          #   test: NO
+          #   name: "Ub-20 gcc-9 + RT-5.1 mvme3100"
+          #
+          # - os: ubuntu-20.04
+          #   cmp: gcc
+          #   configuration: default
+          #   rtems: "5"
+          #   rtems_target: RTEMS-qoriq_e500
+          #   test: NO
+          #   name: "Ub-20 gcc-9 + RT-5.1 qoriq_e500"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            rtems: "5"
+            rtems_target: RTEMS-xilinx_zynq_a9_qemu
+            test: NO
+            name: "Ub-20 gcc-9 + RT-5.1 xilinx_zynq_a9_qemu"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            rtems: "5"
+            rtems_target: RTEMS-uC5282
+            test: NO
+            name: "Ub-20 gcc-9 + RT-5.1 uC5282"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            rtems: "4.10"
+            name: "Ub-20 gcc-9 + RT-4.10"
+            rtems_target: RTEMS-pc386-qemu
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            rtems: "4.9"
+            name: "Ub-20 gcc-9 + RT-4.9"
+            rtems_target: RTEMS-pc386-qemu
+
+          - os: ubuntu-16.04
+            cmp: gcc-4.8
+            utoolchain: "4.8"
+            configuration: default
+            name: "Ub-16 gcc-4.8"
+
+          - os: ubuntu-16.04
+            cmp: gcc-4.9
+            utoolchain: "4.9"
+            configuration: default
+            name: "Ub-16 gcc-4.9"
+
+          - os: ubuntu-20.04
+            cmp: gcc-8
+            utoolchain: "8"
+            configuration: default
+            name: "Ub-20 gcc-8"
+
+          - os: ubuntu-20.04
+            cmp: gcc-9
+            utoolchain: "9"
+            configuration: default
+            name: "Ub-20 gcc-9"
+
+          - os: ubuntu-20.04
            cmp: clang
            configuration: default
+            name: "Ub-20 clang-10"

-          # Cross builds
-
-          - name: "Ub gcc + linux-aarch64"
-            os: ubuntu-latest
-            cmp: gcc
+          - os: macos-latest
+            cmp: clang
            configuration: default
-            cross: "linux-aarch64"
+            name: "MacOS clang-12"

-          - name: "Ub gcc + linux-arm gnueabi"
-            os: ubuntu-latest
-            cmp: gcc
+          - os: windows-2019
+            cmp: vs2019
            configuration: default
-            cross: "linux-arm@arm-linux-gnueabi"
+            name: "Win2019 MSC-19"

-          - 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
+          - os: windows-2019
+            cmp: vs2019
            configuration: static
-            cross: "windows-x64-mingw"
+            name: "Win2019 MSC-19, static"

-          - 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-22 gcc + RT-5.1 beatnik"
-            os: ubuntu-22.04
-            cmp: gcc
-            configuration: default
-            cross: "RTEMS-beatnik@5"
-            test: NO
-
-          - 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-22 gcc + RT-5.1 uC5282"
-            os: ubuntu-22.04
-            cmp: gcc
-            configuration: default
-            cross: "RTEMS-uC5282@5"
-            test: NO
-
-          # Windows builds
-
-          - name: "Win-22 MSC-22"
-            os: windows-2022
-            cmp: vs2022
+          - os: windows-2019
+            cmp: vs2019
            configuration: debug
-            extra: "CMD_CXXFLAGS=-analyze"
+            name: "Win2019 MSC-19, debug"

-          - name: "Win-22 MSC-22, static"
-            os: windows-2022
-            cmp: vs2022
-            configuration: static-debug
-            extra: "CMD_CXXFLAGS=-analyze"
-
-          - name: "Win-22 MSC-22, debug"
-            os: windows-2022
-            cmp: vs2022
-            configuration: debug
-
-          - 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
+          - os: windows-2019
            cmp: gcc
            configuration: default
+            name: "Win2019 mingw"

    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
      with:
        submodules: true
    - name: Automatic core dumper analysis
@@ -220,15 +210,23 @@ jobs:
        sudo apt-get update
        sudo apt-get -y install qemu-system-x86 g++-mingw-w64-x86-64 gdb
      if: runner.os == 'Linux'
+    - name: "apt-get install ${{ matrix.cmp }}"
+      run: |
+        sudo apt-get update
+        sudo apt-get -y install software-properties-common
+        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+        sudo apt-get update
+        sudo apt-get -y install g++-${{ matrix.utoolchain }}
+      if: matrix.utoolchain
    - name: Prepare and compile dependencies
      run: python .ci/cue.py prepare
    - name: Build main module
      run: python .ci/cue.py build
    - name: Run main module tests
-      run: python .ci/cue.py -T 60M test
+      run: python .ci/cue.py -T 20M test
    - name: Upload tapfiles Artifact
      if: ${{ always() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
      with:
        name: tapfiles ${{ matrix.name }}
        path: '**/O.*/*.tap'
@@ -236,125 +234,3 @@ jobs:
    - name: Collect and show test results
      if: ${{ always() }}
      run: python .ci/cue.py -T 5M test-results
-
-  docker:
-    name: ${{ matrix.name }}
-    runs-on: ubuntu-latest
-    container:
-      image: ${{ matrix.image }}
-    # Set environment variables from matrix parameters
-    env:
-      CMP: ${{ matrix.cmp }}
-      BCFG: ${{ matrix.configuration }}
-      EXTRA: ${{ matrix.extra }}
-      TEST: ${{ matrix.test }}
-    strategy:
-      fail-fast: false
-      matrix:
-        # Job names also name artifacts, character limitations apply
-        include:
-          - 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
-            cmp: gcc
-            configuration: default
-
-          - name: "Fedora-latest"
-            image: fedora:latest
-            cmp: gcc
-            configuration: default
-
-    steps:
-    - name: "Fix repo URLs on CentOS-8"
-      # centos:8 is frozen, repos are in the vault
-      if: matrix.image=='centos:8'
-      run: |
-        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: |
-        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
-    - name: Prepare and compile dependencies
-      run: python3 .ci/cue.py prepare
-    - name: Build main module
-      run: python3 .ci/cue.py build
-    - name: Run main module tests
-      run: python3 .ci/cue.py -T 20M test
-    - name: Upload tapfiles Artifact
-      if: ${{ always() }}
-      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: 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
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -1,64 +0,0 @@
-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 }}"
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,8 @@
-# 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/
@@ -13,14 +10,9 @@
 /modules/RELEASE.*.local
 /modules/Makefile.local
 O.*/
+/QtC-*
+/.vscode/
+*.orig
 *.log
-.iocsh_history
-
-# Common files generated by other tools
+.*.swp
 .DS_Store
-
-# Files created by rpmbuild
-RPMS
-SRPMS
-BUILDROOT
-*.rpm
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,31 +1,31 @@
 [submodule "modules/pvData"]
    path = modules/pvData
-    url = https://gitea.psi.ch/epics/pvData
+    url = https://github.com/epics-base/pvDataCPP
    branch = master
 [submodule "modules/pvAccess"]
    path = modules/pvAccess
-    url = https://gitea.psi.ch/epics/pvAccess
+    url = https://github.com/epics-base/pvAccessCPP
    branch = master
 [submodule "modules/normativeTypes"]
    path = modules/normativeTypes
-    url = https://gitea.psi.ch/epics/normativeTypes
+    url = https://github.com/epics-base/normativeTypesCPP
    branch = master
 [submodule "modules/pvaClient"]
    path = modules/pvaClient
-    url = https://gitea.psi.ch/epics/pvaClient
+    url = https://github.com/epics-base/pvaClientCPP
    branch = master
 [submodule "modules/pvDatabase"]
    path = modules/pvDatabase
-    url = https://gitea.psi.ch/epics/pvDatabase
+    url = https://github.com/epics-base/pvDatabaseCPP
    branch = master
 [submodule "modules/pva2pva"]
    path = modules/pva2pva
-    url = https://gitea.psi.ch/epics/pva2pva
+    url = https://github.com/epics-base/pva2pva
    branch = master
 [submodule ".ci"]
    path = .ci
-    url = https://gitea.psi.ch/epics/ci-scripts
+    url = https://github.com/epics-base/ci-scripts
    branch = master
 [submodule "modules/pcas"]
    path = modules/pcas
-    url = https://gitea.psi.ch/epics/pcas
+    url = https://github.com/epics-modules/pcas
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -1,36 +0,0 @@
-# .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
--- a/.tools/make-tar.sh
+++ b/.tools/make-tar.sh
@@ -20,9 +20,9 @@ maybedie() {

 usage() {
   cat <<EOF >&2
-usage: $0 [-v] [-d] <rev> [<outfile> [<prefix>]]
+usage: $0 [-v] [-s] <rev> [<outfile> [<prefix>]]

-  <rev> may be any git revision spec. (tag or, using -d, branch or commit id).
+  <rev> may be any git revision spec. (tag, branch, or commit id).

  If provided, <outfile> must end with ".tar", ".tar.gz" or ".tar.bz2".
  If <outfile> is omitted, "base-<rev>.tar.gz" will be used.
@@ -136,20 +136,17 @@ sed -i -e 's|^\./||' "$TDIR"/list.1

 # Exclude files
 sed \
-  -e '/\/\.appveyor\.yml$/d' \
-  -e '/\/\.appveyor\//d' \
-  -e '/\/\.ci-local\//d' \
  -e '/\/\.ci\//d' \
-  -e '/\/\.cproject$/d' \
-  -e '/\/\.github\//d' \
-  -e '/\/\.gitmodules$/d' \
-  -e '/\/\.hgtags$/d' \
-  -e '/\/\.lgtm\.yml$/d' \
-  -e '/\/\.project$/d' \
-  -e '/\/\.readthedocs\.yml$/d' \
+  -e '/\/\.ci-local\//d' \
  -e '/\/\.tools\//d' \
-  -e '/\/\.travis\.yml$/d' \
  -e '/\/jenkins\//d' \
+  -e '/\/\.git/d' \
+  -e '/\/\.hgtags$/d' \
+  -e '/\/\.cproject$/d' \
+  -e '/\/\.project$/d' \
+  -e '/\/\.travis\.yml$/d' \
+  -e '/\/\.appveyor\.yml$/d' \
+  -e '/\/\.readthedocs\.yml$/d' \
  "$TDIR"/list.1 > "$TDIR"/list.2

 if ! diff -U 0 "$TDIR"/list.1 "$TDIR"/list.2
--- a/3
+++ b/3
@@ -30,6 +30,3 @@ copysrc:

 tar:
 	tar cfjP epics_base-$(EPICS_VERSION_NUMBER).tar.bz2 $(INSTALL_LOCATION)
-
-rpm:
-	rpmbuild -bb epics-base.spec
--- a/10
+++ b/10
@@ -13,7 +13,15 @@ this distribution.

 ---------------------------------------------------------

-For more information, see the README.md file.
+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/

 $Format:%cD$
 $Format:%H$
+https://code.launchpad.net/epics-base
--- a/README.md
+++ b/README.md
@@ -1,64 +0,0 @@
-
-# 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.
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -34,11 +34,6 @@ ifeq ($(origin EPICS_HOST_ARCH), undefined)
  EHA :=
 endif

-# Make Perl hash iteration reproducible.
-# See: https://reproducible-builds.org/docs/stable-outputs/
-#
-export PERL_HASH_SEED = 0
-
 -include $(CONFIG)/RELEASE
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH)
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH).Common
--- a/configure/CONFIG.gnuCommon
+++ b/configure/CONFIG.gnuCommon
@@ -27,17 +27,13 @@ RANLIB = $(GNU_BIN)/$(CMPLR_PREFIX)ranlib$(CMPLR_SUFFIX)
 ASAN_FLAGS_YES = -fsanitize=address
 ASAN_LDFLAGS_YES = $(ASAN_FLAGS_YES)

-# It makes sense to include debugging symbols even in optimized builds
-# in case you want to attach gdb to the process or examine a core-dump.
-# This does cost disk space, but not memory as debug symbols are not
-# loaded into RAM when the binary is loaded.
 PROF_CFLAGS_YES = -p
 GPROF_CFLAGS_YES = -pg
 CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
 CODE_CFLAGS += $(ASAN_FLAGS_$(ENABLE_ASAN))
 WARN_CFLAGS_YES = -Wall -Werror-implicit-function-declaration
 WARN_CFLAGS_NO = -w
-OPT_CFLAGS_YES = -O3 -g
+OPT_CFLAGS_YES = -O3
 OPT_CFLAGS_NO = -g

 PROF_CXXFLAGS_YES = -p
@@ -46,12 +42,11 @@ CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
 CODE_CXXFLAGS += $(ASAN_FLAGS_$(ENABLE_ASAN))
 WARN_CXXFLAGS_YES = -Wall
 WARN_CXXFLAGS_NO = -w
-OPT_CXXFLAGS_YES = -O3 -g
+OPT_CXXFLAGS_YES = -O3
 OPT_CXXFLAGS_NO = -g

 CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
 CODE_LDFLAGS += $(ASAN_LDFLAGS_$(ENABLE_ASAN))
-OPT_LDFLAGS_NO = -g

 PIPE_CFLAGS_YES_YES = -pipe
 PIPE_CFLAGS = $(PIPE_CFLAGS_$(GCC_PIPE)_$(GNU))
@@ -65,7 +60,7 @@ LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC -Wl,-h$@

 GNU_LDLIBS_YES = -lgcc

-# Use compiler flags to generate header dependencies files
+# Use compiler flags to generate header dependancies files
 HDEPENDS_METHOD = COMP
 HDEPENDS_COMPFLAGS = -MM -MF $@

--- a/configure/CONFIG.msvcCommon
+++ b/configure/CONFIG.msvcCommon
@@ -1,280 +0,0 @@
-# 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))
--- a/configure/CONFIG_ADDONS
+++ b/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 preprocessor flags
+#    USR_CPPFLAGS  c preprocesser 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
--- a/configure/CONFIG_BASE
+++ b/configure/CONFIG_BASE
@@ -38,20 +38,11 @@ TOOLS = $(abspath $(EPICS_BASE_HOST_BIN))
 FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) \
    $(TOP)/src/tools/$(1)) $(EPICS_BASE)/src/tools/$(1))

-#---------------------------------------------------------------
-# Find Perl modules for dependencies
-FIND_PM = $(wildcard $(EPICS_BASE)/lib/perl/$(1))
-
 #---------------------------------------------------------------
 # EPICS Base build tools and tool flags

-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)
+PODTOHTML        = $(PERL) $(TOOLS)/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)

@@ -68,24 +59,6 @@ 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)
--- a/configure/CONFIG_BASE_VERSION
+++ b/configure/CONFIG_BASE_VERSION
@@ -48,15 +48,15 @@ EPICS_VERSION = 7
 EPICS_REVISION = 0

 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 10
+EPICS_MODIFICATION = 6

 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included in the official EPICS version number if zero
-EPICS_PATCH_LEVEL = 1
+EPICS_PATCH_LEVEL = 0

 # Immediately after an official release the EPICS_PATCH_LEVEL is incremented
 # and the -DEV suffix is added (similar to the Maven -SNAPSHOT versions)
-EPICS_DEV_SNAPSHOT=-DEV
+EPICS_DEV_SNAPSHOT=

 # No changes should be needed below here

@@ -71,3 +71,6 @@ 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-"
--- a/configure/CONFIG_CA_VERSION
+++ b/configure/CONFIG_CA_VERSION
@@ -1,12 +1,12 @@
 # Version number for the Channel Access API and shared library

 EPICS_CA_MAJOR_VERSION = 4
-EPICS_CA_MINOR_VERSION = 15
-EPICS_CA_MAINTENANCE_VERSION = 1
+EPICS_CA_MINOR_VERSION = 14
+EPICS_CA_MAINTENANCE_VERSION = 0

 # Development flag, set to zero for release versions

-EPICS_CA_DEVELOPMENT_FLAG = 1
+EPICS_CA_DEVELOPMENT_FLAG = 0

 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -56,7 +56,6 @@ GNU_DIR = /usr
 # Directories

 INSTALL_LOCATION            = $(TOP)
-INSTALL_ABSOLUTE            = $(abspath $(INSTALL_LOCATION))

 INSTALL_LOCATION_LIB        = $(INSTALL_LOCATION)/lib
 INSTALL_LOCATION_BIN        = $(INSTALL_LOCATION)/bin
@@ -72,14 +71,23 @@ INSTALL_DBD                 = $(INSTALL_LOCATION)/dbd
 INSTALL_DB                  = $(INSTALL_LOCATION)/db
 INSTALL_CONFIG              = $(INSTALL_LOCATION)/configure

+FINAL_LOCATION = $(shell $(PERL) $(TOOLS)/fullPathName.pl $(INSTALL_LOCATION))
+
+# Directory for OS independant build created files
+COMMON_DIR = ../O.Common
+
+# IOC's absolute path to $(TOP), may be overridden inside the application
+IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
+
 #-------------------------------------------------------
-# These are default settings that may be overridden later
+# Silencing the build - suppress messages during 'make -s'
+NOP = :
+ECHO = @$(if $(filter -s,$(MFLAGS)),$(NOP),echo)
+QUIET_FLAG := $(if $(filter -s,$(MFLAGS)),-q,)

-# Eventual install path (to be compiled into binaries)
-FINAL_LOCATION              = $(INSTALL_ABSOLUTE)
-
-# IOC's view of install path
-IOCS_APPL_TOP               = $(INSTALL_ABSOLUTE)
+#-------------------------------------------------------
+# Convert 'make -q' flag into '-i' for genVersionHeader.pl
+QUESTION_FLAG := $(if $(filter -q,$(MFLAGS)),-i,)

 #-------------------------------------------------------
 ifdef T_A
@@ -125,8 +133,6 @@ LIB_SUFFIX =
 SHRLIB_PREFIX = $(LIB_PREFIX)
 DLLSTUB_PREFIX = $(LIB_PREFIX)
 DLLSTUB_SUFFIX = $(LIB_SUFFIX)
-LOADABLE_SHRLIB_PREFIX = $(SHRLIB_PREFIX)
-LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX)

 BUILDLIB_PREFIX_YES = $(DLLSTUB_PREFIX)
 BUILDLIB_PREFIX_NO  = $(LIB_PREFIX)
@@ -147,14 +153,12 @@ CMPLR_SRC_DIRS += . $(foreach dir, .. $(SRC_DIRS), \
 ALL_SRC_DIRS = $(CMPLR_SRC_DIRS) $(OS_SRC_DIRS) $(GENERIC_SRC_DIRS)

 #--------------------------------------------------
-# Directory for OS independent build created files
-COMMON_DIR = ../O.Common
-
 # compile line include directories
-INSTALL_INCLUDE_DIRS = $(INSTALL_INCLUDE)/compiler/$(CMPLR_CLASS) \
-        $(INSTALL_INCLUDE)/os/$(OS_CLASS) $(INSTALL_INCLUDE)
-INSTALL_INCLUDES += $(addprefix -I, $(INSTALL_INCLUDE_DIRS))
-SRC_INCLUDES = $(addprefix -I, $(COMMON_DIR) $(wildcard $(ALL_SRC_DIRS)))
+INSTALL_INCLUDES += \
+       -I$(INSTALL_INCLUDE)/compiler/$(CMPLR_CLASS) \
+       -I$(INSTALL_INCLUDE)/os/$(OS_CLASS) \
+       -I$(INSTALL_INCLUDE)
+SRC_INCLUDES = -I$(COMMON_DIR) $(addprefix -I, $(wildcard $(ALL_SRC_DIRS)))

 #--------------------------------------------------
 # Target filename definitions
@@ -168,27 +172,23 @@ TESTSHRLIBNAME = $(TESTSHRLIBNAME_$(SHARED_LIBRARIES))
 #--------------------------------------------------
 # obj files

-TARGET_OBJS = $($*_LDOBJS) $(addsuffix $(OBJ), \
-    $(basename $($*_OBJS) $($*_SRCS)))
+TARGET_OBJS =  $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS) $($*_SRCS)))

-PRODUCT_OBJS = $(addsuffix $(OBJ), \
-    $(basename $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(USR_OBJS) $(PROD_OBJS)))
+PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(USR_OBJS) $(PROD_OBJS)))
 PROD_LD_OBJS = $(TARGET_OBJS) $(PRODUCT_OBJS)

-LIBRARY_OBJS = $(addsuffix $(OBJ), \
-    $(basename $(SRCS) $(USR_SRCS) $(LIB_SRCS) $(LIBSRCS) $(USR_OBJS) $(LIB_OBJS)))
+LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(LIB_SRCS) $(LIBSRCS) $(USR_OBJS) $(LIB_OBJS)))
 LIBRARY_LD_OBJS = $(TARGET_OBJS) $(LIBRARY_OBJS)

 #--------------------------------------------------
 # Windows resource files

-TARGET_RESS = $(if $(RES), $(addsuffix $(RES), $(basename $($*_RCS))))
+TARGET_RESS = $(if $(RES),$(addsuffix $(RES),$(basename $($*_RCS))),)

-PROD_RESS = $(if $(RES), $(addsuffix $(RES), $(basename $(RCS) $(PROD_RCS))))
+PROD_RESS = $(if $(RES),$(addsuffix $(RES),$(basename $(RCS) $(PROD_RCS))),)
 PROD_LD_RESS = $(TARGET_RESS) $(PROD_RESS)

-LIBRARY_RESS = $(if $(RES), $(addsuffix $(RES), \
-    $(basename $(RCS) $(LIB_RCS) $(LIBRARY_RCS))))
+LIBRARY_RESS = $(if $(RES),$(addsuffix $(RES),$(basename $(RCS) $(LIB_RCS) $(LIBRARY_RCS))),)
 LIBRARY_LD_RESS = $(TARGET_RESS) $(LIBRARY_RESS)

 #--------------------------------------------------
@@ -257,7 +257,6 @@ WARN_CXXFLAGS = $(WARN_CXXFLAGS_$($(BUILD_CLASS)_WARN))
 OPT_CPPFLAGS = $(OPT_CPPFLAGS_$($(BUILD_CLASS)_OPT))
 OPT_CFLAGS = $(OPT_CFLAGS_$($(BUILD_CLASS)_OPT))
 OPT_CXXFLAGS = $(OPT_CXXFLAGS_$($(BUILD_CLASS)_OPT))
-OPT_LDFLAGS = $(OPT_LDFLAGS_$($(BUILD_CLASS)_OPT))

 # Static build flags
 STATIC_CFLAGS = $(STATIC_CFLAGS_$(STATIC_BUILD))
@@ -266,19 +265,19 @@ STATIC_LDFLAGS = $(STATIC_LDFLAGS_$(STATIC_BUILD))
 STATIC_LDLIBS = $(STATIC_LDLIBS_$(STATIC_BUILD))

 #--------------------------------------------------
-# cflags for shared library src files
-LIBRARY_SRCS = $(basename $(foreach lib, \
-    $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY), \
-    $($(lib)_OBJSNAME) $(LIBRARY_OBJS)))
-LIBRARY_SRC_CFLAGS = $(if $(findstring $*, $(LIBRARY_SRCS)), $(SHRLIB_CFLAGS))
+# cflags for shared library src files (from SHRLIB_CFLAGS)
+LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY),$($(lib)_OBJSNAME) $(LIBRARY_OBJS)))
+LIBRARY_SRC_CFLAGS=$($(patsubst $*,SHRLIB,$(findstring $*,$(LIBRARY_SRCS)))_CFLAGS)

 #--------------------------------------------------
-# ldflags for loadable and shared libraries
-TARGET_LIB_LDFLAGS = $(if $(findstring $*, $(LOADABLE_LIBRARY)), \
-    $(LOADABLE_SHRLIB_LDFLAGS), $(SHRLIB_LDFLAGS))
+# prefix, suffix, and ldflags for loadable shared libraries
+TARGET_LIB_LDFLAGS=$($(patsubst $*,LOADABLE_,$(findstring $*,$(LOADABLE_LIBRARY)))SHRLIB_LDFLAGS)
+LOADABLE_SHRLIB_PREFIX=$(SHRLIB_PREFIX)
+LOADABLE_SHRLIB_SUFFIX=$(SHRLIB_SUFFIX)

 #--------------------------------------------------
 # Command-line input support default
+COMMANDLINE_LIBRARY = EPICS
 OP_SYS_LDLIBS += $(LDLIBS_$(COMMANDLINE_LIBRARY))
 OP_SYS_LDFLAGS += $(LDFLAGS_$(COMMANDLINE_LIBRARY))
 RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
@@ -286,31 +285,31 @@ RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
 #--------------------------------------------------
 # Flags

-INCLUDES = -I. $(SRC_INCLUDES) $(INSTALL_INCLUDES) $(RELEASE_INCLUDES) \
-    $(TARGET_INCLUDES) $(USR_INCLUDES) $(CMD_INCLUDES) $(OP_SYS_INCLUDES) \
-    $($(BUILD_CLASS)_INCLUDES)
+INCLUDES = -I. $(SRC_INCLUDES) $(INSTALL_INCLUDES) $(RELEASE_INCLUDES)\
+ $(TARGET_INCLUDES) $(USR_INCLUDES) $(CMD_INCLUDES) $(OP_SYS_INCLUDES)\
+ $($(BUILD_CLASS)_INCLUDES)

-CFLAGS = $($(BUILD_CLASS)_CFLAGS) $(POSIX_CFLAGS) $(OPT_CFLAGS) \
-    $(DEBUG_CFLAGS) $(PIPE_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS) \
-    $(USR_CFLAGS) $(CMD_CFLAGS) $(ARCH_DEP_CFLAGS) $(CODE_CFLAGS) \
-    $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
+CFLAGS = $($(BUILD_CLASS)_CFLAGS) $(POSIX_CFLAGS) $(OPT_CFLAGS)\
+ $(DEBUG_CFLAGS) $(PIPE_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS)\
+ $(USR_CFLAGS) $(CMD_CFLAGS) $(ARCH_DEP_CFLAGS) $(CODE_CFLAGS)\
+ $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)

-CXXFLAGS = $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS) \
-    $(DEBUG_CXXFLAGS) $(PIPE_CFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) \
-    $(USR_CXXFLAGS) $(CMD_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS) \
-    $(STATIC_CXXFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS)
+CXXFLAGS = $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS)\
+ $(DEBUG_CXXFLAGS) $(PIPE_CFLAGS) $(WARN_CXXFLAGS) $(TARGET_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) \
-    $(POSIX_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS) \
-    $($(BUILD_CLASS)_LDFLAGS) $(RUNTIME_LDFLAGS) $(CODE_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)

-LDLIBS = $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS) \
-    $(GNU_LDLIBS_$(GNU))
+LDLIBS = $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)\
+ $(GNU_LDLIBS_$(GNU))

-CPPFLAGS = $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS) \
-    $(DEBUG_CPPFLAGS) $(WARN_CPPFLAGS) $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) \
-    $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS) \
-    $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS) $(API_CPPFLAGS)
+CPPFLAGS = $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\
+ $(DEBUG_CPPFLAGS) $(WARN_CPPFLAGS) $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS)\
+ $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\
+ $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS) $(API_CPPFLAGS)

 #--------------------------------------------------
 # ar definition default
@@ -397,7 +396,7 @@ INSTALL_DOCS = $(DOCS:%= $(INSTALL_DOC)/%)
 INSTALL_HTMLS = $(HTMLS:%= $(INSTALL_HTML)/$(HTMLS_DIR)/%)

 INSTALL_TEMPLATE = $(addprefix $(INSTALL_TEMPLATES_SUBDIR)/, \
-    $(subst $(CONFIG),top/configure,$(TEMPLATES)))
+                   $(subst $(CONFIG),top/configure,$(TEMPLATES)))
 INSTALL_CONFIGS = $(CONFIGS:%= $(INSTALL_CONFIG)/%)

 INSTALL_BIN_INSTALLS = $(addprefix $(INSTALL_BIN)/,$(notdir $(BIN_INSTALLS)))
@@ -405,9 +404,9 @@ INSTALL_LIB_INSTALLS = $(addprefix $(INSTALL_LIB)/,$(notdir $(LIB_INSTALLS)))

 #---------------------------------------------------------------
 # Installed file permissions
-BIN_PERMISSIONS = 755
-LIB_PERMISSIONS = 644
-SHRLIB_PERMISSIONS = 755
+BIN_PERMISSIONS = 555
+LIB_PERMISSIONS = 444
+SHRLIB_PERMISSIONS = 555
 INSTALL_PERMISSIONS = 444

 #---------------------------------------------------------------
@@ -432,46 +431,42 @@ INSTALL_INC += $(foreach inc, $(INC), \
        $(CMPLR_INSTALL_INC) \
        $(OS_INSTALL_INC) \
        $(GENERIC_INSTALL_INC) \
-        $(GENERATED_INSTALL_INC)))
-INSTALL_INC += $(addprefix $(INSTALL_INCLUDE)/os/$(OS_CLASS)/, $(INC_$(OS_CLASS)))
+        $(GENERATED_INSTALL_INC) ) )
+INSTALL_INC += $(addprefix $(INSTALL_INCLUDE)/os/$(OS_CLASS)/, $(INC_$(OS_CLASS)) )

 #
 # Rule 0
 #
-CMPLR_INSTALL_INC = $(addprefix $(INSTALL_INCLUDE)/compiler/$(CMPLR_CLASS)/, \
-    $(foreach dir, $(CMPLR_SRC_DIRS), \
-        $(subst $(dir)/,, $(wildcard $(addsuffix /$(inc), $(dir))))))
+CMPLR_INSTALL_INC = $(addprefix $(INSTALL_INCLUDE)/compiler/$(CMPLR_CLASS)/, $(INSTALL_INC_jjj) )
+INSTALL_INC_jjj = $(foreach dir, $(CMPLR_SRC_DIRS), $(INSTALL_INC_iii)  )
+INSTALL_INC_iii = $(subst $(dir)/, , $(INSTALL_INC_hhh) )
+INSTALL_INC_hhh = $(wildcard $(addsuffix /$(inc), $(dir)) )

 #
 # Rule 1
 #
-OS_INSTALL_INC = $(addprefix $(INSTALL_INCLUDE)/os/$(OS_CLASS)/, \
-    $(foreach dir, $(OS_SRC_DIRS), \
-        $(subst $(dir)/,, $(wildcard $(addsuffix /$(inc), $(dir))))))
+OS_INSTALL_INC = $(addprefix $(INSTALL_INCLUDE)/os/$(OS_CLASS)/, $(INSTALL_INC_ggg) )
+INSTALL_INC_ggg = $(foreach dir, $(OS_SRC_DIRS), $(INSTALL_INC_fff)  )
+INSTALL_INC_fff = $(subst $(dir)/, , $(INSTALL_INC_eee) )
+INSTALL_INC_eee = $(wildcard $(addsuffix /$(inc), $(dir)) )

 #
 # Rule 2
 #
-GENERIC_INSTALL_INC = $(addprefix $(INSTALL_INCLUDE)/, \
-    $(foreach dir, .. $(SRC_DIRS), \
-        $(subst $(dir)/,, $(wildcard $(addsuffix /$(inc), $(dir))))))
+GENERIC_INSTALL_INC = $(addprefix $(INSTALL_INCLUDE)/, $(INSTALL_INC_ccc) )
+INSTALL_INC_ccc = $(foreach dir, .. $(SRC_DIRS), $(INSTALL_INC_bbb)  )
+INSTALL_INC_bbb = $(subst $(dir)/, , $(INSTALL_INC_aaa) )
+INSTALL_INC_aaa = $(wildcard $(addsuffix /$(inc), $(dir)) )

 #
 # Rule 3
 #
 GENERATED_INSTALL_INC = $(INSTALL_INCLUDE)/$(inc)

-#---------------------------------------------------------------
-# Files listed in INC that must first be created in O.Common
-COMMON_INC += $(filter $(COMMON_DIR)/%, \
-    $(foreach file, $(INC), \
-        $(firstword $(wildcard $(file) \
-            $(foreach dir, $(ALL_SRC_DIRS), \
-                $(addsuffix /$(file), $(dir)))) $(COMMON_DIR)/$(file))))
+COMMON_INC += $(filter $(COMMON_DIR)/%, $(foreach file, $(INC), \
+    $(firstword  $(SOURCE_INC) $(COMMON_DIR)/$(file) ) ) )
+SOURCE_INC = $(wildcard $(file) $(SOURCE_INC_bbb) )
+SOURCE_INC_bbb = $(foreach dir, $(ALL_SRC_DIRS), $(SOURCE_INC_aaa)  )
+SOURCE_INC_aaa = $(addsuffix /$(file), $(dir) )

-COMMON_DOCS += $(filter $(COMMON_DIR)/%, \
-    $(foreach file, $(DOCS), \
-        $(firstword $(wildcard $(file) \
-            $(foreach dir, $(ALL_SRC_DIRS), \
-                $(addsuffix /$(file), $(dir)))) $(COMMON_DIR)/$(file))))
 endif
--- a/configure/CONFIG_DATABASE_MODULE
+++ b/configure/CONFIG_DATABASE_MODULE
@@ -5,30 +5,22 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************

-# Installed perl scripts and dependent modules that have
-# a significant effect on the script's output
-DBDEXPAND_pl      = $(EPICS_BASE_HOST_BIN)/dbdExpand.pl
-DBDTORECTYPEH_pl  = $(EPICS_BASE_HOST_BIN)/dbdToRecordtypeH.pl
-DBDTORECTYPEH_dep = $(DBDTORECTYPEH_pl) $(call FIND_PM,DBD/Rec*.pm)
-DBDTOMENUH_pl     = $(EPICS_BASE_HOST_BIN)/dbdToMenuH.pl
-DBDTOMENUH_dep    = $(DBDTOMENUH_pl) $(call FIND_PM,DBD/Menu.pm)
-DBDTOMD_pl        = $(EPICS_BASE_HOST_BIN)/dbdToMD.pl
-DBDTOHTML_pl      = $(EPICS_BASE_HOST_BIN)/dbdToHtml.pl
-DBDTOHTML_dep     = $(DBDTOHTML_pl) $(call FIND_PM,EPICS/Pod*Html.pm)
-REGRECDEVDRV_pl   = $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl
-REGRECDEVDRV_dep  = $(REGRECDEVDRV_pl)
+# Set EPICS_DATABASE if necessary
+ifndef EPICS_DATABASE
+  EPICS_DATABASE = $(if $(BUILDING_DATABASE),$(INSTALL_LOCATION),$(EPICS_BASE))

-# Commands for running scripts in recipes
-DBEXPAND                   = $(PERL) $(DBDEXPAND_pl)
-DBTORECORDTYPEH            = $(PERL) $(DBDTORECTYPEH_pl)
-DBTOMENUH                  = $(PERL) $(DBDTOMENUH_pl)
-DBDTOMD                    = $(PERL) $(DBDTOMD_pl)
-DBDTOHTML                  = $(PERL) $(DBDTOHTML_pl)
-REGISTERRECORDDEVICEDRIVER = $(PERL) $(REGRECDEVDRV_pl)
+  # Paths to tools built here
+  EPICS_DATABASE_HOST_BIN = $(EPICS_DATABASE)/bin/$(EPICS_HOST_ARCH)
+endif

-# Installed binary executables, quoted for running on Windows
-MAKEBPT = "$(EPICS_BASE_HOST_BIN)/makeBpt$(HOSTEXE)"
-MSI3_15 = "$(EPICS_BASE_HOST_BIN)/msi$(HOSTEXE)"
+# Set location of locally-built tools
+MAKEBPT                    = $(EPICS_DATABASE_HOST_BIN)/makeBpt$(HOSTEXE)
+DBEXPAND                   = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdExpand.pl
+DBTORECORDTYPEH            = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToRecordtypeH.pl
+DBTOMENUH                  = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToMenuH.pl
+DBDTOHTML                  = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToHtml.pl
+REGISTERRECORDDEVICEDRIVER = $(PERL) $(EPICS_DATABASE_HOST_BIN)/registerRecordDeviceDriver.pl
+MSI3_15                    = $(EPICS_DATABASE_HOST_BIN)/msi$(HOSTEXE)

 # Libraries needed to link a basic IOC
 EPICS_BASE_IOC_LIBS = dbRecStd dbCore ca Com
--- a/configure/CONFIG_DATABASE_VERSION
+++ b/configure/CONFIG_DATABASE_VERSION
@@ -1,12 +1,12 @@
 # Version number for the database APIs and shared library

 EPICS_DATABASE_MAJOR_VERSION = 3
-EPICS_DATABASE_MINOR_VERSION = 25
-EPICS_DATABASE_MAINTENANCE_VERSION = 1
+EPICS_DATABASE_MINOR_VERSION = 20
+EPICS_DATABASE_MAINTENANCE_VERSION = 0

 # Development flag, set to zero for release versions

-EPICS_DATABASE_DEVELOPMENT_FLAG = 1
+EPICS_DATABASE_DEVELOPMENT_FLAG = 0

 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1
--- a/configure/CONFIG_ENV
+++ b/configure/CONFIG_ENV
@@ -53,5 +53,3 @@ 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
--- a/configure/CONFIG_LIBCOM_MODULE
+++ b/configure/CONFIG_LIBCOM_MODULE
@@ -5,10 +5,9 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************

-# Our locally-built tools
-# Windows can need these paths to be quoted
-YACC = "$(EPICS_BASE_HOST_BIN)/antelope$(HOSTEXE)"
-LEX  = "$(EPICS_BASE_HOST_BIN)/e_flex$(HOSTEXE)" \
+# Set location of locally generated tools
+YACC = $(abspath $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH))/antelope$(HOSTEXE)
+LEX = $(abspath $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH))/e_flex$(HOSTEXE) \
        -S$(EPICS_BASE)/include/flex.skel.static

 # Default stack size for osiThread
--- a/configure/CONFIG_LIBCOM_VERSION
+++ b/configure/CONFIG_LIBCOM_VERSION
@@ -1,12 +1,12 @@
 # Version number for the libcom APIs and shared library

 EPICS_LIBCOM_MAJOR_VERSION = 3
-EPICS_LIBCOM_MINOR_VERSION = 25
-EPICS_LIBCOM_MAINTENANCE_VERSION = 1
+EPICS_LIBCOM_MINOR_VERSION = 20
+EPICS_LIBCOM_MAINTENANCE_VERSION = 0

 # Development flag, set to zero for release versions

-EPICS_LIBCOM_DEVELOPMENT_FLAG = 1
+EPICS_LIBCOM_DEVELOPMENT_FLAG = 0

 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1
--- a/configure/CONFIG_SITE_ENV
+++ b/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=ANSI_GREEN("epics> ")
+IOCSH_PS1="epics> "
 IOCSH_HISTSIZE=50
 IOCSH_HISTEDIT_DISABLE=

@@ -92,6 +92,3 @@ 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
--- a/configure/Makefile
+++ b/configure/Makefile
@@ -34,9 +34,5 @@ CFG += TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A)

 include $(TOP)/configure/RULES

-ifeq ($(GNU),YES)
-  # Pass compiler flags to preprocessor to enable _FORTIFY_SOURCE
-  TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A): CPPFLAGS += $(CFLAGS)
-endif
 TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A): toolchain.c
 	$(PREPROCESS.cpp)
--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -17,7 +17,7 @@ TEMPL_SUFFIX ?= .template
 # vpath

 vpath %.pm $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
-vpath %.pod $(USR_VPATH) $(SRC_DIRS) .. $(dir $(DBD))
+vpath %.pod $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.dbd $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.db $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
 vpath %.vdb $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
@@ -55,7 +55,7 @@ DBD += $(foreach type, $(CROSS_TARGET_OS_TYPES), $(DBD_$(type)))
 # DBD_solaris += abcSolaris.dbd
 #
 # ---------------------------------------------------
-# DBD concatenation files
+# DBD concatination files

 COMMON_DBDCATS += $(addprefix $(COMMON_DIR)/,$(DBDCAT))
 DBDCAT_SOURCES += $(foreach file, $($*_DBD), $(DBDCAT_SOURCE) )
@@ -194,10 +194,10 @@ ifneq (,$(strip $(DBDDEPENDS_FILES)))
 endif

 #---------------------------------------------------------------
-# build dependencies, clean rule
+# build dependancies, clean rule

 inc: $(COMMON_INC) $(INSTALL_INC) $(COMMON_DBDS) $(COMMON_DBDCATS) \
-	$(INSTALL_DBDS) $(INSTALL_DBD_INSTALLS) $(COMMON_DOCS)
+	$(INSTALL_DBDS) $(INSTALL_DBD_INSTALLS)

 build: $(COMMON_DBS) $(INSTALL_DBS) \
 	$(DBDDEPENDS_FILES) $(TARGETS) \
@@ -217,32 +217,32 @@ realclean: clean
 #---------------------------------------------------------------
 # Dependency files

-%Record.h$(DEP): $(COMMON_DIR)/%Record.dbd $(DBDTORECTYPEH_dep)
+%Record.h$(DEP): $(COMMON_DIR)/%Record.dbd
 	@$(RM) $@
 	@$(DBTORECORDTYPEH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@

-%Record.h$(DEP): %Record.dbd $(DBDTORECTYPEH_dep)
+%Record.h$(DEP): %Record.dbd
 	@$(RM) $@
 	@$(DBTORECORDTYPEH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@

-%Record.h$(DEP): ../%Record.dbd $(DBDTORECTYPEH_dep)
+%Record.h$(DEP): ../%Record.dbd
 	@$(RM) $@
 	@$(DBTORECORDTYPEH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@

-menu%.h$(DEP): $(COMMON_DIR)/menu%.dbd $(DBDTOMENUH_dep)
+menu%.h$(DEP): $(COMMON_DIR)/menu%.dbd
 	@$(RM) $@
 	@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@

-menu%.h$(DEP): menu%.dbd $(DBDTOMENUH_dep)
+menu%.h$(DEP): menu%.dbd
 	@$(RM) $@
 	@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@

-menu%.h$(DEP): ../menu%.dbd $(DBDTOMENUH_dep)
+menu%.h$(DEP): ../menu%.dbd
 	@$(RM) $@
 	@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
@@ -261,7 +261,7 @@ menu%.h$(DEP): ../menu%.dbd $(DBDTOMENUH_dep)
 	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@

-%.dbd$(DEP): $($*_DBD)
+%.dbd$(DEP):
 	@$(RM) $@
 	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $($*_DBD) > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
@@ -330,32 +330,32 @@ $(INSTALL_DB)/%$(TEMPL_SUFFIX): ../%$(TEMPL_SUFFIX)
 #---------------------------------------------------------------
 # INC files

-$(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd $(DBDTORECTYPEH_dep)
+$(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd
 	@$(RM) $(notdir $@)
 	$(DBTORECORDTYPEH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@

-$(COMMON_DIR)/%Record.h: %Record.dbd $(DBDTORECTYPEH_dep)
+$(COMMON_DIR)/%Record.h: %Record.dbd
 	@$(RM) $(notdir $@)
 	$(DBTORECORDTYPEH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@

-$(COMMON_DIR)/%Record.h: ../%Record.dbd $(DBDTORECTYPEH_dep)
+$(COMMON_DIR)/%Record.h: ../%Record.dbd
 	@$(RM) $(notdir $@)
 	$(DBTORECORDTYPEH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@

-$(COMMON_DIR)/menu%.h: $(COMMON_DIR)/menu%.dbd $(DBDTOMENUH_dep)
+$(COMMON_DIR)/menu%.h: $(COMMON_DIR)/menu%.dbd
 	@$(RM) $(notdir $@)
 	$(DBTOMENUH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@

-$(COMMON_DIR)/menu%.h: menu%.dbd $(DBDTOMENUH_dep)
+$(COMMON_DIR)/menu%.h: menu%.dbd
 	@$(RM) $(notdir $@)
 	$(DBTOMENUH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@

-$(COMMON_DIR)/menu%.h: ../menu%.dbd $(DBDTOMENUH_dep)
+$(COMMON_DIR)/menu%.h: ../menu%.dbd
 	@$(RM) $(notdir $@)
 	$(DBTOMENUH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
@@ -366,7 +366,6 @@ $(COMMON_DIR)/menu%.h: ../menu%.dbd $(DBDTOMENUH_dep)
 # DBD files

 $(COMMON_DIR)/bpt%.dbd: bpt%.data
-	$(ECHO) "Converting data from $<"
 	@$(RM) $(notdir $@)
 	$(MAKEBPT) $< $(notdir $@)
 	@$(MV) $(notdir $@) $@
@@ -400,7 +399,7 @@ $(COMMON_DBDCATS):$(COMMON_DIR)/%.dbd:
 	$(DBDCAT_COMMAND)
 	@$(MV) $(notdir $@) $@

-$(COMMON_DIR)/%.dbd: $($*_DBD)
+$(COMMON_DIR)/%.dbd:
 	$(ECHO) "Creating dbd file $(notdir $@)"
 	@$(RM) $(notdir $@)
 	$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $($*_DBD)
@@ -427,56 +426,36 @@ $(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))

 .PRECIOUS: $(COMMON_DBDS) $(COMMON_DIR)/%.dbd

-#---------------------------------------------------------------
-# Markdown files
-
-$(COMMON_DIR)/%.md: %.dbd.pod $(DBDTOMD_pl)
-	@$(RM) $(notdir $@)
-	$(DBDTOMD) $(DBDFLAGS) -o $(notdir $@) $<
-	@$(MV) $(notdir $@) $@
-
-$(COMMON_DIR)/%.md: %.pod $(PODTOMD_pl)
-	@$(RM) $(notdir $@)
-	$(PODTOMD) -o $(notdir $@) $<
-	@$(MV) $(notdir $@) $@
-
-$(COMMON_DIR)/%.md: ../%.pl $(PODTOMD_pl)
-	@$(RM) $(notdir $@)
-	$(PODTOMD) -o $(notdir $@) $<
-	@$(MV) $(notdir $@) $@
-
-.PRECIOUS: $(COMMON_DIR)/%.md
-
 #---------------------------------------------------------------
 # HTML files

-$(COMMON_DIR)/%.html: %.dbd.pod $(DBDTOHTML_pl)
+$(COMMON_DIR)/%.html: %.dbd.pod
 	@$(RM) $(notdir $@)
 	$(DBDTOHTML) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@

-$(COMMON_DIR)/%.html: %.pod $(PODTOHTML_dep)
+$(COMMON_DIR)/%.html: %.pod
 	@$(RM) $(notdir $@)
 	$(PODTOHTML) -s -s -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@

-$(COMMON_DIR)/%.html: %.pm $(PODTOHTML_dep)
+$(COMMON_DIR)/%.html: %.pm
 	@$(RM) $(notdir $@)
 	$(PODTOHTML) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@

-$(COMMON_DIR)/%.html: ../%.pm $(PODTOHTML_dep)
+$(COMMON_DIR)/%.html: ../%.pm
 	@$(RM) $(notdir $@)
 	$(PODTOHTML) -s -o $(notdir $@) $<
 	@$(MKDIR) $(dir $@)
 	@$(MV) $(notdir $@) $@

-$(COMMON_DIR)/%.html: ../%.pl $(PODTOHTML_dep)
+$(COMMON_DIR)/%.html: ../%.pl
 	@$(RM) $(notdir $@)
 	$(PODTOHTML) -s -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@

-.PRECIOUS: $(COMMON_DIR)/%.html
+.PRECIOUS: $(COMMON_DIR)/%.html %.html

 #---------------------------------------------------------------
 # DB files
@@ -547,19 +526,16 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 #---------------------------------------------------------------
 # register record,device,driver support

-%_registerRecordDeviceDriver.cpp: $(COMMON_DIR)/%.dbd $(REGRECDEVDRV_dep)
+%_registerRecordDeviceDriver.cpp: $(COMMON_DIR)/%.dbd
 	@$(RM) $@
-	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ \
-            $< $(basename $@) $(IOCS_APPL_TOP)
+	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ $< $(basename $@) $(IOCS_APPL_TOP)

-%_registerRecordDeviceDriver.cpp: %.dbd $(REGRECDEVDRV_dep)
+%_registerRecordDeviceDriver.cpp: %.dbd
 	@$(RM) $@
-	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ \
-            $< $(basename $@) $(IOCS_APPL_TOP)
+	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ $< $(basename $@) $(IOCS_APPL_TOP)

-%_registerRecordDeviceDriver.cpp: ../%.dbd $(REGRECDEVDRV_dep)
+%_registerRecordDeviceDriver.cpp: ../%.dbd
 	@$(RM) $@
-	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ \
-            $< $(basename $@) $(IOCS_APPL_TOP)
+	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ $< $(basename $@) $(IOCS_APPL_TOP)

 .PRECIOUS: %_registerRecordDeviceDriver.cpp
--- a/configure/RULES_ARCHS
+++ b/configure/RULES_ARCHS
@@ -32,7 +32,7 @@ ifneq ($(RELEASE_CFG_DIR_RULES),)
  include $(RELEASE_CFG_DIR_RULES)
 endif

-# Create EPICS_HOST_ARCH dependencies for GNU make -j option.
+# Create EPICS_HOST_ARCH dependancies for GNU make -j option.
 # Needed in dirs where EPICS_HOST_ARCH build creates a tool used in 
 # cross arch builds

--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -22,8 +22,7 @@ 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) $(COMMON_DIR)
-vpath %.md $(USR_VPATH) $(ALL_SRC_DIRS) $(COMMON_DIR)
+vpath %.html $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.skel.static $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.y $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.l $(USR_VPATH) $(ALL_SRC_DIRS)
@@ -129,7 +128,7 @@ endif
 #---------------------------------------------------------------
 # Read dependency files

-ifneq ($(filter-out inc,$(strip $(MAKECMDGOALS))),)
+ifneq (inc,$(strip $(MAKECMDGOALS)))
 ifneq (,$(strip $(HDEPENDS_FILES)))
 $(filter-out $(wildcard *$(DEP)), $(HDEPENDS_FILES)): | $(COMMON_INC)
 -include $(HDEPENDS_FILES)
@@ -183,12 +182,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_DOCS)
+	$(INSTALL_HTMLS) $(INSTALLS_PERL_MODULES) $(INSTALL_SCRIPTS)

 buildInstall: \
 	$(INSTALL_PROD) $(INSTALL_MUNCHS) \
 	$(INSTALL_TCLLIBS) $(INSTALL_TCLINDEX) \
+	$(INSTALL_DOCS) \
 	$(INSTALL_OBJS) \
 	$(INSTALL_TEMPLATE) \
 	$(INSTALL_BIN_INSTALLS)
@@ -214,7 +213,7 @@ $(sort $(DIRECTORY_TARGETS)):
 	$(MKDIR) $@

 # Install LIB_INSTALLS libraries before linking executables
-$(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS) $(TESTSHRLIBNAME)
+$(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS)

 # Install built libraries too, unless Makefile says to wait
 ifneq ($(DELAY_INSTALL_LIBS),YES)
@@ -225,7 +224,7 @@ endif
 checkRelease:
 	+$(CONVERTRELEASE) checkRelease
 warnRelease:
-	-$(CONVERTRELEASE) checkRelease
+	$(CONVERTRELEASE) checkRelease
 noCheckRelease:
 ifeq ($(EPICS_HOST_ARCH),$(T_A))
 	$(info Warning: RELEASE file consistency checks have been disabled)
@@ -387,25 +386,23 @@ $(MODNAME): %$(MODEXT): %$(EXE)
 # Automated testing

 runtests: run-tap-tests
-run-tap-tests: | build
+run-tap-tests: $(TESTSCRIPTS.t)
 ifneq ($(TESTSCRIPTS.t),)
 ifdef RUNTESTS_ENABLED
-	$(ECHO) "$(PROVE) $(TESTSCRIPTS.t)"
-	@$(PROVE) $(TESTSCRIPTS.t) || $(PROVE_FAILURE)
+	$(ECHO) "$(PROVE) $^"
+	@$(PROVE) $^ || $(PROVE_FAILURE)
 endif
 endif

 tapfiles: $(TAPFILES)
 junitfiles: $(JUNITFILES)
-# prevent deletion of partial output from failing tests
-.PRECIOUS: $(TAPFILES) $(JUNITFILES)

 test-results: tap-results
 tap-results: $(TAPFILES)
 ifneq ($(strip $(TAPFILES)),)
 ifdef RUNTESTS_ENABLED
-	$(ECHO) "$(PROVE.tap) $(TAPFILES)"
-	@$(PROVE.tap) $(TAPFILES) || $(PROVE_FAILURE)
+	$(ECHO) "$(PROVE.tap) $^"
+	@$(PROVE.tap) $^ || $(PROVE_FAILURE)
 endif

 CURRENT_TAPFILES := $(wildcard $(TAPFILES))
@@ -421,7 +418,7 @@ ifneq ($(CURRENT_JUNITFILES),)
 endif

 # A .tap file is the output from running the associated test script
-$(TAPFILES.t): %.tap: %.t | build
+$(TAPFILES.t): %.tap: %.t
 ifdef RUNTESTS_ENABLED
 	$(ECHO) "$(PERL) $< -tap > $@"
 	@$(PERL) $< -tap > $@ || $(TAPFILE_FAILURE)
@@ -515,13 +512,6 @@ ifneq (,$(strip $(SHRLIB_VERSION)))
 	@$(RM) $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 	ln -s $< $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 endif # SHRLIB_VERSION
-else  # SHRLIB_SUFFIX
-ifeq ($(BUILD_CLASS),HOST)
-ifneq (,$(strip $(SHRLIB_VERSION)))
-	@$(RM) $@.$(SHRLIB_VERSION)
-	ln -s $< $@.$(SHRLIB_VERSION)
-endif # HOST
-endif # SHRLIB_VERSION
 endif # SHRLIB_SUFFIX

 ifneq ($(INSTALL_TCLLIB),$(INSTALL_BIN))
@@ -553,11 +543,11 @@ endif # LOADABLE_SHRLIB_SUFFIX
 ifneq ($(INSTALL_CONFIGS),)
 $(INSTALL_CONFIG)/%: %
 	$(ECHO) "Installing config file $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $(abspath $< $(@D))
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

 $(INSTALL_CONFIG)/%: ../%
 	$(ECHO) "Installing config file $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $(abspath $< $(@D))
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 endif

 $(INSTALL_INCLUDE)/%: $(COMMON_DIR)/%
@@ -576,21 +566,13 @@ $(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) $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)

 $(INSTALL_DOC)/%: ../%
 	$(ECHO) "Installing doc $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
-
-$(INSTALL_HTML)/$(HTMLS_DIR)/%: $(COMMON_DIR)/%
-	$(ECHO) "Installing generated html $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)

 $(INSTALL_HTML)/$(HTMLS_DIR)/%: %
 	$(ECHO) "Installing html $@"
@@ -600,6 +582,10 @@ $(INSTALL_HTML)/$(HTMLS_DIR)/%: ../%
 	$(ECHO) "Installing html $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

+$(INSTALL_HTML)/$(HTMLS_DIR)/%: $(COMMON_DIR)/%
+	$(ECHO) "Installing generated html $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+
 $(INSTALL_TEMPLATES_SUBDIR)/%: ../%
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
--- a/configure/RULES_COMMON
+++ b/configure/RULES_COMMON
@@ -27,7 +27,7 @@ $(foreach file,$(MAKEFILE_LIST), \

 PRINT_Var = $(@:PRINT.%=%)
 PRINT.%:
-	@+echo $(PRINT_Var) = '$($(PRINT_Var))'
+	@echo $(PRINT_Var) = '$($(PRINT_Var))'

 .PHONY: PRINT PRINT.%

--- a/configure/RULES_DIRS
+++ b/configure/RULES_DIRS
@@ -44,7 +44,7 @@ $(foreach dir, $(DIRS), $(dir)$(DIVIDER)install): \
 rebuild: $(foreach dir, $(DIRS), $(dir)$(DIVIDER)install)
 endif

-# Create directory dependencies lines for GNU make -j option
+# Create directory dependancies 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)
--- a/configure/RULES_EXPAND
+++ b/configure/RULES_EXPAND
@@ -47,7 +47,7 @@ vpath %@ $(USR_VPATH) $(ALL_SRC_DIRS)
 #        INC += myVersion.h

 # Default settings
-EXPAND_TOOL ?= $(PERL) $(TOOLS)/expandVars.pl $(QUIET_FLAG)
+EXPAND_TOOL ?= $(PERL) $(TOOLS)/expandVars.pl

 EXPANDARCH = -a $(T_A)
 EXPANDFLAGS += -t $(INSTALL_LOCATION)
@@ -55,17 +55,22 @@ EXPANDFLAGS += $(addprefix -D ,$(EXPAND_VARS) $($@_EXPAND_VARS))
 EXPANDFLAGS += $(foreach var, $(EXPAND_ME) $($@_EXPAND_ME), \
    -D$(var)="$(strip $($(var)))")

-# Output files
+# The names of files to be expanded must end with '@'
 EXPANDED = $(EXPAND:%@=%)
-EXPANDED_COMMON = $(EXPAND_COMMON:%@=$(COMMON_DIR)/%)
+EXPANDED_COM = $(EXPAND_COMMON:%@=%)
+EXPANDED_COMMON = $(EXPANDED_COM:%=$(COMMON_DIR)/%)

 $(EXPANDED): %: %@
 	$(ECHO) "Expanding $< to $@"
+	@$(RM) $@
 	$(EXPAND_TOOL) $(EXPANDARCH) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@

-$(EXPANDED_COMMON): $(COMMON_DIR)/%: %@
+$(EXPANDED_COM): %: %@
 	$(ECHO) "Expanding $< to $(COMMON_DIR)/$@"
+	@$(RM) $@
 	$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
+$(EXPANDED_COMMON): $(COMMON_DIR)/%: %
+	@$(MV) $< $@

 clean: expand_clean

--- a/configure/RULES_MODULES
+++ b/configure/RULES_MODULES
@@ -22,14 +22,13 @@
 #    7. Submodules must have a configure/CONFIG_SITE file that contains
 #           -include $(TOP)/../CONFIG_SITE.local

-# Add checked-out submodules to DIRS, unless INSTALL_LOCATION is empty
-LIVE_SUBMODULES = $(subst /Makefile,, \
-    $(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
-live = $(if $(wildcard $(INSTALL_CONFIG)/RULES_TOP),LIVE,DEAD)
-DIRS += $($(live)_SUBMODULES)
+# Add checked-out submodules to DIRS
+LIVE_SUBMODULES = $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
+DIRS += $(LIVE_SUBMODULES)

 include $(CONFIG)/RULES_DIRS

+INSTALL_LOCATION_ABS := $(abspath $(INSTALL_LOCATION))
 RELEASE_LOCAL := RELEASE.$(EPICS_HOST_ARCH).local

 # Ensure that RELEASE.<host>.local exists before doing anything else
@@ -39,13 +38,14 @@ all host $(DIRS) $(ARCHS) $(ACTIONS) $(dirActionTargets) $(dirArchTargets) \
 # Convenience target
 RELEASE.host: $(RELEASE_LOCAL)

-$(RELEASE_LOCAL): Makefile $(CONFIG)/CONFIG_SITE \
-    $(wildcard $(CONFIG)/CONFIG_SITE.local)
-	$(ECHO) "Creating $@ with"
-	$(ECHO) "    $(PARENT_MODULE) = $(INSTALL_ABSOLUTE)"
-	@echo $(PARENT_MODULE) = $(INSTALL_ABSOLUTE)> $@
+$(RELEASE_LOCAL): Makefile CONFIG_SITE.local
+	$(ECHO) Creating $@ with
+	$(ECHO) "    $(PARENT_MODULE) = $(INSTALL_LOCATION_ABS)"
+	@echo $(PARENT_MODULE) = $(INSTALL_LOCATION_ABS)> $@
+realclean:
+	$(RM) $(wildcard RELEASE.*.local)

-.PHONY: RELEASE.host
+.PHONY: RELEASE.host realclean

 # Testing: Combine test failure logs from the live submodules
 TESTS_FAILED_LOGS = $(wildcard $(addsuffix /$(TESTS_FAILED_LOG), \
--- a/configure/RULES_TOP
+++ b/configure/RULES_TOP
@@ -23,42 +23,35 @@ ifndef DISABLE_TOP_RULES
  # Rules for a regular application top directory
  #

-  # When run by 'make distclean' the realuninstall target also
-  # removes any modules/RELEASE.<host>.local files
-  distclean: realclean cvsclean realuninstall
+distclean: realclean cvsclean realuninstall

-  realuninstall: uninstallDirs
+realuninstall: uninstallDirs
 	$(RMDIR) $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB)
-  ifeq (modules,$(filter modules,$(DIRS)))
-    ifeq (distclean,$(filter distclean,$(MAKECMDGOALS)))
-	$(RM) $(wildcard modules/RELEASE.*.local)
-    endif
-  endif

-  UNINSTALL_DIRS += $(INSTALL_DB) $(INSTALL_DBD) $(INSTALL_DOC) $(INSTALL_HTML)
-  UNINSTALL_DIRS += $(INSTALL_INCLUDE) $(INSTALL_TEMPLATES) $(DIRECTORY_TARGETS)
-  ifneq ($(INSTALL_LOCATION),$(TOP))
-    UNINSTALL_DIRS += $(INSTALL_CONFIG)
-  endif
-  uninstallDirs:
+UNINSTALL_DIRS += $(INSTALL_DB) $(INSTALL_DBD) $(INSTALL_DOC) $(INSTALL_HTML)
+UNINSTALL_DIRS += $(INSTALL_INCLUDE) $(INSTALL_TEMPLATES) $(DIRECTORY_TARGETS)
+ifneq ($(INSTALL_LOCATION),$(TOP))
+  UNINSTALL_DIRS += $(INSTALL_CONFIG)
+endif
+uninstallDirs: | clean
 	$(RMDIR) $(UNINSTALL_DIRS)

  # Remove the bin and lib directories if they have no sub-directories
  #
-  EMPTY_INSTALL_DIRS = \
-      $(if $(wildcard $(INSTALL_LOCATION_BIN)/*),,$(INSTALL_LOCATION_BIN)) \
-      $(if $(wildcard $(INSTALL_LOCATION_LIB)/*),,$(INSTALL_LOCATION_LIB))
-  uninstall: archuninstall uninstallDirs
+EMPTY_INSTALL_DIRS = \
+    $(if $(wildcard $(INSTALL_LOCATION_BIN)/*),,$(INSTALL_LOCATION_BIN)) \
+    $(if $(wildcard $(INSTALL_LOCATION_LIB)/*),,$(INSTALL_LOCATION_LIB))
+uninstall: archuninstall uninstallDirs | clean
 	$(RMDIR) $(EMPTY_INSTALL_DIRS)

-  archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))
+archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))

-  uninstall$(DIVIDER)%:
+uninstall$(DIVIDER)%: | clean
 	$(RMDIR) $(addsuffix /$(subst uninstall$(DIVIDER),,$@), \
 	    $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB))

-  # Only run this at the top of the parent
-  runtests test-results:
+# Only run this at the top of the parent
+runtests test-results:
 	@$(SHOWTESTFAILURES)

 else
@@ -83,6 +76,7 @@ help:
 	@echo "     inc            - Installs header, dbd and html files"
 	@echo "     build          - Builds and installs all targets"
 	@echo "     install        - Builds and installs all targets"
+	@echo "     buildInstall   - Same as install (deprecated)"
 	@echo "     clean          - Removes the O.<arch> dirs created by running make"
 	@echo "                      In O.<arch> dir, clean removes build created files"
 	@echo "     realclean      - Removes ALL O.<arch> dirs"
@@ -107,8 +101,7 @@ ifndef DISABLE_TOP_RULES
 	@echo "     uninstall$(DIVIDER)<arch> - Remove bin & lib directories for <arch> only."
 	@echo "     uninstall      - Remove install directories created by this hostarch."
 	@echo "     realuninstall  - Removes ALL install dirs"
-	@echo "     distclean      - Does realclean cvsclean realuninstall and deletes any"
-	@echo "                      generated modules/RELEASE.<host>.local files"
+	@echo "     distclean      - Same as realclean cvsclean realuninstall."
 endif
 	@echo "     help           - Prints this list of valid make targets "
 	@echo "Object targets are supported by the O.<arch> level Makefile .e.g"
--- a/configure/Sample.Makefile
+++ b/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 search order is:
+#	For almost every file the seach 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 shareable library
+#	EPICS libs needed to link PROD, TESTPROD and sharable 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 shareable library (LIBRARY)
+#	below minus the name of the sharable 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 shareable library
+#	system libs needed to link PROD, TESTPROD and sharable library
 #
 # ---------- system libraries for all products
 # for all systems:
--- a/configure/os/CONFIG.Common.RHEL7-x86_64
+++ b/configure/os/CONFIG.Common.RHEL7-x86_64
@@ -0,0 +1,2 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
--- a/configure/os/CONFIG.Common.RHEL7-x86_64-clang
+++ b/configure/os/CONFIG.Common.RHEL7-x86_64-clang
@@ -1,5 +1 @@
 include $(CONFIG)/os/CONFIG.Common.linux-clang
-
-BUILD_CLASS = HOST
-
-STD_CXXFLAGS = -std=c++2a
--- a/configure/os/CONFIG.Common.RHEL8-x86_64
+++ b/configure/os/CONFIG.Common.RHEL8-x86_64
@@ -1,21 +1,2 @@
 # Include definitions common to linux pentium targets
 include $(CONFIG)/os/CONFIG.Common.linux-x86_64
-
-BUILD_CLASS = HOST
-
-TOOLSET_LOCATION = /opt/rh
-TOOLSET = gcc-toolset-15
-STD_CXXFLAGS = -std=c++20
-STD_CFLAGS = -std=c17
-
-# Fix bug in gcc-toolset-11 calling the old assembler
-ifneq ($(filter %-11,$(TOOLSET)),)
-CPPFLAGS += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
-LDFLAGS  += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
-endif
-
-ifneq (($(TOOLSET)),)
-# Perl requests (native) annobin incompatible with the annobin from any TOOLSET
-# Disable Perl specific CFLAGS
-override Cap5_CFLAGS=
-endif
--- a/configure/os/CONFIG.Common.RHEL8-x86_64-clang
+++ b/configure/os/CONFIG.Common.RHEL8-x86_64-clang
@@ -1,5 +1 @@
 include $(CONFIG)/os/CONFIG.Common.linux-clang
-
-BUILD_CLASS = HOST
-
-STD_CXXFLAGS = -std=c++2a
--- a/configure/os/CONFIG.Common.RHEL9-x86_64
+++ b/configure/os/CONFIG.Common.RHEL9-x86_64
@@ -1,21 +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 = 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)),)
-CPPFLAGS += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
-LDFLAGS  += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
-endif
-
-ifneq (($(TOOLSET)),)
-# Perl requests (native) annobin incompatible with the annobin from any TOOLSET
-# Disable Perl specific CFLAGS
-override Cap5_CFLAGS=
-endif
--- a/configure/os/CONFIG.Common.RTEMS
+++ b/configure/os/CONFIG.Common.RTEMS
@@ -65,7 +65,7 @@ CXXFLAGS = $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS)\
 $(USR_CXXFLAGS) $(CMD_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS)\
 $(STATIC_CXXFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS)

-LDFLAGS += $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(CMD_LDFLAGS)\
+LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(CMD_LDFLAGS)\
 $(POSIX_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS)\
 $($(BUILD_CLASS)_LDFLAGS) $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)

@@ -77,10 +77,7 @@ CPPFLAGS += $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\
 $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\
 $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)

-ECHO = @$(if $(make-s),$(NOP),echo)
-
-# Originally set in os/CONFIG.UnixCommon.Common
-MKDIR = mkdir -p
+ECHO = @$(if $(filter -s,$(MFLAGS)),$(NOP),echo)

 #--------------------------------------------------
 # Although RTEMS uses gcc, it wants to use gcc its own way
@@ -102,47 +99,15 @@ OS_CLASS = RTEMS
 # Operating system compile & link flags
 OP_SYS_CFLAGS += -D__LINUX_ERRNO_EXTENSIONS__

-# Has RTEMS been built with the internal legacy stack?
-ifeq ($(RTEMS_LEGACY_NETWORKING_INTERNAL),yes)
-RTEMS_HAS_NETWORKING = yes
-RTEMS_NETWORKING = legacy_internal
+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
 endif

-# 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_posix_NET_yes = -ltftpfs -lnfs -lz -ltelnetd
+OP_SYS_LDLIBS_posix_NET_no = -ltftpfs -lbsd -lz
 OP_SYS_LDLIBS_score_NET_yes = -lnfs
 OP_SYS_LDLIBS_score_NET_no = -lnfs
 OP_SYS_LDLIBS += -lrtemsCom -lCom
@@ -165,8 +130,7 @@ 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 -lbsd -ltftpfs -lz
-GESYS_LIBS += -lnetworking
+GESYS_LIBS += -lnfs -ltelnetd -lrtems-gdb-stub

 # While not part of the Generic Image it provides symbols which
 # would conflict.
--- a/configure/os/CONFIG.Common.RTEMS-beagleboneblack
+++ b/configure/os/CONFIG.Common.RTEMS-beagleboneblack
@@ -9,7 +9,7 @@ RTEMS_BSP = beagleboneblack
 RTEMS_TARGET_CPU = arm
 GNU_TARGET = arm-rtems

-OP_SYS_LDFLAGS += -Wl,--gc-sections
+OP_SYS_LDLIBS += -Wl,--gc-sections
 ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/$(GNU_TARGET)$(RTEMS_VERSION)/beagleboneblack/lib/

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

 include $(CONFIG)/os/CONFIG.Common.RTEMS
-
-ifeq ($(shell test $(RTEMS_VERSION) -ge 5; echo $$?),0)
-RTEMS_BSP = mvme2700
-else
-RTEMS_BSP = mvme2307
-endif
--- a/configure/os/CONFIG.Common.RTEMS-pc386
+++ b/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 ($(shell test $(RTEMS_VERSION) -ge 5; echo $$?),0)
+ifeq ($(RTEMS_VERSION),5)
  $(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)
--- a/configure/os/CONFIG.Common.RTEMS-pc686
+++ b/configure/os/CONFIG.Common.RTEMS-pc686
@@ -20,6 +20,7 @@ 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
@@ -27,11 +28,11 @@ include $(CONFIG)/os/CONFIG.Common.RTEMS
 #
 # Put text segment where it will work with etherboot
 #
-OP_SYS_LDFLAGS += -Wl,-Ttext,0x100000 -Wl,--gc-sections
+OP_SYS_LDFLAGS += -Wl,-Ttext,0x100000


 # This check must appear after the above include
-ifeq ($(shell test $(RTEMS_VERSION) -lt 5; echo $$?),0)
+ifneq ($(RTEMS_VERSION),5)
  $(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)
--- a/configure/os/CONFIG.Common.RTEMS-qoriq_e500
+++ b/configure/os/CONFIG.Common.RTEMS-qoriq_e500
@@ -20,9 +20,9 @@ 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_LDFLAGS += -Wl,--gc-sections
+OP_SYS_LDLIBS += -Wl,--gc-sections
 #ARCH_DEP_LDFLAGS = -mcpu=8540 -meabi -msdata=sysv -mstrict-align -mspe -mabi=spe -mfloat-gprs=double 
-ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/$(GNU_TARGET)$(RTEMS_VERSION)/$(RTEMS_BSP)/lib
+ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/powerpc-rtems5/qoriq_e500/lib  

 MUNCH_SUFFIX = .img
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
--- a/configure/os/CONFIG.Common.RTEMS-xilinx_zynq_a9_qemu
+++ b/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_LDFLAGS += -Wl,--gc-sections
+OP_SYS_LDLIBS += -Wl,--gc-sections
 ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/$(GNU_TARGET)$(RTEMS_VERSION)/xilinx_zynq_a9_qemu/lib/


--- a/configure/os/CONFIG.Common.RTEMS-xilinx_zynq_microzed
+++ b/configure/os/CONFIG.Common.RTEMS-xilinx_zynq_microzed
@@ -1,16 +0,0 @@
-#
-# 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
--- a/configure/os/CONFIG.Common.RTEMS-xilinx_zynq_zedboard
+++ b/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_LDFLAGS += -Wl,--gc-sections
+OP_SYS_LDLIBS += -Wl,--gc-sections
 ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/$(GNU_TARGET)$(RTEMS_VERSION)/xilinx_zynq_zedboard/lib/


--- a/configure/os/CONFIG.Common.RTEMS49-pc386
+++ b/configure/os/CONFIG.Common.RTEMS49-pc386
@@ -1,2 +0,0 @@
-RTEMS_VERSION = 4.9
-include $(CONFIG)/os/CONFIG.Common.RTEMS-pc386
--- a/configure/os/CONFIG.Common.RTEMS51-pc686
+++ b/configure/os/CONFIG.Common.RTEMS51-pc686
@@ -1,2 +0,0 @@
-RTEMS_VERSION = 5
-include $(CONFIG)/os/CONFIG.Common.RTEMS-pc686
--- a/configure/os/CONFIG.Common.SL6-x86
+++ b/configure/os/CONFIG.Common.SL6-x86
@@ -0,0 +1,7 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+ARCH_DEP_CFLAGS += -march=i686
+
+# have no full C++11
+STD_CXXFLAGS = -std=c++0x
--- a/configure/os/CONFIG.Common.SL6-x86_64
+++ b/configure/os/CONFIG.Common.SL6-x86_64
@@ -0,0 +1,5 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+# have no full C++11
+STD_CXXFLAGS = -std=c++0x
--- a/configure/os/CONFIG.Common.SL6-x86_64-clang
+++ b/configure/os/CONFIG.Common.SL6-x86_64-clang
@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang
--- a/configure/os/CONFIG.Common.T2-ppc604
+++ b/configure/os/CONFIG.Common.T2-ppc604
@@ -0,0 +1,8 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 5.5.1
+WIND_BASE = /afs/psi.ch/project/vxworks/Tornado2.2.1
+
+#there is a problem with our ccppc and optimization
+# -O0 works, -O and -O1 and higher are buggy
+OPT_CFLAGS_YES = -O0
+OPT_CXXFLAGS_YES = -O0
--- a/configure/os/CONFIG.Common.UnixCommon
+++ b/configure/os/CONFIG.Common.UnixCommon
@@ -8,7 +8,7 @@
 #-------------------------------------------------------

 # Unix valid build types
-VALID_BUILDS = $(if $(filter HOST,$(BUILD_CLASS)),Host) Ioc Command
+VALID_BUILDS = Host Ioc Command

 #-------------------------------------------------------
 # Unix prefix and suffix definitions
@@ -56,7 +56,7 @@ SHRLIB_LDLIBS = $(addprefix -l, $($*_LDLIBS) $(LIB_LIBS) $(USR_LIBS)) \

 SHRLIB_DEPLIB_DIRS = $(foreach word, \
    $(sort $(INSTALL_LIB)/ $(dir $($*_DEPLIBS) $(SHRLIB_DEPLIBS))), \
-    $(abspath $(word)))
+    $(shell $(FULLPATHNAME) $(word)))

 SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-L%)

@@ -85,7 +85,7 @@ PROD_LDLIBS += $($(firstword $(LDLIBS_STATIC_$(STATIC_BUILD)) \

 PROD_DEPLIB_DIRS = $(foreach word, \
    $(sort $(INSTALL_LIB)/ $(dir $($*_DEPLIBS) $(PROD_DEPLIBS))), \
-    $(abspath $(word)))
+    $(shell $(FULLPATHNAME) $(word)))

 PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-L%)

--- a/configure/os/CONFIG.Common.V62-ppc604
+++ b/configure/os/CONFIG.Common.V62-ppc604
@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.2
--- a/configure/os/CONFIG.Common.V63-ppc603
+++ b/configure/os/CONFIG.Common.V63-ppc603
@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long
+VXWORKS_VERSION = 6.3
+
+# Buggy "uninitialized variable" warning produces many false positives
+ARCH_DEP_CXXFLAGS += -Wno-uninitialized
--- a/configure/os/CONFIG.Common.V63-ppc604
+++ b/configure/os/CONFIG.Common.V63-ppc604
@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.3
+
+# Buggy "uninitialized variable" warning produces many false positives
+ARCH_DEP_CXXFLAGS += -Wno-uninitialized
--- a/configure/os/CONFIG.Common.V64-ppc604
+++ b/configure/os/CONFIG.Common.V64-ppc604
@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.4
+
+# Buggy "uninitialized variable" warning produces many false positives
+ARCH_DEP_CXXFLAGS += -Wno-uninitialized
--- a/configure/os/CONFIG.Common.V66-ppc603
+++ b/configure/os/CONFIG.Common.V66-ppc603
@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long
+VXWORKS_VERSION = 6.6
--- a/configure/os/CONFIG.Common.V66-ppc604
+++ b/configure/os/CONFIG.Common.V66-ppc604
@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.6
--- a/configure/os/CONFIG.Common.V67-ppc604
+++ b/configure/os/CONFIG.Common.V67-ppc604
@@ -0,0 +1,8 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.7
+
+# needed when including memPartLib.h, e.g. through moduleLib.h or loadLib.h
+ARCH_DEP_CFLAGS += -D_VSB_CONFIG_FILE='<../lib/h/config/vsbConfig.h>'
+
+# compiler tries to access license server (even though no license isneeded)
+export LM_LICENSE_FILE=37000@lic-windriver.psi.ch
--- a/configure/os/CONFIG.Common.V69-ppc32
+++ b/configure/os/CONFIG.Common.V69-ppc32
@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc32
+VXWORKS_VERSION = 6.9
+export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
--- a/configure/os/CONFIG.Common.V69-ppc604
+++ b/configure/os/CONFIG.Common.V69-ppc604
@@ -1,6 +1,9 @@
 include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
 VXWORKS_VERSION = 6.9
-#export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH:%=%:)($(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
+export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib

 # -fno-implicit-fp causes error: "unable to find a register to spill in class 'FLOAT_REGS'"
-ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align
+ARCH_DEP_CFLAGS =  -mcpu=604 -mstrict-align
+
+# VxWorks 6.9.0 has buggy int8_t in stdint.h
+ARCH_DEP_CFLAGS += -fsigned-char
--- a/configure/os/CONFIG.Common.deb10-x86_64
+++ b/configure/os/CONFIG.Common.deb10-x86_64
@@ -1,16 +1,20 @@
-# Debian 10
+# DeltaTau PowerPMAC with gcc

 # Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+include $(CONFIG)/os/CONFIG.Common.linuxCommon

-BUILD_CLASS = HOST
+ARCH_CLASS = x86_64

-STD_CXXFLAGS = -std=c++17
+LDLIBS_SHARED_YES=LDLIBS

-ifneq ($(EPICS_HOST_ARCH),$(T_A))
-# Cross compile
-GNU_DIR = /opt/xgcc/gcc-8.3.0-deb10
-GNU_TARGET = x86_64-deb10-linux-gnu
-SYSROOT = $(GNU_DIR)/$(GNU_TARGET)/sys-root
-CMPLR_PREFIX = $(GNU_TARGET)-
-endif
+SDK = gcc
+SDK_DIR  = /opt/xgcc/gcc-8.3.0-deb10
+GNU_ARCH = x86_64-deb10-linux-gnu
+SDKTARGETSYSROOT=$(SDK_DIR)/$(GNU_ARCH)/sys-root/
+GNU_DIR = $(SDK_DIR)
+GNU_BIN = $(GNU_DIR)/bin/
+GNU_TARGET_INCLUDE_DIR =
+GNU_TARGET=x86_64-deb10-linux-gnu
+
+ARCH_DEP_CPPFLAGS =
+AS=$(GNU_BIN)/$(GNU_TARGET)-as
--- a/configure/os/CONFIG.Common.deb12-x86_64
+++ b/configure/os/CONFIG.Common.deb12-x86_64
@@ -1,17 +0,0 @@
-# Debian 12
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86_64
-
-BUILD_CLASS = HOST
-
-STD_CXXFLAGS = -std=c++17
-
-ifneq ($(EPICS_HOST_ARCH),$(T_A))
-# Cross compile
-GNU_DIR = /opt/xgcc/gcc-12.2.0-deb12
-GNU_TARGET = x86_64-deb12-linux-gnu
-SYSROOT = $(GNU_DIR)/$(GNU_TARGET)/sys-root
-CMPLR_PREFIX = $(GNU_TARGET)-
-ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SYSROOT)/lib/x86_64-linux-gnu
-endif
--- a/configure/os/CONFIG.Common.eldk42-ppc4xxFP
+++ b/configure/os/CONFIG.Common.eldk42-ppc4xxFP
@@ -11,11 +11,15 @@ ELDK=/opt/eldk-4.2
 GNU_TARGET=ppc_4xxFP
 GNU_DIR=$(ELDK)/usr

+# This cross tool chain is installed in a somehow weired way
+# Without the following lines it does not work on RHEL7
+# but it worked on SL6
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/powerpc-linux
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/backward
+
 ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/lib
 ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/usr/lib

 # have no C++11
 STD_CXXFLAGS =
-
-# suppress strict alias warnings
-CODE_CPPFLAGS += -fno-strict-aliasing
--- a/configure/os/CONFIG.Common.eldk53-ppc4xxFP
+++ b/configure/os/CONFIG.Common.eldk53-ppc4xxFP
@@ -14,7 +14,8 @@ GNU_DIR = $(SDKTARGETSYSROOT)/$(SDK_HOST_ARCH)/usr
 GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
 GNU_TARGET_INCLUDE_DIR =
 GNU_TARGET=powerpc-linux
-SYSROOT = $(SDKTARGETSYSROOT)/$(GNU_ARCH)

 ARCH_DEP_CPPFLAGS =  -m32 -mcpu=440fp -mhard-float
+ARCH_DEP_CPPFLAGS += --sysroot=$(SDKTARGETSYSROOT)/$(GNU_ARCH)
+ARCH_DEP_LDFLAGS =   --sysroot=$(SDKTARGETSYSROOT)/$(GNU_ARCH)
 AS=$(GNU_BIN)/$(GNU_TARGET)-as
--- a/configure/os/CONFIG.Common.freebsdCommon
+++ b/configure/os/CONFIG.Common.freebsdCommon
@@ -7,10 +7,6 @@

 # Include definitions common to all Unix targets
 include $(CONFIG)/os/CONFIG.Common.UnixCommon
-GNU         = NO
-CMPLR_CLASS = clang
-CC          = clang
-CCC         = clang++

 OS_CLASS = freebsd

--- a/configure/os/CONFIG.Common.fslqoriq20-e6500_64
+++ b/configure/os/CONFIG.Common.fslqoriq20-e6500_64
@@ -0,0 +1,23 @@
+# 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
+SDKTARGETSYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
+
+ARCH_DEP_CPPFLAGS = --sysroot=$(SDKTARGETSYSROOT)
+ARCH_DEP_CFLAGS = -mcpu=e6500 -m64 -mhard-float
+ARCH_DEP_LDFLAGS = --sysroot=$(SDKTARGETSYSROOT)
+
+# warning -O2 and higher are broken!
+#OPT_CFLAGS_YES = -O1
+#OPT_CXXFLAGS_YES = -O1
--- a/configure/os/CONFIG.Common.gcc8-ppc4xxFP
+++ b/configure/os/CONFIG.Common.gcc8-ppc4xxFP
@@ -1,14 +1,21 @@
-# DeltaTau PowerPMAC with gcc 8.5
+# DeltaTau PowerPMAC with gcc

 # Include definitions common to all Linux targets
 include $(CONFIG)/os/CONFIG.Common.linuxCommon

 ARCH_CLASS = ppc

-GNU_DIR    = /opt/xgcc/gcc-8.5.0
-GNU_TARGET = powerpc-ppmac-linux-gnu
+SDK = gcc
+SDK_DIR = /opt/xgcc/gcc-8.5.0
+GNU_ARCH = powerpc-ppmac-linux-gnu
+SDKTARGETSYSROOT=$(SDK_DIR)/$(GNU_ARCH)/sys-root/
+GNU_DIR = $(SDK_DIR)
+GNU_BIN = $(GNU_DIR)/bin/
+GNU_TARGET_INCLUDE_DIR =
+GNU_TARGET=powerpc-ppmac-linux-gnu

-ARCH_DEP_CPPFLAGS = -m32 -mcpu=440fp -mhard-float
-ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(GNU_DIR)/$(GNU_TARGET)/sys-root/lib/powerpc-linux-gnu
-
-STD_CXXFLAGS = -std=c++17
+ARCH_DEP_CPPFLAGS =  -m32 -mcpu=440fp -mhard-float
+ARCH_DEP_LDFLAGS+=-Wl,-rpath,/opt/xgcc/gcc-8.5.0/$(GNU_ARCH)/lib
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SDKTARGETSYSROOT)/lib/powerpc-linux-gnu/
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SDKTARGETSYSROOT)/usr/lib/powerpc-linux-gnu/
+AS=$(GNU_BIN)/$(GNU_TARGET)-as
--- a/configure/os/CONFIG.Common.iosCommon
+++ b/configure/os/CONFIG.Common.iosCommon
@@ -42,6 +42,12 @@ ARCH_DEP_LDFLAGS += $(ARCH_DEP_FLAGS)
 OP_SYS_CFLAGS += -isysroot $(SDK_DIR)
 OP_SYS_LDFLAGS += -isysroot $(SDK_DIR)

+#--------------------------------------------------
+# Always compile in debugging symbol table information
+#
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g
+
 #-------------------------------------------------------
 # Compiler definitions:

@@ -71,7 +77,7 @@ OP_SYS_LDFLAGS += -dynamic -Z -L$(SDK_DIR)/usr/lib -L$(SDK_DIR)/usr/lib/system
 # Shared libraries
 SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
 SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \
-       -install_name $(abspath $(INSTALL_LIB))/$@ \
+       -install_name $(shell $(FULLPATHNAME) $(INSTALL_LIB))/$@ \
       -compatibility_version $(EPICS_VERSION).$(EPICS_REVISION) \
       -current_version $(SHRLIB_VERSION)
 SHRLIB_SUFFIX_BASE = .dylib
@@ -91,6 +97,11 @@ 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
--- a/configure/os/CONFIG.Common.linuxCommon
+++ b/configure/os/CONFIG.Common.linuxCommon
@@ -24,13 +24,13 @@ STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic

 # Set runtime path for shared libraries if LINKER_USE_RPATH=YES
-SHRLIBDIR_RPATH_LDFLAGS_YES = $(subst $(abspath $(LINKER_ORIGIN_ROOT)),$(FINAL_LOCATION),$(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)) $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
+SHRLIBDIR_RPATH_LDFLAGS_YES = $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
 SHRLIBDIR_RPATH_LDFLAGS_ORIGIN = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(SHRLIB_DEPLIB_DIRS))
 SHRLIBDIR_LDFLAGS += \
    $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))

 # Set runtime path for products if LINKER_USE_RPATH=YES
-PRODDIR_RPATH_LDFLAGS_YES = $(subst $(abspath $(LINKER_ORIGIN_ROOT)),$(FINAL_LOCATION),$(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)) $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
+PRODDIR_RPATH_LDFLAGS_YES = $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
 PRODDIR_RPATH_LDFLAGS_ORIGIN = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(PROD_DEPLIB_DIRS))
 PRODDIR_LDFLAGS += \
    $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
--- a/configure/os/CONFIG.Common.moxa42-armv6l
+++ b/configure/os/CONFIG.Common.moxa42-armv6l
@@ -3,9 +3,10 @@
 # Include definitions common to all Linux ARM targets
 include $(CONFIG)/os/CONFIG.Common.linux-arm

-GNU_DIR=/opt/moxa/arm-linux-4.4.2-v4
+GNU_DIR=/afs/psi.ch/project/embeddedlinux/moxa/arm-linux-4.4.2-v4
 GNU_TARGET=arm
 ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(GNU_DIR)/arm-none-linux-gnueabi/lib
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB)

 COMMANDLINE_LIBRARY = READLINE_NCURSES

@@ -16,10 +17,3 @@ ARCH_DEP_CFLAGS += -funwind-tables

 # have no full C++11
 STD_CXXFLAGS = -std=c++0x
-
-# suppress strict alias warnings
-CODE_CPPFLAGS += -fno-strict-aliasing
-
-# accept4() exists but does not work
-# Give fake __rtems__ macro to posix/osdSock.c because that disables accept4()
-osdSock_CFLAGS += -D__rtems__
--- a/configure/os/CONFIG.Common.mvl40-xscale_be
+++ b/configure/os/CONFIG.Common.mvl40-xscale_be
@@ -7,13 +7,10 @@ COMMANDLINE_LIBRARY = READLINE_CURSES

 ARCH_CLASS = xscale

-GNU_DIR=/opt/moxa/xscale_be/armv5teb-montavista-linuxeabi
+GNU_DIR=/afs/psi.ch/project/embeddedlinux/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 =

--- a/configure/os/CONFIG.Common.nilrt7-armv7a
+++ b/configure/os/CONFIG.Common.nilrt7-armv7a
@@ -1,5 +1,4 @@
 # National Instruments CompactRIO running LabView RT 19.5.1
-# requires RPM gcc-c++-arm-linux-gnu

 # Include definitions common to all Linux targets
 include $(CONFIG)/os/CONFIG.Common.linuxCommon
@@ -9,13 +8,11 @@ ARCH_CLASS = arm
 GNU_TARGET = arm-linux-gnu

 SYSROOT = /opt/LabVIEW-RT-19.5.1/arm/sysroots/armv7a-vfp-neon-nilrt-linux-gnueabi
-GNU_DIR = /opt/RHEL7
-
-# Needed on RHEL9:
-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
-ARCH_DEP_CXXFLAGS += -I=/usr/include/c++/4.7.2
+ARCH_DEP_CPPFLAGS += --sysroot=$(SYSROOT)
+ARCH_DEP_CPPFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi/
+ARCH_DEP_CPPFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/
+ARCH_DEP_LDFLAGS  += --sysroot=$(SYSROOT)

 COMMANDLINE_LIBRARY = READLINE_NCURSES
--- a/configure/os/CONFIG.Common.raspbian-arm
+++ b/configure/os/CONFIG.Common.raspbian-arm
@@ -10,13 +10,13 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 # Due to missing/messed up libs in the toolchain, readline needs copies of
 # libtinfo.so.5.9 and libreadline.so.6.2 from a Raspbian 7 rootfs
 # /lib/arm-linux-gnueabihf/ to the toolchain, e.g.
-# $(SDK_DIR)/$(SDK_TARGET)/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf/
+# $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf/
 # and manually created links libtinfo.so.5 and libreadline.so.
 # For gcc-linaro-arm-linux-gnueabihf-raspbian, an existing incompatible
 # libtinfo.so.5 is in the way. Remove it.
 # (Built with glibc 2.16 like installed on Raspbian 9 but toolchain uses glibc 2.13.)
 # Also copy /usr/include/readline/ directory from some readline 6 installation
-# to $(SDK_DIR)/$(SDK_TARGET)/arm-linux-gnueabihf/libc/usr/include/
+# to $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/usr/include/

 ARCH_CLASS = arm

@@ -25,10 +25,10 @@ SDK_DIR = /opt/raspberrypi/arm-bcm2708
 # Available SDK_TARGETs:

 # gcc 4.8.3 for 32 bit hosts with GLIBC 2.3 or higher
-# SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian
+SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian

 # gcc 4.8.3 for 64 bit hosts with GLIBC 2.14 or higher
-SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian-x64
+# SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian-x64

 # gcc 4.7.1 for 64 bit hosts with GLIBC 2.8 or higher
 # SDK_TARGET = arm-linux-gnueabihf
@@ -37,8 +37,5 @@ SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian-x64
 # SDK_TARGET = arm-bcm2708hardfp-linux-gnueabi
 # SDK_TARGET = arm-bcm2708-linux-gnueabi

-# gcc 4.9.3 for 64 bit hosts
-# arm-rpi-4.9.3-linux-gnueabihf
-
 GNU_DIR = $(SDK_DIR)/$(SDK_TARGET)
 GNU_TARGET = $(if $(filter arm-bcm2708%,SDK_TARGET),$(SDK_TARGET),arm-linux-gnueabihf)
--- a/configure/os/CONFIG.Common.vxWorks-e500v2
+++ b/configure/os/CONFIG.Common.vxWorks-e500v2
@@ -1,21 +0,0 @@
-# CONFIG.Common.vxWorks-e500v2
-#
-# Definitions for vxWorks-e500v2 target archs (MVME2500)
-# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-e500v2
-#-------------------------------------------------------
-
-# Include definitions common to all vxWorks target archs
-include $(CONFIG)/os/CONFIG.Common.vxWorksCommon
-
-# Vx GNU cross compiler suffix
-CMPLR_SUFFIX = ppc
-
-ARCH_CLASS = ppc
-
-# Architecture specific build flags
-ARCH_DEP_CFLAGS += -te500v2 -mhard-float
-ARCH_DEP_CPPFLAGS += -DCPU=PPC85XX
-ARCH_DEP_CFLAGS += -DCPU_VARIANT=_ppc85XX_e500v2
-ARCH_DEP_CFLAGS += -mlongcall
-
-GNU_TARGET = powerpc-wrs-vxworks
--- a/configure/os/CONFIG.Common.vxWorksCommon
+++ b/configure/os/CONFIG.Common.vxWorksCommon
@@ -145,6 +145,12 @@ 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
--- a/configure/os/CONFIG.Common.win32-x86-clang
+++ b/configure/os/CONFIG.Common.win32-x86-clang
@@ -1,18 +0,0 @@
-# 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
--- a/configure/os/CONFIG.Common.win32-x86-mingw
+++ b/configure/os/CONFIG.Common.win32-x86-mingw
@@ -12,7 +12,7 @@ ARCH_CLASS = x86
 POSIX = NO

 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
-LDLIBS_READLINE = -lreadline -ltermcap
+LDLIBS_READLINE = -lreadline -lcurses

 ARCH_DEP_CFLAGS += -m32
 ARCH_DEP_LDFLAGS += -m32
--- a/configure/os/CONFIG.Common.windows-x64-clang
+++ b/configure/os/CONFIG.Common.windows-x64-clang
@@ -1,18 +0,0 @@
-# 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
--- a/configure/os/CONFIG.Common.yocto21-aarch64
+++ b/configure/os/CONFIG.Common.yocto21-aarch64
@@ -0,0 +1,18 @@
+# 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/2017.2
+SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
+SDK_TARGET = aarch64-xilinx-linux
+GNU_TARGET = $(SDK_TARGET)
+SDKTARGETSYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
+
+ARCH_DEP_CPPFLAGS = --sysroot=$(SDKTARGETSYSROOT)
+ARCH_DEP_LDFLAGS = --sysroot=$(SDKTARGETSYSROOT)
--- a/configure/os/CONFIG.Common.yocto40-aarch64
+++ b/configure/os/CONFIG.Common.yocto40-aarch64
@@ -1,19 +0,0 @@
-# XILINX Zynq with Yocto 4.0 toolchain
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-ARCH_CLASS = arm64
-
-SDK = pokysdk
-SDK_DIR = /opt/yocto40-aarch64
-SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
-SDK_TARGET = cortexa53-poky-linux
-GNU_TARGET = aarch64-poky-linux
-SYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
-GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
-GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
-
-ARCH_DEP_CPPFLAGS = -mcpu=cortex-a53 -march=armv8-a+crc
-
-STD_CXXFLAGS = -std=c++23
--- a/configure/os/CONFIG.Linux.windows-x64
+++ b/configure/os/CONFIG.Linux.windows-x64
@@ -1,11 +0,0 @@
-include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
-
-VALID_BUILDS = Ioc Command
-
-MSVC_VERSION ?= 2019
-PATH := /opt/gfa-wine/bin:/opt/wine-msvc-$(MSVC_VERSION)/bin/x64:$(PATH)
-export 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:%=%;)$(abspath $(INSTALL_BIN))
--- a/configure/os/CONFIG.RHEL7-x86_64.Common
+++ b/configure/os/CONFIG.RHEL7-x86_64.Common
--- a/configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64
+++ b/configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64
--- a/configure/os/CONFIG.RHEL7-x86_64.SL6-x86
+++ b/configure/os/CONFIG.RHEL7-x86_64.SL6-x86
@@ -0,0 +1,6 @@
+# "cross compile" for older Linux version (32 bit)
+# It was neccessary to install 32 bit compatibility libraries manually
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.RHEL7-x86_64.SL6-x86_64
+TARGET_LDFLAGS = -B /usr/lib/x86_64-redhat-linux6E/lib
--- a/configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64
+++ b/configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64
@@ -0,0 +1,16 @@
+# "cross compile" for older Linux version
+# Use older compiler and older libraries
+# Used packages:
+# compat-gcc-44-c++-4.4.7
+# compat-gcc-44-4.4.7
+# compat-glibc-headers-2.12
+# compat-glibc-2.12
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44
+
+TARGET_CPPFLAGS = -isystem /usr/lib/x86_64-redhat-linux6E/include
+TARGET_LDFLAGS = -B /usr/lib/x86_64-redhat-linux6E/lib64
+LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo
--- a/configure/os/CONFIG.RHEL7-x86_64.win32-x86
+++ b/configure/os/CONFIG.RHEL7-x86_64.win32-x86
@@ -1,4 +1,5 @@
 include $(CONFIG)/os/CONFIG.win32-x86.win32-x86

+PATH_FILTER = $(subst /,/,$(1))
+
 PATH := /opt/wine-msvc-2017/bin/x86:$(PATH)
-export WINEPREFIX = $(HOME)/.wine32-$(EPICS_HOST_ARCH)
--- a/configure/os/CONFIG.RHEL7-x86_64.windows-x64
+++ b/configure/os/CONFIG.RHEL7-x86_64.windows-x64
@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
+
+PATH_FILTER = $(subst /,/,$(1))
+
+PATH := /opt/wine-msvc-2017/bin/x64:$(PATH)
--- a/configure/os/CONFIG.RHEL8-x86_64.win32-x86
+++ b/configure/os/CONFIG.RHEL8-x86_64.win32-x86
@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
+
+PATH_FILTER = $(subst /,/,$(1))
+
+PATH := /opt/wine-msvc-2017/bin/x86:$(PATH)
--- a/configure/os/CONFIG.RHEL8-x86_64.windows-x64
+++ b/configure/os/CONFIG.RHEL8-x86_64.windows-x64
@@ -1 +1,5 @@
-include $(CONFIG)/os/CONFIG.Linux.windows-x64
+include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
+
+PATH_FILTER = $(subst /,/,$(1))
+
+PATH := /opt/wine-msvc-2017/bin/x64:$(PATH)
--- a/configure/os/CONFIG.RHEL8-x86_64.windows-x64-mingw
+++ b/configure/os/CONFIG.RHEL8-x86_64.windows-x64-mingw
@@ -1 +0,0 @@
-include  $(CONFIG)/os/CONFIG.linux-x86_64.windows-x64-mingw
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`include $(CONFIG)/os/CONFIG.Common.linux-clang`
				`@@ -1 +0,0 @@`
				`include $(CONFIG)/os/CONFIG.linux-x86_64.windows-x64-mingw`