fix rpm dependencies

readthedocs build does not include these.

.appveyor.yml

@@ -82,8 +82,9 @@ matrix:
 #---------------------------------#
 
 install:
+  - cmd: set PATH=C:\Python38-x64;%PATH%
   - cmd: git submodule update --init --recursive
-  - cmd: pip install git+https://github.com/mdavidsaver/ci-core-dumper#egg=ci-core-dumper
+  - cmd: python -m pip install git+https://github.com/mdavidsaver/ci-core-dumper#egg=ci-core-dumper
   - cmd: python .ci/cue.py prepare
 
 build_script:
@@ -121,10 +122,4 @@ on_failure:
 #---------------------------------#
 
 notifications:
-
-  - provider: Email
-    to:
-      - core-talk@aps.anl.gov
-    on_build_success: false
-
   - provider: GitHubPullRequest

.appveyor/epics-base-7.yml

@@ -89,8 +89,9 @@ matrix:
 #---------------------------------#
 
 install:
+  - cmd: set PATH=C:\Python38-x64;%PATH%
   - cmd: git submodule update --init --recursive
-  - cmd: pip install git+https://github.com/mdavidsaver/ci-core-dumper#egg=ci-core-dumper
+  - cmd: python -m pip install git+https://github.com/mdavidsaver/ci-core-dumper#egg=ci-core-dumper
   - cmd: python .ci/cue.py prepare
 
 build_script:
@@ -128,10 +129,4 @@ on_failure:
 #---------------------------------#
 
 notifications:
-
-  - provider: Email
-    to:
-      - core-talk@aps.anl.gov
-    on_build_success: false
-
   - provider: GitHubPullRequest

.editorconfig

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

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

@@ -50,9 +50,9 @@ jobs:
       matrix:
         # Job names also name artifacts, character limitations apply
         include:
-          - os: ubuntu-24.04
+          - name: "Ub-24 gcc c++20 Werror"
+            os: ubuntu-24.04
             cmp: gcc
-            name: "Ub-24 gcc-13 c++20 Werror"
             # Turn all warnings into errors,
             # except for those we could not fix (yet).
             # Remove respective -Wno-error=... flag once it is fixed.
@@ -73,127 +73,141 @@ jobs:
                                   -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3'
                     CMD_LDFLAGS=-Wl,-z,relro"
 
-          - os: ubuntu-22.04
-            cmp: gcc
-            configuration: default
-            cross: "windows-x64-mingw"
-            name: "Ub-22 gcc + MinGW"
-
-          - os: ubuntu-22.04
-            cmp: gcc
-            configuration: static
-            cross: "windows-x64-mingw"
-            name: "Ub-22 gcc + MinGW, static"
-
-          - os: ubuntu-22.04
+          - name: "Ub-22 gcc C++11, static"
+            os: ubuntu-22.04
             cmp: gcc
             configuration: static
             extra: "CMD_CXXFLAGS=-std=c++11"
-            name: "Ub-22 gcc C++11, static"
 
-          - os: ubuntu-22.04
+          - name: "Ub-22 gcc u-char"
+            os: ubuntu-22.04
             cmp: gcc
             configuration: static
             extra: "CMD_CFLAGS=-funsigned-char CMD_CXXFLAGS=-funsigned-char"
-            name: "Ub-22 gcc unsigned char"
 
-          - os: ubuntu-22.04
+          - name: "Ub-22 clang"
+            os: ubuntu-22.04
             cmp: clang
             configuration: default
-            name: "Ub-22 clang"
 
-          - os: ubuntu-22.04
+          - name: "Ub-22 clang C++11"
+            os: ubuntu-22.04
             cmp: clang
             configuration: default
             extra: "CMD_CXXFLAGS=-std=c++11"
-            name: "Ub-22 clang C++11"
 
-          - os: ubuntu-22.04
+          - name: "MacOS clang"
+            os: macos-latest
+            cmp: clang
+            configuration: default
+
+          # Cross builds
+
+          - name: "Ub gcc + linux-aarch64"
+            os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            cross: "linux-aarch64"
+
+          - name: "Ub gcc + linux-arm gnueabi"
+            os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            cross: "linux-arm@arm-linux-gnueabi"
+
+          - name: "Ub gcc + linux-arm gnueabihf"
+            os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            cross: "linux-arm@arm-linux-gnueabihf"
+
+          - name: "Ub-22 gcc + MinGW"
+            os: ubuntu-22.04
+            cmp: gcc
+            configuration: default
+            cross: "windows-x64-mingw"
+
+          - name: "Ub-22 gcc + MinGW, static"
+            os: ubuntu-22.04
+            cmp: gcc
+            configuration: static
+            cross: "windows-x64-mingw"
+
+          - name: "Ub-22 gcc + RT-4.9 pc386"
+            os: ubuntu-22.04
+            cmp: gcc
+            configuration: default
+            cross: "RTEMS-pc386-qemu@4.9"
+
+          - name: "Ub-22 gcc + RT-4.10 pc386"
+            os: ubuntu-22.04
+            cmp: gcc
+            configuration: default
+            cross: "RTEMS-pc386-qemu@4.10"
+            test: NO
+
+          - name: "Ub-22 gcc + RT-5.1 pc686"
+            os: ubuntu-22.04
             cmp: gcc
             configuration: default
             cross: "RTEMS-pc686-qemu@5"
-            name: "Ub-22 gcc + RT-5.1 pc686"
 
-          - os: ubuntu-22.04
+          - name: "Ub-22 gcc + RT-5.1 beatnik"
+            os: ubuntu-22.04
             cmp: gcc
             configuration: default
             cross: "RTEMS-beatnik@5"
             test: NO
-            name: "Ub-22 gcc + RT-5.1 beatnik"
 
-          - os: ubuntu-22.04
+          - name: "Ub-22 gcc + RT-5.1 xilinx_zynq_a9_qemu"
+            os: ubuntu-22.04
             cmp: gcc
             configuration: default
             cross: "RTEMS-xilinx_zynq_a9_qemu@5"
             test: NO
-            name: "Ub-22 gcc + RT-5.1 xilinx_zynq_a9_qemu"
 
-          - os: ubuntu-22.04
+          - name: "Ub-22 gcc + RT-5.1 uC5282"
+            os: ubuntu-22.04
             cmp: gcc
             configuration: default
             cross: "RTEMS-uC5282@5"
             test: NO
-            name: "Ub-22 gcc + RT-5.1 uC5282"
 
-          - os: ubuntu-22.04
-            cmp: gcc
-            configuration: default
-            name: "Ub-22 gcc + RT-4.10"
-            cross: "RTEMS-pc386-qemu@4.10"
-            test: NO
+          # Windows builds
 
-          - os: ubuntu-22.04
-            cmp: gcc
-            configuration: default
-            name: "Ub-22 gcc + RT-4.9"
-            cross: "RTEMS-pc386-qemu@4.9"
-
-          - os: macos-latest
-            cmp: clang
-            configuration: default
-            name: "MacOS clang"
-
-          - os: windows-2019
-            cmp: vs2019
+          - name: "Win-22 MSC-22"
+            os: windows-2022
+            cmp: vs2022
             configuration: debug
-            name: "Win2019 MSC-19"
-            extra: "CMD_CXXFLAGS=-analysis"
+            extra: "CMD_CXXFLAGS=-analyze"
 
-          - os: windows-2019
-            cmp: vs2019
+          - name: "Win-22 MSC-22, static"
+            os: windows-2022
+            cmp: vs2022
             configuration: static-debug
-            name: "Win2019 MSC-19, static"
-            extra: "CMD_CXXFLAGS=-analysis"
+            extra: "CMD_CXXFLAGS=-analyze"
 
-          - os: windows-2019
-            cmp: vs2019
+          - name: "Win-22 MSC-22, debug"
+            os: windows-2022
+            cmp: vs2022
             configuration: debug
-            name: "Win2019 MSC-19, debug"
 
-          - os: windows-2019
+          - name: "Win-22 MSC-22 c++14, debug"
+            os: windows-2022
+            cmp: vs2022
+            configuration: debug
+            extra: "CMD_CXXFLAGS='-analyze -Zc:__cplusplus -std:c++14'"
+
+          - name: "Win-22 MSC-22 c++17, debug"
+            os: windows-2022
+            cmp: vs2022
+            configuration: debug
+            extra: "CMD_CXXFLAGS='-analyze -Zc:__cplusplus -std:c++17'"
+
+          - name: "Win-22 mingw"
+            os: windows-2022
             cmp: gcc
             configuration: default
-            name: "Win2019 mingw"
-
-          # Cross builds
-
-          - os: ubuntu-latest
-            cmp: gcc
-            configuration: default
-            name: "Cross linux-aarch64"
-            cross: linux-aarch64
-
-          - os: ubuntu-latest
-            cmp: gcc
-            configuration: default
-            name: "Cross linux-arm gnueabi"
-            cross: linux-arm@arm-linux-gnueabi
-
-          - os: ubuntu-latest
-            cmp: gcc
-            configuration: default
-            name: "Cross linux-arm gnueabihf"
-            cross: linux-arm@arm-linux-gnueabihf
 
     steps:
     - uses: actions/checkout@v4
@@ -322,7 +336,7 @@ jobs:
         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
+          libevent-devel sudo re2c perl-version
         [ -e /usr/bin/python ] || ln -sf /usr/bin/python3 /usr/bin/python
 
         # fake out cue.py

.gitignore

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

.gitmodules

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

Makefile

@@ -23,3 +23,13 @@ DIRS += modules
 modules_DEPEND_DIRS = src
 
 include $(TOP)/configure/RULES_TOP
+
+UNINSTALL_DIRS += $(INSTALL_LOCATION)/src
+copysrc:
+	tar cf - --exclude-vcs --exclude-backups --exclude=O.* modules/*/src | tar xf - -C $(INSTALL_LOCATION)
+
+tar:
+	tar cfjP epics_base-$(EPICS_VERSION_NUMBER).tar.bz2 $(INSTALL_LOCATION)
+
+rpm:
+	rpmbuild -bb epics-base.spec

README

@@ -13,15 +13,7 @@ this distribution.
 
 ---------------------------------------------------------
 
-Installation and release information can be found in the
-various files in the documentation subdirectory.
-
-Additional information about EPICS including mailing list
-archives and subscription instructions, documentation and
-training materials, additional components, links to other
-websites etc. is available on the EPICS home page at
-	https://epics.anl.gov/
+For more information, see the README.md file.
 
 $Format:%cD$
 $Format:%H$
-https://code.launchpad.net/epics-base

README.md

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

configure/CONFIG.gnuCommon

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

configure/CONFIG.msvcCommon

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

configure/CONFIG_ADDONS

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

configure/CONFIG_BASE_VERSION

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

configure/CONFIG_CA_VERSION

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

configure/CONFIG_COMMON

@@ -147,7 +147,7 @@ CMPLR_SRC_DIRS += . $(foreach dir, .. $(SRC_DIRS), \
 ALL_SRC_DIRS = $(CMPLR_SRC_DIRS) $(OS_SRC_DIRS) $(GENERIC_SRC_DIRS)
 
 #--------------------------------------------------
-# Directory for OS independant build created files
+# Directory for OS independent build created files
 COMMON_DIR = ../O.Common
 
 # compile line include directories

configure/CONFIG_DATABASE_VERSION

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

configure/CONFIG_ENV

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

configure/CONFIG_LIBCOM_VERSION

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

configure/CONFIG_SITE

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

configure/CONFIG_SITE_ENV

@@ -71,7 +71,7 @@ EPICS_TS_NTP_INET=
 #	Number of lines of command history to keep.
 # IOCSH_HISTEDIT_DISABLE
 # 	Prevents use of readline or equivalent if defined.
-IOCSH_PS1="epics> "
+IOCSH_PS1=ANSI_GREEN("epics> ")
 IOCSH_HISTSIZE=50
 IOCSH_HISTEDIT_DISABLE=
 

configure/RULES.Db

@@ -55,7 +55,7 @@ DBD += $(foreach type, $(CROSS_TARGET_OS_TYPES), $(DBD_$(type)))
 # DBD_solaris += abcSolaris.dbd
 #
 # ---------------------------------------------------
-# DBD concatination files
+# DBD concatenation files
 
 COMMON_DBDCATS += $(addprefix $(COMMON_DIR)/,$(DBDCAT))
 DBDCAT_SOURCES += $(foreach file, $($*_DBD), $(DBDCAT_SOURCE) )
@@ -194,7 +194,7 @@ ifneq (,$(strip $(DBDDEPENDS_FILES)))
 endif
 
 #---------------------------------------------------------------
-# build dependancies, clean rule
+# build dependencies, clean rule
 
 inc: $(COMMON_INC) $(INSTALL_INC) $(COMMON_DBDS) $(COMMON_DBDCATS) \
 	$(INSTALL_DBDS) $(INSTALL_DBD_INSTALLS) $(COMMON_DOCS)

configure/RULES_ARCHS

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

configure/RULES_BUILD

@@ -101,6 +101,23 @@ include $(CONFIG)/RULES_FILE_TYPE
 
 include $(CONFIG)/RULES.Db
 
+#---------------------------------------------------------------
+# Do not build anything if current path matches SKIP_BUILDS
+
+ifneq (,$(strip $(SKIP_BUILDS)))
+CURRENT_MODULE=$(subst modules/,,$(subst $(realpath $(TOP)/..)/,,$(subst $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)/,,$(realpath ..))))
+ifneq ($(filter $(SKIP_BUILDS) $(addsuffix /%,$(SKIP_BUILDS)),$(CURRENT_MODULE)),)
+$(info Skipping $(CURRENT_MODULE) for $(T_A))
+PROD=
+TESTPROD=
+LIBRARY=
+TESTLIBRARY=
+LOADABLE_LIBRARY=
+TESTS=
+SRC_FILES=
+endif
+endif
+
 #---------------------------------------------------------------
 # Include defines and rules for prod, library and test* targets
 
@@ -197,7 +214,7 @@ $(sort $(DIRECTORY_TARGETS)):
 	$(MKDIR) $@
 
 # Install LIB_INSTALLS libraries before linking executables
-$(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS)
+$(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS) $(TESTSHRLIBNAME)
 
 # Install built libraries too, unless Makefile says to wait
 ifneq ($(DELAY_INSTALL_LIBS),YES)
@@ -227,7 +244,7 @@ $(LOADABLE_SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)
 
 $(TESTPRODNAME) $(PRODNAME): $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)
 
-$(TESTPRODNAME) $(PRODNAME): %$(EXE): | $(INSTALL_LIB)
+$(TESTPRODNAME) $(PRODNAME): %$(EXE):
 	@$(RM) $@
 	$(LINK.cpp)
 	$(MT_EXE_COMMAND)
@@ -330,10 +347,6 @@ $(LOADABLE_SHRLIBNAME): $(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX):
 	$(LINK.shrlib)
 	$(MT_DLL_COMMAND)
 
-$(LIBNAME) $(SHRLIBNAME) $(LOADABLE_SHRLIBNAME): | $(INSTALL_LIB)
-$(INSTALL_LIB):
-	@$(MKDIR) $@
-
 #---------------------------------------------------------------
 # C++ munching for VxWorks
 
@@ -502,6 +515,13 @@ ifneq (,$(strip $(SHRLIB_VERSION)))
 	@$(RM) $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 	ln -s $< $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 endif # SHRLIB_VERSION
+else  # SHRLIB_SUFFIX
+ifeq ($(BUILD_CLASS),HOST)
+ifneq (,$(strip $(SHRLIB_VERSION)))
+	@$(RM) $@.$(SHRLIB_VERSION)
+	ln -s $< $@.$(SHRLIB_VERSION)
+endif # HOST
+endif # SHRLIB_VERSION
 endif # SHRLIB_SUFFIX
 
 ifneq ($(INSTALL_TCLLIB),$(INSTALL_BIN))
@@ -562,11 +582,11 @@ $(INSTALL_DOC)/%: $(COMMON_DIR)/%
 
 $(INSTALL_DOC)/%: %
 	$(ECHO) "Installing doc $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_DOC)/%: ../%
 	$(ECHO) "Installing doc $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_HTML)/$(HTMLS_DIR)/%: $(COMMON_DIR)/%
 	$(ECHO) "Installing generated html $@"

configure/RULES_DIRS

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

configure/RULES_MODULES

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

configure/Sample.Makefile

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

configure/os/CONFIG.Common.RHEL8-x86_64

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

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

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

configure/os/CONFIG.Common.RHEL9-x86_64

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

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

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

configure/os/CONFIG.Common.RTEMS

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

configure/os/CONFIG.Common.RTEMS-beagleboneblack

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

configure/os/CONFIG.Common.RTEMS-pc686

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

configure/os/CONFIG.Common.RTEMS-qoriq_e500

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

configure/os/CONFIG.Common.RTEMS-xilinx_zynq_a9_qemu

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

configure/os/CONFIG.Common.RTEMS-xilinx_zynq_microzed

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

configure/os/CONFIG.Common.RTEMS-xilinx_zynq_zedboard

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

configure/os/CONFIG.Common.RTEMS49-pc386

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

configure/os/CONFIG.Common.RTEMS51-pc686

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

configure/os/CONFIG.Common.UnixCommon

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

configure/os/CONFIG.Common.V69-ppc604

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

configure/os/CONFIG.Common.deb10-x86_64

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

configure/os/CONFIG.Common.deb12-x86_64

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

configure/os/CONFIG.Common.eldk42-ppc4xxFP

@@ -0,0 +1,21 @@
+# DeltaTau PowerPMAC with ELDK 4.2
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+ARCH_CLASS = ppc
+
+ELDK=/opt/eldk-4.2
+GNU_TARGET=ppc_4xxFP
+GNU_DIR=$(ELDK)/usr
+
+ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/lib
+ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/usr/lib
+
+# have no C++11
+STD_CXXFLAGS =
+
+# suppress strict alias warnings
+CODE_CPPFLAGS += -fno-strict-aliasing

configure/os/CONFIG.Common.eldk51-ppc4xxSF

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

configure/os/CONFIG.Common.eldk52-e500v2

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

configure/os/CONFIG.Common.eldk53-ppc4xxFP

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

configure/os/CONFIG.Common.gcc8-ppc4xxFP

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

configure/os/CONFIG.Common.iosCommon

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

configure/os/CONFIG.Common.linux-clang

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

configure/os/CONFIG.Common.linuxCommon

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

configure/os/CONFIG.Common.moxa42-armv6l

@@ -0,0 +1,25 @@
+# Moxa DA-66x with SDK 4.2 and ARM7 processor
+
+# Include definitions common to all Linux ARM targets
+include $(CONFIG)/os/CONFIG.Common.linux-arm
+
+GNU_DIR=/opt/moxa/arm-linux-4.4.2-v4
+GNU_TARGET=arm
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(GNU_DIR)/arm-none-linux-gnueabi/lib
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# suppress note "the mangling of 'va_list' has changed in GCC 4.4"
+ARCH_DEP_CXXFLAGS += -Wno-psabi
+
+ARCH_DEP_CFLAGS += -funwind-tables
+
+# have no full C++11
+STD_CXXFLAGS = -std=c++0x
+
+# suppress strict alias warnings
+CODE_CPPFLAGS += -fno-strict-aliasing
+
+# accept4() exists but does not work
+# Give fake __rtems__ macro to posix/osdSock.c because that disables accept4()
+osdSock_CFLAGS += -D__rtems__

configure/os/CONFIG.Common.mvl40-xscale_be

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

configure/os/CONFIG.Common.nilrt7-armv7a

@@ -0,0 +1,21 @@
+# National Instruments CompactRIO running LabView RT 19.5.1
+# requires RPM gcc-c++-arm-linux-gnu
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = arm
+
+GNU_TARGET = arm-linux-gnu
+
+SYSROOT = /opt/LabVIEW-RT-19.5.1/arm/sysroots/armv7a-vfp-neon-nilrt-linux-gnueabi
+GNU_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
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES

configure/os/CONFIG.Common.raspbian-arm

@@ -0,0 +1,44 @@
+# RaspberryPi with github.com/raspberrypi/tools toolchain
+# Tested on:
+# * Raspberry 3B+ Raspbian 9
+# * Raspberry 2   Raspbian 7
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+# Using readline:
+# Due to missing/messed up libs in the toolchain, readline needs copies of
+# libtinfo.so.5.9 and libreadline.so.6.2 from a Raspbian 7 rootfs
+# /lib/arm-linux-gnueabihf/ to the toolchain, e.g.
+# $(SDK_DIR)/$(SDK_TARGET)/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf/
+# and manually created links libtinfo.so.5 and libreadline.so.
+# For gcc-linaro-arm-linux-gnueabihf-raspbian, an existing incompatible
+# libtinfo.so.5 is in the way. Remove it.
+# (Built with glibc 2.16 like installed on Raspbian 9 but toolchain uses glibc 2.13.)
+# Also copy /usr/include/readline/ directory from some readline 6 installation
+# to $(SDK_DIR)/$(SDK_TARGET)/arm-linux-gnueabihf/libc/usr/include/
+
+ARCH_CLASS = arm
+
+SDK_DIR = /opt/raspberrypi/arm-bcm2708
+
+# Available SDK_TARGETs:
+
+# gcc 4.8.3 for 32 bit hosts with GLIBC 2.3 or higher
+# SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian
+
+# gcc 4.8.3 for 64 bit hosts with GLIBC 2.14 or higher
+SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian-x64
+
+# gcc 4.7.1 for 64 bit hosts with GLIBC 2.8 or higher
+# SDK_TARGET = arm-linux-gnueabihf
+
+# gcc 4.7.1 for 32 bit hosts with GLIBC 2.4 or higher
+# SDK_TARGET = arm-bcm2708hardfp-linux-gnueabi
+# SDK_TARGET = arm-bcm2708-linux-gnueabi
+
+# gcc 4.9.3 for 64 bit hosts
+# arm-rpi-4.9.3-linux-gnueabihf
+
+GNU_DIR = $(SDK_DIR)/$(SDK_TARGET)
+GNU_TARGET = $(if $(filter arm-bcm2708%,SDK_TARGET),$(SDK_TARGET),arm-linux-gnueabihf)

configure/os/CONFIG.Common.vxWorksCommon

@@ -145,12 +145,6 @@ CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VXWORKS_MAJOR_VERSION))
 SHRLIB_CFLAGS =
 SHRLIB_LDFLAGS =
 
-#--------------------------------------------------
-# Don't use gcc 2.x for dependency generation
-
-HDEPENDS_METHOD_2 = MKMF
-HDEPENDS_METHOD = $(firstword $(HDEPENDS_METHOD_$(VX_GNU_MAJOR_VERSION)) COMP)
-
 #--------------------------------------------------
 # osithead use default stack, YES or NO override
 OSITHREAD_USE_DEFAULT_STACK = NO

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

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

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

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

configure/os/CONFIG.Common.yocto40-aarch64

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

configure/os/CONFIG.Linux.win32-x86

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

configure/os/CONFIG.Linux.windows-x64

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

configure/os/CONFIG.RHEL8-x86_64.Common

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

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

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

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

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

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

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

configure/os/CONFIG.RHEL9-x86_64.Common

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

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

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

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

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

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

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

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

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

configure/os/CONFIG.darwinCommon.darwinCommon

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

configure/os/CONFIG.deb10-x86_64.Common

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

configure/os/CONFIG.deb10-x86_64.deb10-x86_64

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

configure/os/CONFIG.deb12-x86_64.Common

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

configure/os/CONFIG.deb12-x86_64.deb12-x86_64

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

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

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

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

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

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

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

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

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

configure/os/CONFIG_SITE.Common.RTEMS

@@ -24,6 +24,9 @@
 #RTEMS_VERSION = 5
 #RTEMS_BASE = /usr/local/vw/rtems/rtems-5.1
 
+# PSI:
+RTEMS_BASE = /opt/rtems/$(RTEMS_VERSION)
+
 # Cross-compile toolchain in $(RTEMS_TOOLS)/bin
 #
 RTEMS_TOOLS = $(RTEMS_BASE)

configure/os/CONFIG_SITE.Common.deb10-x86_64

@@ -0,0 +1,2 @@
+# Debian 10
+COMMANDLINE_LIBRARY=READLINE_NCURSES

configure/os/CONFIG_SITE.Common.deb12-x86_64

@@ -0,0 +1,2 @@
+# Debian 10
+COMMANDLINE_LIBRARY=READLINE

configure/os/CONFIG_SITE.Common.gcc8-ppc4xxFP

@@ -0,0 +1,2 @@
+# DeltaTau PowerPMAC with gcc
+COMMANDLINE_LIBRARY=READLINE

configure/os/CONFIG_SITE.Common.linuxCommon

@@ -8,3 +8,19 @@
 # They must be set in the host+target specific file instead:
 #   CONFIG_SITE.<linux-arch>.<linux-arch>
 
+COMMANDLINE_LIBRARY = READLINE
+
+USR_CXXFLAGS += $(STD_CXXFLAGS)
+STD_CXXFLAGS = -std=c++11
+USR_CFLAGS += $(STD_CFLAGS)
+
+TOOLSET_DIR      = $(TOOLSET:%=$(TOOLSET_LOCATION)/%/root)
+GNU_DIR = $(SYSROOT)$(TOOLSET_DIR)
+CPPFLAGS += $(SYSROOT:%=--sysroot=%)
+LDFLAGS  += $(SYSROOT:%=--sysroot=%)
+
+# backward compatibility: Keep unversioned libs
+# in order to prevent dynamic linking problems
+# when minor changes increment *_MAINTENANCE_VERSION
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -21,5 +21,12 @@ VXWORKS_VERSION = 6.9
 # WIND_BASE is where you installed the Wind River software.
 
 #WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
-WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
+#WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
 #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
+WIND_BASE = /opt/VxWorks/VxWorks$(VXWORKS_VERSION)
+
+# For the license counter
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
+
+softIoc_LDFLAGS += -whole-archive
+softIocPVA_LDFLAGS += -whole-archive

configure/os/CONFIG_SITE.RHEL8-x86_64.Common

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

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

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

configure/os/CONFIG_SITE.RHEL9-x86_64.Common

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

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

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

configure/os/CONFIG_SITE.UnixCommon.Common

@@ -0,0 +1,5 @@
+# Make sure hosts tools find their libraries during build
+# even if FINAL_LOCATION differs from INSTALL_LOCATION
+ifneq ($(FINAL_LOCATION:$(INSTALL_LOCATION)=),)
+export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH:%=%:)$(INSTALL_HOST_LIB)
+endif

configure/os/CONFIG_SITE.darwinCommon.darwinCommon

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

configure/os/CONFIG_SITE.linux-x86.Common

@@ -5,3 +5,32 @@
 
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-ppc32
 #CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386-qemu
+
+INSTALL_LOCATION=/usr/local/epics/base-$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
+
+GNU_HOST_ARCH=i686
+GNU_HOST_OS=linux
+
+# vxWorks for MVxxxx boards
+CROSS_COMPILER_TARGET_ARCHS += V69-ppc604
+
+# MOXA montavista linux (No PVA because of missing boost support)
+CROSS_COMPILER_TARGET_ARCHS += mvl40-xscale_be
+
+# MOXA SDK 4.2
+CROSS_COMPILER_TARGET_ARCHS += moxa42-armv6l
+
+# Virtex embedded PPC
+CROSS_COMPILER_TARGET_ARCHS += eldk51-ppc4xxSF
+
+# IOxOS IFC1210
+CROSS_COMPILER_TARGET_ARCHS += eldk52-e500v2
+
+# DeltaTau PowerPMAC
+CROSS_COMPILER_TARGET_ARCHS += eldk42-ppc4xxFP
+CROSS_COMPILER_TARGET_ARCHS += eldk53-ppc4xxFP
+
+# RTEMS (Can only have 1 RTEMS major version in 1 EPICS installation
+# because they overwrite their header files.)
+#CROSS_COMPILER_TARGET_ARCHS += RTEMS49-pc386
+CROSS_COMPILER_TARGET_ARCHS += RTEMS51-pc686

configure/os/CONFIG_SITE.linux-x86.RTEMS

@@ -4,5 +4,5 @@
 #-------------------------------------------------------
 
 # Needed by gcc
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(RTEMS_BASE)/lib
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(RTEMS_BASE)/lib
 

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

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

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

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

configure/os/CONFIG_SITE.linux-x86_64.Common

@@ -7,3 +7,30 @@
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
 #CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100
 
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
+
+GNU_HOST_ARCH_64=x86_64
+
+# Windows cross builds using Wine
+CROSS_COMPILER_TARGET_ARCHS += windows-x64
+CROSS_COMPILER_RUNTEST_ARCHS += windows-x64
+
+# Windows cross builds using mingw
+CROSS_COMPILER_TARGET_ARCHS += windows-x64-mingw
+CROSS_COMPILER_RUNTEST_ARCHS += windows-x64-mingw
+
+# Zynq
+CROSS_COMPILER_TARGET_ARCHS += yocto40-aarch64
+
+# Debian
+CROSS_COMPILER_TARGET_ARCHS += deb10-x86_64
+CROSS_COMPILER_TARGET_ARCHS += deb12-x86_64
+
+# Newer DeltaTau PowerPMAC
+CROSS_COMPILER_TARGET_ARCHS += gcc8-ppc4xxFP
+
+# Raspberry Pi
+CROSS_COMPILER_TARGET_ARCHS += raspbian-arm
+
+# NI Linux Real-Time 7.x
+CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a

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

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

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

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

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

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