From daa88446240aafe504e5aee59f618c5d3a0de124 Mon Sep 17 00:00:00 2001
From: Lorenzo Moneta <Lorenzo.Moneta@cern.ch>
Date: Wed, 2 Oct 2013 15:55:11 +0200
Subject: [PATCH] Fix vcflags to be after cxxflags
add return 0 for tests
---
math/vc/Module.mk | 3 ++-
math/vc/tests/deinterleave.cpp | 2 ++
math/vc/tests/stlcontainer.cpp | 5 ++++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/math/vc/Module.mk b/math/vc/Module.mk
index 3c3e8d7b713..8b428981e8a 100644
--- a/math/vc/Module.mk
+++ b/math/vc/Module.mk
@@ -32,7 +32,8 @@ include/%: $(MODDIRI)/%
escapeflag = $(subst ~,_,$(subst /,_,$(subst :,_,$(subst =,_,$(subst .,_,$(subst -,_,$(1)))))))
-VCFLAGS += -DVC_COMPILE_LIB $(filter-out -x%,$(filter-out -m%,$(filter-out /arch:%,$(OPT) $(CXXFLAGS))))
+VCFLAGS0 := -DVC_COMPILE_LIB $(filter-out -x%,$(filter-out -m%,$(filter-out /arch:%,$(OPT) $(CXXFLAGS))))
+VCFLAGS := $(VCFLAGS0) $(VCFLAGS)
VCLIBVCOBJ := const.cpp cpuid.cpp support.cpp \
$(foreach flag,$(call escapeflag,$(SIMDCXXFLAGS)),trigonometric_$(flag).cpp)
ifdef AVXCXXFLAG
diff --git a/math/vc/tests/deinterleave.cpp b/math/vc/tests/deinterleave.cpp
index 72ddec9cdf6..1a01cf0354c 100644
--- a/math/vc/tests/deinterleave.cpp
+++ b/math/vc/tests/deinterleave.cpp
@@ -418,4 +418,6 @@ int main()
testAllTypes(testDeinterleaveGather);
testAllTypes(testInterleavingScatter);
+
+ return 0;
}
diff --git a/math/vc/tests/stlcontainer.cpp b/math/vc/tests/stlcontainer.cpp
index 97e5587ec30..2a5cba33931 100644
--- a/math/vc/tests/stlcontainer.cpp
+++ b/math/vc/tests/stlcontainer.cpp
@@ -25,6 +25,8 @@
#include <vector>
#include "unittest.h"
+
+
template<typename Vec> size_t alignmentMask()
{
if (Vec::Size == 1) {
@@ -61,6 +63,7 @@ int main(int argc, char **argv)
{
initTest(argc, argv);
- using namespace Vc;
testAllTypes(stdVectorAlignment);
+
+ return 0;
}
--
GitLab