From 8b5225c14faaa5c465d252bb3a0ec2c45d2562cf Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Thu, 9 May 2019 16:31:51 +0200 Subject: [PATCH] merged with origin/PSI-3.14 --- configure/os/CONFIG.Common.SL6-x86 | 1 - configure/os/CONFIG.Common.SL6-x86_64 | 2 -- configure/os/CONFIG.Common.eldk42-ppc4xxFP | 2 -- configure/os/CONFIG.Common.linuxCommon | 2 ++ configure/os/CONFIG.Common.moxa42-armv6l | 1 - configure/os/CONFIG.Common.mvl40-xscale_be | 1 - 6 files changed, 2 insertions(+), 7 deletions(-) diff --git a/configure/os/CONFIG.Common.SL6-x86 b/configure/os/CONFIG.Common.SL6-x86 index fafe11534..e5d9c2804 100644 --- a/configure/os/CONFIG.Common.SL6-x86 +++ b/configure/os/CONFIG.Common.SL6-x86 @@ -4,4 +4,3 @@ 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 index c80ad3be3..083caea5f 100644 --- a/configure/os/CONFIG.Common.SL6-x86_64 +++ b/configure/os/CONFIG.Common.SL6-x86_64 @@ -2,5 +2,3 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86_64 COMMANDLINE_LIBRARY = READLINE - -ARCH_DEP_CXXFLAGS += -fno-strict-aliasing diff --git a/configure/os/CONFIG.Common.eldk42-ppc4xxFP b/configure/os/CONFIG.Common.eldk42-ppc4xxFP index 77b2375d9..001b9df7a 100644 --- a/configure/os/CONFIG.Common.eldk42-ppc4xxFP +++ b/configure/os/CONFIG.Common.eldk42-ppc4xxFP @@ -11,8 +11,6 @@ ELDK=/opt/eldk-4.2 GNU_TARGET=ppc_4xxFP GNU_DIR=$(ELDK)/usr -ARCH_DEP_CFLAGS += -fno-strict-aliasing - # 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 diff --git a/configure/os/CONFIG.Common.linuxCommon b/configure/os/CONFIG.Common.linuxCommon index 348d1b476..84db5c7ac 100644 --- a/configure/os/CONFIG.Common.linuxCommon +++ b/configure/os/CONFIG.Common.linuxCommon @@ -42,3 +42,5 @@ LDLIBS_READLINE_CURSES = -lreadline -lcurses # Allow site overrides -include $(CONFIG)/os/CONFIG_SITE.Common.linuxCommon -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).linuxCommon + +CODE_CPPFLAGS += -fno-strict-aliasing diff --git a/configure/os/CONFIG.Common.moxa42-armv6l b/configure/os/CONFIG.Common.moxa42-armv6l index 130c850b5..eecdcc7c1 100644 --- a/configure/os/CONFIG.Common.moxa42-armv6l +++ b/configure/os/CONFIG.Common.moxa42-armv6l @@ -14,4 +14,3 @@ COMMANDLINE_LIBRARY = READLINE_NCURSES 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 index 9d2b75655..3606ab4cf 100644 --- a/configure/os/CONFIG.Common.mvl40-xscale_be +++ b/configure/os/CONFIG.Common.mvl40-xscale_be @@ -10,4 +10,3 @@ ARCH_CLASS = xscale GNU_DIR=/afs/psi.ch/project/embeddedlinux/moxa/xscale_be/armv5teb-montavista-linuxeabi ARCH_DEP_CFLAGS += -funwind-tables -ARCH_DEP_CPPFLAGS += -fno-strict-aliasing