diff --git a/configure/os/CONFIG.Common.RHEL7-x86_64 b/configure/os/CONFIG.Common.RHEL7-x86_64 deleted file mode 100644 index 7960c4fa9..000000000 --- a/configure/os/CONFIG.Common.RHEL7-x86_64 +++ /dev/null @@ -1,8 +0,0 @@ -# Include definitions common to linux pentium targets -include $(CONFIG)/os/CONFIG.Common.linux-x86_64 - -BUILD_CLASS = HOST - -TOOLSET_LOCATION = /opt/rh -TOOLSET = devtoolset-12 -STD_CXXFLAGS = -std=c++20 diff --git a/configure/os/CONFIG.Common.RHEL7-x86_64-clang b/configure/os/CONFIG.Common.RHEL7-x86_64-clang deleted file mode 100644 index 8653b569d..000000000 --- a/configure/os/CONFIG.Common.RHEL7-x86_64-clang +++ /dev/null @@ -1,3 +0,0 @@ -include $(CONFIG)/os/CONFIG.Common.linux-clang - -BUILD_CLASS = HOST diff --git a/configure/os/CONFIG.Common.T2-ppc604 b/configure/os/CONFIG.Common.T2-ppc604 deleted file mode 100644 index 3f71a6d5f..000000000 --- a/configure/os/CONFIG.Common.T2-ppc604 +++ /dev/null @@ -1,8 +0,0 @@ -include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long -VXWORKS_VERSION = 5.5.1 -WIND_BASE = /opt/VxWorks/Tornado2.2.1 - -#there is a problem with our ccppc and optimization -# -O0 works, -O and -O1 and higher are buggy -OPT_CFLAGS_YES = -O0 -OPT_CXXFLAGS_YES = -O0 diff --git a/configure/os/CONFIG.Common.V62-ppc604 b/configure/os/CONFIG.Common.V62-ppc604 deleted file mode 100644 index cc789ca10..000000000 --- a/configure/os/CONFIG.Common.V62-ppc604 +++ /dev/null @@ -1,2 +0,0 @@ -include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long -VXWORKS_VERSION = 6.2 diff --git a/configure/os/CONFIG.Common.V63-ppc603 b/configure/os/CONFIG.Common.V63-ppc603 deleted file mode 100644 index 910283dd2..000000000 --- a/configure/os/CONFIG.Common.V63-ppc603 +++ /dev/null @@ -1,5 +0,0 @@ -include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long -VXWORKS_VERSION = 6.3 - -# Buggy "uninitialized variable" warning produces many false positives -ARCH_DEP_CXXFLAGS += -Wno-uninitialized diff --git a/configure/os/CONFIG.Common.V63-ppc604 b/configure/os/CONFIG.Common.V63-ppc604 deleted file mode 100644 index 3315e8fe2..000000000 --- a/configure/os/CONFIG.Common.V63-ppc604 +++ /dev/null @@ -1,5 +0,0 @@ -include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long -VXWORKS_VERSION = 6.3 - -# Buggy "uninitialized variable" warning produces many false positives -ARCH_DEP_CXXFLAGS += -Wno-uninitialized diff --git a/configure/os/CONFIG.Common.V64-ppc604 b/configure/os/CONFIG.Common.V64-ppc604 deleted file mode 100644 index 684d3cbd9..000000000 --- a/configure/os/CONFIG.Common.V64-ppc604 +++ /dev/null @@ -1,5 +0,0 @@ -include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long -VXWORKS_VERSION = 6.4 - -# Buggy "uninitialized variable" warning produces many false positives -ARCH_DEP_CXXFLAGS += -Wno-uninitialized diff --git a/configure/os/CONFIG.Common.V66-ppc603 b/configure/os/CONFIG.Common.V66-ppc603 deleted file mode 100644 index 8bcdabf06..000000000 --- a/configure/os/CONFIG.Common.V66-ppc603 +++ /dev/null @@ -1,2 +0,0 @@ -include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long -VXWORKS_VERSION = 6.6 diff --git a/configure/os/CONFIG.Common.V66-ppc604 b/configure/os/CONFIG.Common.V66-ppc604 deleted file mode 100644 index c450c7d71..000000000 --- a/configure/os/CONFIG.Common.V66-ppc604 +++ /dev/null @@ -1,2 +0,0 @@ -include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long -VXWORKS_VERSION = 6.6 diff --git a/configure/os/CONFIG.Common.V67-ppc604 b/configure/os/CONFIG.Common.V67-ppc604 deleted file mode 100644 index 98c2b41c9..000000000 --- a/configure/os/CONFIG.Common.V67-ppc604 +++ /dev/null @@ -1,8 +0,0 @@ -include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long -VXWORKS_VERSION = 6.7 - -# needed when including memPartLib.h, e.g. through moduleLib.h or loadLib.h -ARCH_DEP_CFLAGS += -D_VSB_CONFIG_FILE='<../lib/h/config/vsbConfig.h>' - -# compiler tries to access license server (even though no license isneeded) -export LM_LICENSE_FILE=37000@lic-windriver.psi.ch diff --git a/configure/os/CONFIG.Common.V69-ppc32 b/configure/os/CONFIG.Common.V69-ppc32 deleted file mode 100644 index a17c86c15..000000000 --- a/configure/os/CONFIG.Common.V69-ppc32 +++ /dev/null @@ -1,3 +0,0 @@ -include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc32 -VXWORKS_VERSION = 6.9 -#export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH:%=%:)$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib diff --git a/configure/os/CONFIG.Common.eldk42-ppc4xxFP b/configure/os/CONFIG.Common.eldk42-ppc4xxFP index 839ad3aa6..a6f320745 100644 --- a/configure/os/CONFIG.Common.eldk42-ppc4xxFP +++ b/configure/os/CONFIG.Common.eldk42-ppc4xxFP @@ -11,13 +11,6 @@ ELDK=/opt/eldk-4.2 GNU_TARGET=ppc_4xxFP GNU_DIR=$(ELDK)/usr -# This cross tool chain is installed in a somehow weired way -# Without the following lines it does not work on RHEL7 -# but it worked on SL6 -ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2 -ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/powerpc-linux -ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/backward - ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/lib ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/usr/lib diff --git a/configure/os/CONFIG.Common.fslqoriq20-e6500_64 b/configure/os/CONFIG.Common.fslqoriq20-e6500_64 deleted file mode 100644 index 2e23a3e99..000000000 --- a/configure/os/CONFIG.Common.fslqoriq20-e6500_64 +++ /dev/null @@ -1,17 +0,0 @@ -# IOxOS IFC1211 with Freescale QorIQ 2.0 toolchain - -# Include definitions common to all Linux targets -include $(CONFIG)/os/CONFIG.Common.linuxCommon - -ARCH_CLASS = ppc - -SDK = fslsdk -SDK_DIR = /opt/fsl-qoriq/2.0 -SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS) -SDK_TARGET = ppc64e6500-fsl-linux -GNU_TARGET = powerpc64-fsl-linux -SYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET) -GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr -GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET) - -ARCH_DEP_CFLAGS = -mcpu=e6500 -m64 -mhard-float diff --git a/configure/os/CONFIG.Common.nilrt7-armv7a b/configure/os/CONFIG.Common.nilrt7-armv7a index 11a005732..e35d1dbbf 100644 --- a/configure/os/CONFIG.Common.nilrt7-armv7a +++ b/configure/os/CONFIG.Common.nilrt7-armv7a @@ -9,10 +9,10 @@ ARCH_CLASS = arm GNU_TARGET = arm-linux-gnu SYSROOT = /opt/LabVIEW-RT-19.5.1/arm/sysroots/armv7a-vfp-neon-nilrt-linux-gnueabi -GNU_BIN = /opt/RHEL7/bin +GNU_DIR = /opt/RHEL7 # Needed on RHEL9: -export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)/usr/$$LIB:/opt/RHEL7/$$LIB +export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)/usr/$$LIB:$(GNU_DIR)/$$LIB ARCH_DEP_CPPFLAGS += -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon ARCH_DEP_CXXFLAGS += -I=/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi diff --git a/configure/os/CONFIG.Common.yocto21-aarch64 b/configure/os/CONFIG.Common.yocto21-aarch64 deleted file mode 100644 index 5220ed9bc..000000000 --- a/configure/os/CONFIG.Common.yocto21-aarch64 +++ /dev/null @@ -1,15 +0,0 @@ -# XILINX Zynq with Yocto 2.1 / Petalinux toolchain - -# Include definitions common to all Linux targets -include $(CONFIG)/os/CONFIG.Common.linuxCommon - -ARCH_CLASS = arm64 - -SDK = petalinux -SDK_DIR = /opt/petalinux-gfa/2018.1 -SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS) -SDK_TARGET = aarch64-xilinx-linux -GNU_TARGET = $(SDK_TARGET) -SYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET) -GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr -GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET) diff --git a/configure/os/CONFIG.RHEL7-x86_64.Common b/configure/os/CONFIG.RHEL7-x86_64.Common deleted file mode 100644 index 26c65b727..000000000 --- a/configure/os/CONFIG.RHEL7-x86_64.Common +++ /dev/null @@ -1,3 +0,0 @@ -#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system -#Include definitions common to linux hosts -include $(CONFIG)/os/CONFIG.linux-x86_64.Common diff --git a/configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64 b/configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64 deleted file mode 100644 index 2bf7aace1..000000000 --- a/configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64 +++ /dev/null @@ -1,2 +0,0 @@ -# Include common linux definitions -include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 diff --git a/configure/os/CONFIG.RHEL7-x86_64.windows-x64 b/configure/os/CONFIG.RHEL7-x86_64.windows-x64 deleted file mode 100644 index 4774a65ac..000000000 --- a/configure/os/CONFIG.RHEL7-x86_64.windows-x64 +++ /dev/null @@ -1,3 +0,0 @@ -# MSVC_VERSION 2019 in wine 4 for on RHEL7 would require winetricks -MSVC_VERSION = 2017 -include $(CONFIG)/os/CONFIG.Linux.windows-x64 diff --git a/configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64 b/configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64 deleted file mode 100644 index 95ee5e5bd..000000000 --- a/configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64 +++ /dev/null @@ -1,28 +0,0 @@ -# Include common linux definitions -include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 - -# "Cross compile" for RHEL7-x86_64 -# Expects RHEL7 RPMs c++ and readline-devel installed -# in $(SYSROOT) -# This can be installed on RHEL7 with: -# yum install --installroot=$(SYSROOT) -# (Assuming $(SYSROOT) is on a shared network volume.) -# Optionally use a newer TOOLSET (installed on $(SYSROOT)). - -SYSROOT = /opt/RHEL7 - -# "Cross" TOOLSET progs need to find their libraries -export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB) - -# The linker has problems to find indirectly referenced libraries -ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB) - -# These programs have library problems when using them -# from SYSROOT but without TOOLSET. -# But provinding LD_LIBRARY PATH crashes other progams. -# Our host versions work just fine. -AR = ar -rc -RANLIB = ranlib - -# Allow to run cross-tests which expect different lib versions -export LD_PRELOAD=$(SYSROOT)/lib64/libreadline.so diff --git a/configure/os/CONFIG.RHEL9-x86_64.RHEL7-x86_64 b/configure/os/CONFIG.RHEL9-x86_64.RHEL7-x86_64 deleted file mode 100644 index 3933e37fd..000000000 --- a/configure/os/CONFIG.RHEL9-x86_64.RHEL7-x86_64 +++ /dev/null @@ -1,21 +0,0 @@ -# Include common linux definitions -include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 - -# "Cross compile" for RHEL7-x86_64 -# Expects RHEL7 RPMs c++ and readline-devel installed -# in $(SYSROOT) -# This can be installed on RHEL7 with: -# yum install --installroot=$(SYSROOT) -# (Assuming $(SYSROOT) is on a shared network volume.) -# Optionally use a newer TOOLSET (installed on $(SYSROOT)). - -SYSROOT = /opt/RHEL7 - -# "Cross" TOOLSET progs need to find their libraries -export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB:)/usr/$$LIB:$(SYSROOT)/usr/$$LIB - -# The linker has problems to find indirectly referenced libraries -PROD_LDLIBS += $(LDLIBS) - -# Allow to run cross-tests which expect different lib versions -export LD_PRELOAD=$(SYSROOT)/lib64/libreadline.so diff --git a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common deleted file mode 100644 index 0c07a84e7..000000000 --- a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common +++ /dev/null @@ -1,5 +0,0 @@ -include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common - -# Improved error checking with clang -CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang -CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64-clang diff --git a/configure/os/CONFIG_SITE.RHEL8-x86_64.Common b/configure/os/CONFIG_SITE.RHEL8-x86_64.Common index 638d48b1d..ecbfedf2c 100644 --- a/configure/os/CONFIG_SITE.RHEL8-x86_64.Common +++ b/configure/os/CONFIG_SITE.RHEL8-x86_64.Common @@ -3,7 +3,3 @@ 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 - -# Build for old RHEL7 64 bit -#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64 -#CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64 diff --git a/configure/os/CONFIG_SITE.RHEL9-x86_64.Common b/configure/os/CONFIG_SITE.RHEL9-x86_64.Common index e70b16936..d820656a2 100644 --- a/configure/os/CONFIG_SITE.RHEL9-x86_64.Common +++ b/configure/os/CONFIG_SITE.RHEL9-x86_64.Common @@ -7,7 +7,3 @@ 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 - -# Build for even older RHEL7 64 bit -#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64 -#CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64 diff --git a/configure/os/CONFIG_SITE.linux-x86.Common b/configure/os/CONFIG_SITE.linux-x86.Common index 7ffb448d5..859a4a575 100644 --- a/configure/os/CONFIG_SITE.linux-x86.Common +++ b/configure/os/CONFIG_SITE.linux-x86.Common @@ -12,13 +12,7 @@ GNU_HOST_ARCH=i686 GNU_HOST_OS=linux # vxWorks for MVxxxx boards -#CROSS_COMPILER_TARGET_ARCHS += T2-ppc604 -#CROSS_COMPILER_TARGET_ARCHS += V67-ppc604 CROSS_COMPILER_TARGET_ARCHS += V69-ppc604 -#CROSS_COMPILER_TARGET_ARCHS += V69-ppc32 - -# NI compact RIO -#CROSS_COMPILER_TARGET_ARCHS += V63-ppc603 # MOXA montavista linux (No PVA because of missing boost support) CROSS_COMPILER_TARGET_ARCHS += mvl40-xscale_be @@ -36,14 +30,6 @@ CROSS_COMPILER_TARGET_ARCHS += eldk52-e500v2 CROSS_COMPILER_TARGET_ARCHS += eldk42-ppc4xxFP CROSS_COMPILER_TARGET_ARCHS += eldk53-ppc4xxFP -# Test other vxWorks versions -#CROSS_COMPILER_TARGET_ARCHS += V66-ppc603 -#CROSS_COMPILER_TARGET_ARCHS += V66-ppc604 -#CROSS_COMPILER_TARGET_ARCHS += V63-ppc604 -#CROSS_COMPILER_TARGET_ARCHS += V64-ppc604 -# (No PVA because of old compiler) -#CROSS_COMPILER_TARGET_ARCHS += V62-ppc604 - # RTEMS (Can only have 1 RTEMS major version in 1 EPICS installation # because they overwrite their header files.) #CROSS_COMPILER_TARGET_ARCHS += RTEMS49-pc386 diff --git a/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw b/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw index 363664f26..20bc57197 100644 --- a/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw +++ b/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- diff --git a/configure/os/CONFIG_SITE.linux-x86_64.Common b/configure/os/CONFIG_SITE.linux-x86_64.Common index 8e10806a0..89c80479f 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.Common +++ b/configure/os/CONFIG_SITE.linux-x86_64.Common @@ -19,11 +19,7 @@ CROSS_COMPILER_RUNTEST_ARCHS += windows-x64 CROSS_COMPILER_TARGET_ARCHS += windows-x64-mingw CROSS_COMPILER_RUNTEST_ARCHS += windows-x64-mingw -# IOxOS IFC1211 -#CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64 - # Zynq -#CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64 CROSS_COMPILER_TARGET_ARCHS += yocto40-aarch64 # Debian