diff --git a/math/vc/Module.mk b/math/vc/Module.mk index 3c3e8d7b713ad32983ce1d733e6db5e52bdb94bf..8b428981e8af015da7a7dffe3f9843bc200e21ba 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 72ddec9cdf67c60b7b60068862753cba3cdb2085..1a01cf0354c80e57afd688a4e62774c75c9114a9 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 97e5587ec303f667d59f39187dad4c15ce9611bb..2a5cba33931942110904f3ebf308e343fd39a872 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; }