Merge branch 'PSI-3.14' of git.psi.ch:epics_base/base-3-14-12 into PSI-3.14

This commit is contained in:
2018-04-04 16:03:22 +02:00
2 changed files with 2 additions and 4 deletions

View File

@@ -10,3 +10,4 @@ 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

View File

@@ -161,11 +161,8 @@ OPT_CXXFLAGS_YES = -O2
#--------------------------------------------------
# code flags
CODE_CPPFLAGS_6.6 = -fno-strict-aliasing
CODE_CPPFLAGS_6.7 = -fno-strict-aliasing
CODE_CPPFLAGS_6.8 = -fno-strict-aliasing
CODE_CPPFLAGS_6.9 = -fno-strict-aliasing
CODE_CPPFLAGS_6 = $(CODE_CPPFLAGS_$(VXWORKS_VERSION))
CODE_CPPFLAGS_6 += -fno-strict-aliasing
CODE_CPPFLAGS += $(CODE_CPPFLAGS_$(VXWORKS_MAJOR_VERSION))
#
# For vxWorks versions before 6.3 we need this g++ compiler flag