From 7b0b3c0e43fffae453d74d9c0a6d08212f4efecd Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Fri, 3 Nov 2017 14:35:17 +0100 Subject: [PATCH] Fix for LP: #1702298 --- src/pcas/build/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pcas/build/Makefile b/src/pcas/build/Makefile index 7da07236e..d45b9f469 100644 --- a/src/pcas/build/Makefile +++ b/src/pcas/build/Makefile @@ -81,10 +81,9 @@ USR_CXXFLAGS_RTEMS = -fno-strict-aliasing USR_CXXFLAGS_vxWorks = -fno-strict-aliasing # There is a bug in some vxWorks compilers that these work around: -ifeq ($(VX_GNU_VERSION), 4.1.2) - casStreamOS_CXXFLAGS_vxWorks-ppc604_altivec = -O0 - casStreamOS_CXXFLAGS_vxWorks-ppc604_long = -O0 - casStreamOS_CXXFLAGS_vxWorks-ppc604 = -O0 +ifeq ($(VXWORKS_VERSION)$(filter -mcpu=604,$(ARCH_DEP_CFLAGS)), 6.6-mcpu=604) + casDGIntfOS_CXXFLAGS = -fno-inline + casStreamOS_CXXFLAGS = -fno-inline endif LIBRARY = cas