From 9c64469f1ef6994eb5d049d4bb7fe4f5bd0e3905 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Tue, 7 Jun 2022 11:08:37 +0200 Subject: [PATCH] re-order cross archs between RHEL7 and RHEL8 hosts --- configure/os/CONFIG_SITE.RHEL7-x86_64.Common | 17 +++++++++++++++ configure/os/CONFIG_SITE.RHEL8-x86_64.Common | 9 -------- configure/os/CONFIG_SITE.linux-x86_64.Common | 23 ++++++-------------- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common index 0eaf7f3ce..bcbbd5880 100644 --- a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common +++ b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common @@ -1 +1,18 @@ 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 + +# Build for old SL6 64 bit +CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64 +CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86_64 + +# Build for old SL6 32 bit +CROSS_COMPILER_TARGET_ARCHS += SL6-x86 +CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86 + +# NI Linux Real-Time 7.x +# requires RPM gcc-c++-arm-linux-gnu +# Not available on RHEL8 +CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a diff --git a/configure/os/CONFIG_SITE.RHEL8-x86_64.Common b/configure/os/CONFIG_SITE.RHEL8-x86_64.Common index cfaa7905e..dd06ba889 100644 --- a/configure/os/CONFIG_SITE.RHEL8-x86_64.Common +++ b/configure/os/CONFIG_SITE.RHEL8-x86_64.Common @@ -6,16 +6,7 @@ CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64-clang # Build for old RHEL7 64 bit #CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64 -# Build for old SL6 64 bit -#CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64 - -# Build for old SL6 32 bit -#CROSS_COMPILER_TARGET_ARCHS += SL6-x86 - # NI Linux Real-Time 7.x # requires RPM gcc-c++-arm-linux-gnu # not available yet for RHEL8 #CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a - -# Windows cross builds using Wine -CROSS_COMPILER_TARGET_ARCHS += win32-x86 windows-x64 diff --git a/configure/os/CONFIG_SITE.linux-x86_64.Common b/configure/os/CONFIG_SITE.linux-x86_64.Common index 3bfe7f90d..9bee46bb0 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.Common +++ b/configure/os/CONFIG_SITE.linux-x86_64.Common @@ -11,27 +11,18 @@ include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common GNU_HOST_ARCH_64=x86_64 -# Improved error checking with clang -CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang -CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64-clang - -# Build for old SL6 64 bit -CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64 -CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86_64 - -# Build for old SL6 32 bit -CROSS_COMPILER_TARGET_ARCHS += SL6-x86 -CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86 - -# NI Linux Real-Time 7.x -# requires RPM gcc-c++-arm-linux-gnu -CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a - # Windows cross builds using Wine CROSS_COMPILER_TARGET_ARCHS += win32-x86 windows-x64 + # IOxOS IFC1211 CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64 # Zynq CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64 CROSS_COMPILER_TARGET_ARCHS += yocto40-aarch64 + +# Debian 10 +CROSS_COMPILER_TARGET_ARCHS += deb10-x86_64 + +# Newer DeltaTau PowerPMAC +CROSS_COMPILER_TARGET_ARCHS += gcc8-ppc4xxFP