From f400e12743c19fd6785063fafb0cda40c7a2b3c5 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Thu, 22 Feb 2018 17:11:56 +0100 Subject: [PATCH] PSI configuration --- configure/CONFIG_BASE | 2 +- configure/CONFIG_SITE | 7 ++-- configure/RULES_BUILD | 3 ++ configure/os/CONFIG.Common.RHEL7-x86_64 | 4 +++ configure/os/CONFIG.Common.RHEL7-x86_64-clang | 3 ++ configure/os/CONFIG.Common.SL5-x86 | 6 ++++ configure/os/CONFIG.Common.SL5-x86_64 | 4 +++ configure/os/CONFIG.Common.SL6-x86 | 7 ++++ configure/os/CONFIG.Common.SL6-x86_64 | 6 ++++ configure/os/CONFIG.Common.SL6-x86_64-clang | 3 ++ configure/os/CONFIG.Common.T2-ppc604 | 8 +++++ configure/os/CONFIG.Common.V62-ppc604 | 2 ++ configure/os/CONFIG.Common.V63-ppc603 | 5 +++ configure/os/CONFIG.Common.V63-ppc604 | 5 +++ configure/os/CONFIG.Common.V66-ppc603 | 2 ++ configure/os/CONFIG.Common.V66-ppc604 | 2 ++ configure/os/CONFIG.Common.V67-ppc604 | 5 +++ configure/os/CONFIG.Common.eldk42-ppc4xxFP | 22 +++++++++++++ configure/os/CONFIG.Common.eldk51-ppc4xxSF | 16 +++++++++ configure/os/CONFIG.Common.eldk52-e500v2 | 17 ++++++++++ .../os/CONFIG.Common.fslqoriq20-e6500_64 | 25 ++++++++++++++ configure/os/CONFIG.Common.linux-clang | 5 +++ configure/os/CONFIG.Common.moxa42-armv6l | 17 ++++++++++ configure/os/CONFIG.Common.mvl40-xscale_be | 12 +++++++ configure/os/CONFIG.Common.yocto21-aarch64 | 20 +++++++++++ configure/os/CONFIG.RHEL7-x86_64.Common | 3 ++ configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64 | 2 ++ configure/os/CONFIG.RHEL7-x86_64.SL6-x86 | 14 ++++++++ configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64 | 14 ++++++++ configure/os/CONFIG.SL5-x86.Common | 3 ++ configure/os/CONFIG.SL5-x86.SL5-x86 | 2 ++ configure/os/CONFIG.SL5-x86_64.Common | 3 ++ configure/os/CONFIG.SL5-x86_64.SL5-x86_64 | 2 ++ configure/os/CONFIG.SL6-x86.Common | 2 ++ configure/os/CONFIG.SL6-x86.SL6-x86 | 2 ++ configure/os/CONFIG.SL6-x86_64.Common | 3 ++ configure/os/CONFIG.SL6-x86_64.SL6-x86 | 2 ++ configure/os/CONFIG.SL6-x86_64.SL6-x86_64 | 2 ++ configure/os/CONFIG_SITE.Common.vxWorksCommon | 3 +- configure/os/CONFIG_SITE.RHEL7-x86_64.Common | 13 ++++++++ configure/os/CONFIG_SITE.SL5-x86.Common | 1 + configure/os/CONFIG_SITE.SL5-x86_64.Common | 3 ++ configure/os/CONFIG_SITE.SL6-x86.Common | 1 + configure/os/CONFIG_SITE.SL6-x86_64.Common | 7 ++++ configure/os/CONFIG_SITE.linux-x86.Common | 33 +++++++++++++++++++ configure/os/CONFIG_SITE.linux-x86_64.Common | 9 +++++ 46 files changed, 327 insertions(+), 5 deletions(-) create mode 100644 configure/os/CONFIG.Common.RHEL7-x86_64 create mode 100644 configure/os/CONFIG.Common.RHEL7-x86_64-clang create mode 100644 configure/os/CONFIG.Common.SL5-x86 create mode 100644 configure/os/CONFIG.Common.SL5-x86_64 create mode 100644 configure/os/CONFIG.Common.SL6-x86 create mode 100644 configure/os/CONFIG.Common.SL6-x86_64 create mode 100644 configure/os/CONFIG.Common.SL6-x86_64-clang create mode 100644 configure/os/CONFIG.Common.T2-ppc604 create mode 100644 configure/os/CONFIG.Common.V62-ppc604 create mode 100644 configure/os/CONFIG.Common.V63-ppc603 create mode 100644 configure/os/CONFIG.Common.V63-ppc604 create mode 100644 configure/os/CONFIG.Common.V66-ppc603 create mode 100644 configure/os/CONFIG.Common.V66-ppc604 create mode 100644 configure/os/CONFIG.Common.V67-ppc604 create mode 100644 configure/os/CONFIG.Common.eldk42-ppc4xxFP create mode 100644 configure/os/CONFIG.Common.eldk51-ppc4xxSF create mode 100644 configure/os/CONFIG.Common.eldk52-e500v2 create mode 100644 configure/os/CONFIG.Common.fslqoriq20-e6500_64 create mode 100644 configure/os/CONFIG.Common.linux-clang create mode 100644 configure/os/CONFIG.Common.moxa42-armv6l create mode 100644 configure/os/CONFIG.Common.mvl40-xscale_be create mode 100644 configure/os/CONFIG.Common.yocto21-aarch64 create mode 100644 configure/os/CONFIG.RHEL7-x86_64.Common create mode 100644 configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64 create mode 100644 configure/os/CONFIG.RHEL7-x86_64.SL6-x86 create mode 100644 configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64 create mode 100644 configure/os/CONFIG.SL5-x86.Common create mode 100644 configure/os/CONFIG.SL5-x86.SL5-x86 create mode 100644 configure/os/CONFIG.SL5-x86_64.Common create mode 100644 configure/os/CONFIG.SL5-x86_64.SL5-x86_64 create mode 100644 configure/os/CONFIG.SL6-x86.Common create mode 100644 configure/os/CONFIG.SL6-x86.SL6-x86 create mode 100644 configure/os/CONFIG.SL6-x86_64.Common create mode 100644 configure/os/CONFIG.SL6-x86_64.SL6-x86 create mode 100644 configure/os/CONFIG.SL6-x86_64.SL6-x86_64 create mode 100644 configure/os/CONFIG_SITE.RHEL7-x86_64.Common create mode 100644 configure/os/CONFIG_SITE.SL5-x86.Common create mode 100644 configure/os/CONFIG_SITE.SL5-x86_64.Common create mode 100644 configure/os/CONFIG_SITE.SL6-x86.Common create mode 100644 configure/os/CONFIG_SITE.SL6-x86_64.Common diff --git a/configure/CONFIG_BASE b/configure/CONFIG_BASE index 7ee5a5b89..8d1c399ad 100644 --- a/configure/CONFIG_BASE +++ b/configure/CONFIG_BASE @@ -35,7 +35,7 @@ EPICS_BASE_HOST_LIBS += ca Com # Version number for base shared libraries (and win32 products) ifdef BASE_TOP -SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION) +#SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION) PROD_VERSION = $(EPICS_VERSION).$(EPICS_REVISION) endif # BASE_TOP diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 6cc19f0f6..a3749bc06 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -170,7 +170,7 @@ CROSS_WARN=YES # NOTE: Set to YES only if you have existing R3.13 extensions to be # built with this base # -#COMPAT_TOOLS_313=YES +COMPAT_TOOLS_313=YES # Create and/or install files for R3.13 ioc application and extension builds? # must be either YES or NO @@ -178,19 +178,20 @@ CROSS_WARN=YES # NOTE: Set to YES only if you have existing R3.13 ioc applications # and extensions to be built with this base # -COMPAT_313=NO +COMPAT_313=YES # Installation directory # If you don't want to install into $(TOP) dir then # define INSTALL_LOCATION here #INSTALL_LOCATION= +INSTALL_LOCATION=/usr/local/epics/base-3.14.12 # Use POSIX thread priority scheduling (YES or NO) 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 = +EPICS_SITE_VERSION := $(shell date +%Y-%m) # For GNU compiler, use pipes rather than temporary files for communication # between the various stages of compilation. diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index 2c8de45c5..45fa75fdc 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -438,6 +438,9 @@ ifneq (,$(strip $(SHRLIB_VERSION))) @$(RM) $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@) ln -s $< $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@) endif # SHRLIB_VERSION +else + @$(RM) $@.3.14 + ln -s $< $@.3.14 endif # SHRLIB_SUFFIX ifneq ($(INSTALL_TCLLIB),$(INSTALL_BIN)) diff --git a/configure/os/CONFIG.Common.RHEL7-x86_64 b/configure/os/CONFIG.Common.RHEL7-x86_64 new file mode 100644 index 000000000..083caea5f --- /dev/null +++ b/configure/os/CONFIG.Common.RHEL7-x86_64 @@ -0,0 +1,4 @@ +# Include definitions common to linux pentium targets +include $(CONFIG)/os/CONFIG.Common.linux-x86_64 + +COMMANDLINE_LIBRARY = READLINE diff --git a/configure/os/CONFIG.Common.RHEL7-x86_64-clang b/configure/os/CONFIG.Common.RHEL7-x86_64-clang new file mode 100644 index 000000000..57f57aa53 --- /dev/null +++ b/configure/os/CONFIG.Common.RHEL7-x86_64-clang @@ -0,0 +1,3 @@ +include $(CONFIG)/os/CONFIG.Common.linux-clang + +COMMANDLINE_LIBRARY = READLINE diff --git a/configure/os/CONFIG.Common.SL5-x86 b/configure/os/CONFIG.Common.SL5-x86 new file mode 100644 index 000000000..e0dd111d9 --- /dev/null +++ b/configure/os/CONFIG.Common.SL5-x86 @@ -0,0 +1,6 @@ +# Include definitions common to linux pentium targets +include $(CONFIG)/os/CONFIG.Common.linux-x86 + +COMMANDLINE_LIBRARY = READLINE_NCURSES + +ARCH_DEP_CFLAGS += -march=i686 diff --git a/configure/os/CONFIG.Common.SL5-x86_64 b/configure/os/CONFIG.Common.SL5-x86_64 new file mode 100644 index 000000000..477309803 --- /dev/null +++ b/configure/os/CONFIG.Common.SL5-x86_64 @@ -0,0 +1,4 @@ +# Include definitions common to linux pentium targets +include $(CONFIG)/os/CONFIG.Common.linux-x86_64 + +COMMANDLINE_LIBRARY = READLINE_NCURSES diff --git a/configure/os/CONFIG.Common.SL6-x86 b/configure/os/CONFIG.Common.SL6-x86 new file mode 100644 index 000000000..fafe11534 --- /dev/null +++ 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 + +COMMANDLINE_LIBRARY = READLINE + +ARCH_DEP_CFLAGS += -march=i686 +ARCH_DEP_CXXFLAGS += -fno-strict-aliasing diff --git a/configure/os/CONFIG.Common.SL6-x86_64 b/configure/os/CONFIG.Common.SL6-x86_64 new file mode 100644 index 000000000..c80ad3be3 --- /dev/null +++ b/configure/os/CONFIG.Common.SL6-x86_64 @@ -0,0 +1,6 @@ +# Include definitions common to linux pentium targets +include $(CONFIG)/os/CONFIG.Common.linux-x86_64 + +COMMANDLINE_LIBRARY = READLINE + +ARCH_DEP_CXXFLAGS += -fno-strict-aliasing diff --git a/configure/os/CONFIG.Common.SL6-x86_64-clang b/configure/os/CONFIG.Common.SL6-x86_64-clang new file mode 100644 index 000000000..57f57aa53 --- /dev/null +++ b/configure/os/CONFIG.Common.SL6-x86_64-clang @@ -0,0 +1,3 @@ +include $(CONFIG)/os/CONFIG.Common.linux-clang + +COMMANDLINE_LIBRARY = READLINE diff --git a/configure/os/CONFIG.Common.T2-ppc604 b/configure/os/CONFIG.Common.T2-ppc604 new file mode 100644 index 000000000..52c0650b5 --- /dev/null +++ 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 diff --git a/configure/os/CONFIG.Common.V62-ppc604 b/configure/os/CONFIG.Common.V62-ppc604 new file mode 100644 index 000000000..cc789ca10 --- /dev/null +++ b/configure/os/CONFIG.Common.V62-ppc604 @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..910283dd2 --- /dev/null +++ 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 diff --git a/configure/os/CONFIG.Common.V63-ppc604 b/configure/os/CONFIG.Common.V63-ppc604 new file mode 100644 index 000000000..3315e8fe2 --- /dev/null +++ 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 diff --git a/configure/os/CONFIG.Common.V66-ppc603 b/configure/os/CONFIG.Common.V66-ppc603 new file mode 100644 index 000000000..8bcdabf06 --- /dev/null +++ b/configure/os/CONFIG.Common.V66-ppc603 @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..c450c7d71 --- /dev/null +++ b/configure/os/CONFIG.Common.V66-ppc604 @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..49e7329fc --- /dev/null +++ b/configure/os/CONFIG.Common.V67-ppc604 @@ -0,0 +1,5 @@ +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>' diff --git a/configure/os/CONFIG.Common.eldk42-ppc4xxFP b/configure/os/CONFIG.Common.eldk42-ppc4xxFP new file mode 100644 index 000000000..001b9df7a --- /dev/null +++ b/configure/os/CONFIG.Common.eldk42-ppc4xxFP @@ -0,0 +1,22 @@ +# 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 + +# 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.eldk51-ppc4xxSF b/configure/os/CONFIG.Common.eldk51-ppc4xxSF new file mode 100644 index 000000000..276e5b99e --- /dev/null +++ b/configure/os/CONFIG.Common.eldk51-ppc4xxSF @@ -0,0 +1,16 @@ +# Virtex FPGA embedded Processor with ELDK 5.1 + +# Include definitions common to all Linux targets +include $(CONFIG)/os/CONFIG.Common.linuxCommon + +COMMANDLINE_LIBRARY = READLINE + +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) diff --git a/configure/os/CONFIG.Common.eldk52-e500v2 b/configure/os/CONFIG.Common.eldk52-e500v2 new file mode 100644 index 000000000..fc6e21e9e --- /dev/null +++ b/configure/os/CONFIG.Common.eldk52-e500v2 @@ -0,0 +1,17 @@ +# IOxOS IFC1210 with ELDK 5.2 + +# Include definitions common to all Linux targets +include $(CONFIG)/os/CONFIG.Common.linuxCommon + +COMMANDLINE_LIBRARY = READLINE + +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 = diff --git a/configure/os/CONFIG.Common.fslqoriq20-e6500_64 b/configure/os/CONFIG.Common.fslqoriq20-e6500_64 new file mode 100644 index 000000000..7c2a615d2 --- /dev/null +++ b/configure/os/CONFIG.Common.fslqoriq20-e6500_64 @@ -0,0 +1,25 @@ +# IOxOS IFC1211 with Freescale QorIQ 2.0 toolchain + +# Include definitions common to all Linux targets +include $(CONFIG)/os/CONFIG.Common.linuxCommon + +COMMANDLINE_LIBRARY = READLINE + +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 diff --git a/configure/os/CONFIG.Common.linux-clang b/configure/os/CONFIG.Common.linux-clang new file mode 100644 index 000000000..b69d16d5e --- /dev/null +++ b/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++ diff --git a/configure/os/CONFIG.Common.moxa42-armv6l b/configure/os/CONFIG.Common.moxa42-armv6l new file mode 100644 index 000000000..130c850b5 --- /dev/null +++ b/configure/os/CONFIG.Common.moxa42-armv6l @@ -0,0 +1,17 @@ +# 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=/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 + +# suppress note "the mangling of 'va_list' has changed in GCC 4.4" +ARCH_DEP_CXXFLAGS += -Wno-psabi + +ARCH_DEP_CFLAGS += -funwind-tables +ARCH_DEP_CXXFLAGS += -fno-strict-aliasing diff --git a/configure/os/CONFIG.Common.mvl40-xscale_be b/configure/os/CONFIG.Common.mvl40-xscale_be new file mode 100644 index 000000000..3606ab4cf --- /dev/null +++ b/configure/os/CONFIG.Common.mvl40-xscale_be @@ -0,0 +1,12 @@ +# 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=/afs/psi.ch/project/embeddedlinux/moxa/xscale_be/armv5teb-montavista-linuxeabi + +ARCH_DEP_CFLAGS += -funwind-tables diff --git a/configure/os/CONFIG.Common.yocto21-aarch64 b/configure/os/CONFIG.Common.yocto21-aarch64 new file mode 100644 index 000000000..417e11a4c --- /dev/null +++ b/configure/os/CONFIG.Common.yocto21-aarch64 @@ -0,0 +1,20 @@ +# XILINX Zynq with Yocto 2.1 / Petalinux toolchain + +# Include definitions common to all Linux targets +include $(CONFIG)/os/CONFIG.Common.linuxCommon + +COMMANDLINE_LIBRARY = READLINE + +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) diff --git a/configure/os/CONFIG.RHEL7-x86_64.Common b/configure/os/CONFIG.RHEL7-x86_64.Common new file mode 100644 index 000000000..26c65b727 --- /dev/null +++ b/configure/os/CONFIG.RHEL7-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 diff --git a/configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64 b/configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64 new file mode 100644 index 000000000..2bf7aace1 --- /dev/null +++ b/configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64 @@ -0,0 +1,2 @@ +# Include common linux definitions +include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 diff --git a/configure/os/CONFIG.RHEL7-x86_64.SL6-x86 b/configure/os/CONFIG.RHEL7-x86_64.SL6-x86 new file mode 100644 index 000000000..98bbce113 --- /dev/null +++ b/configure/os/CONFIG.RHEL7-x86_64.SL6-x86 @@ -0,0 +1,14 @@ +# "cross compile" for older Linux version +# Use older compiler and older libraries +# Used packages: +# compat-gcc-44-c++-4.4 +# compat-gcc-44-4.4 +# compat-glibc-headers-2.12-4 +# It was neccessary to install 32 bit compatibility libraries manually +#------------------------------------------------------- + +include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 +CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44 +CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44 +TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib +LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo diff --git a/configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64 b/configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64 new file mode 100644 index 000000000..ad01fa3ee --- /dev/null +++ b/configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64 @@ -0,0 +1,14 @@ +# "cross compile" for older Linux version +# Use older compiler and older libraries +# Used packages: +# compat-gcc-44-c++-4.4 +# compat-gcc-44-4.4 +# compat-glibc-headers-2.12-4 +# compat-glibc-2.12-4 +#------------------------------------------------------- + +include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 +CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44 +CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44 +TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib64 +LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo diff --git a/configure/os/CONFIG.SL5-x86.Common b/configure/os/CONFIG.SL5-x86.Common new file mode 100644 index 000000000..cc10355d3 --- /dev/null +++ b/configure/os/CONFIG.SL5-x86.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.Common diff --git a/configure/os/CONFIG.SL5-x86.SL5-x86 b/configure/os/CONFIG.SL5-x86.SL5-x86 new file mode 100644 index 000000000..2bf7aace1 --- /dev/null +++ b/configure/os/CONFIG.SL5-x86.SL5-x86 @@ -0,0 +1,2 @@ +# Include common linux definitions +include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 diff --git a/configure/os/CONFIG.SL5-x86_64.Common b/configure/os/CONFIG.SL5-x86_64.Common new file mode 100644 index 000000000..26c65b727 --- /dev/null +++ b/configure/os/CONFIG.SL5-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 diff --git a/configure/os/CONFIG.SL5-x86_64.SL5-x86_64 b/configure/os/CONFIG.SL5-x86_64.SL5-x86_64 new file mode 100644 index 000000000..2bf7aace1 --- /dev/null +++ b/configure/os/CONFIG.SL5-x86_64.SL5-x86_64 @@ -0,0 +1,2 @@ +# Include common linux definitions +include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 diff --git a/configure/os/CONFIG.SL6-x86.Common b/configure/os/CONFIG.SL6-x86.Common new file mode 100644 index 000000000..183caedd7 --- /dev/null +++ b/configure/os/CONFIG.SL6-x86.Common @@ -0,0 +1,2 @@ +#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system +#Include definitions common to linux hosts diff --git a/configure/os/CONFIG.SL6-x86.SL6-x86 b/configure/os/CONFIG.SL6-x86.SL6-x86 new file mode 100644 index 000000000..2bf7aace1 --- /dev/null +++ b/configure/os/CONFIG.SL6-x86.SL6-x86 @@ -0,0 +1,2 @@ +# Include common linux definitions +include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 diff --git a/configure/os/CONFIG.SL6-x86_64.Common b/configure/os/CONFIG.SL6-x86_64.Common new file mode 100644 index 000000000..26c65b727 --- /dev/null +++ b/configure/os/CONFIG.SL6-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 diff --git a/configure/os/CONFIG.SL6-x86_64.SL6-x86 b/configure/os/CONFIG.SL6-x86_64.SL6-x86 new file mode 100644 index 000000000..2bf7aace1 --- /dev/null +++ b/configure/os/CONFIG.SL6-x86_64.SL6-x86 @@ -0,0 +1,2 @@ +# Include common linux definitions +include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 diff --git a/configure/os/CONFIG.SL6-x86_64.SL6-x86_64 b/configure/os/CONFIG.SL6-x86_64.SL6-x86_64 new file mode 100644 index 000000000..2bf7aace1 --- /dev/null +++ b/configure/os/CONFIG.SL6-x86_64.SL6-x86_64 @@ -0,0 +1,2 @@ +# Include common linux definitions +include $(CONFIG)/os/CONFIG.linux-x86.linux-x86 diff --git a/configure/os/CONFIG_SITE.Common.vxWorksCommon b/configure/os/CONFIG_SITE.Common.vxWorksCommon index fc70230cd..fbe03d841 100644 --- a/configure/os/CONFIG_SITE.Common.vxWorksCommon +++ b/configure/os/CONFIG_SITE.Common.vxWorksCommon @@ -32,5 +32,6 @@ VXWORKS_VERSION = 6.9 #WIND_BASE = /usr/local/vw/tornado202p1 #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 = /afs/psi.ch/project/vxworks/VxWorks$(VXWORKS_VERSION) diff --git a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common new file mode 100644 index 000000000..f7930911f --- /dev/null +++ b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common @@ -0,0 +1,13 @@ +# Build 32 bit version as a cross architecture +#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86 + +# Improved error checking with clang +CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang + +# 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 + +include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common diff --git a/configure/os/CONFIG_SITE.SL5-x86.Common b/configure/os/CONFIG_SITE.SL5-x86.Common new file mode 100644 index 000000000..332cebc34 --- /dev/null +++ b/configure/os/CONFIG_SITE.SL5-x86.Common @@ -0,0 +1 @@ +include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common diff --git a/configure/os/CONFIG_SITE.SL5-x86_64.Common b/configure/os/CONFIG_SITE.SL5-x86_64.Common new file mode 100644 index 000000000..ce1584300 --- /dev/null +++ b/configure/os/CONFIG_SITE.SL5-x86_64.Common @@ -0,0 +1,3 @@ +include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common +# Build 32 bit version as a cross architecture +CROSS_COMPILER_TARGET_ARCHS += SL5-x86 diff --git a/configure/os/CONFIG_SITE.SL6-x86.Common b/configure/os/CONFIG_SITE.SL6-x86.Common new file mode 100644 index 000000000..332cebc34 --- /dev/null +++ b/configure/os/CONFIG_SITE.SL6-x86.Common @@ -0,0 +1 @@ +include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common diff --git a/configure/os/CONFIG_SITE.SL6-x86_64.Common b/configure/os/CONFIG_SITE.SL6-x86_64.Common new file mode 100644 index 000000000..9d8cb9f96 --- /dev/null +++ b/configure/os/CONFIG_SITE.SL6-x86_64.Common @@ -0,0 +1,7 @@ +# Build 32 bit version as a cross architecture +CROSS_COMPILER_TARGET_ARCHS += SL6-x86 + +# Improved error checking with clang +CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64-clang + +include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common diff --git a/configure/os/CONFIG_SITE.linux-x86.Common b/configure/os/CONFIG_SITE.linux-x86.Common index dc29e8f0d..a82e99d0c 100644 --- a/configure/os/CONFIG_SITE.linux-x86.Common +++ b/configure/os/CONFIG_SITE.linux-x86.Common @@ -7,3 +7,36 @@ #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 #CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386 # RTEMS-mvme5500 RTEMS-mvme167 + +GNU_HOST_ARCH=i686 +GNU_HOST_OS=linux + +# vxWorks 5 for MVxxxx boards +CROSS_COMPILER_TARGET_ARCHS += T2-ppc604 + +# vxWorks 6.7 for MVxxxx boards +CROSS_COMPILER_TARGET_ARCHS += V67-ppc604 + +# NI compact RIO +CROSS_COMPILER_TARGET_ARCHS += V63-ppc603 + +# MOXA montavista linux +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 + +# 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 += V62-ppc604 diff --git a/configure/os/CONFIG_SITE.linux-x86_64.Common b/configure/os/CONFIG_SITE.linux-x86_64.Common index 244e163b4..11b12e9cb 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.Common +++ b/configure/os/CONFIG_SITE.linux-x86_64.Common @@ -7,3 +7,12 @@ #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 + +# IOxOS IFC1211 +CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64 + +# Zynq +CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64