Move addition of -mno-vzeroupper to check for gcc7, as clang does not undertsand it

Rich/RichFutureTools/CMakeLists.txt

@@ -19,7 +19,7 @@ find_package(ROOT)
 #message(STATUS "Vc ARCHITECTURE flags ${Vc_ARCHITECTURE_FLAGS}")
 
 # AVX/AVX2 build options
-set(AVX2_BUILD_FLAGS " -Wno-ignored-attributes -mavx -mno-vzeroupper -O3 ")
+set(AVX2_BUILD_FLAGS " -Wno-ignored-attributes -mavx -O3 ")
 exec_program(${CMAKE_CXX_COMPILER} ARGS -print-prog-name=as OUTPUT_VARIABLE _as)
 if(NOT _as)
   message(ERROR "Could not find the 'as' assembler...")
@@ -30,10 +30,10 @@ else()
   if(_as_version VERSION_LESS "2.21.0")
      message(WARNING "binutils is too old to support AVX2+FMA... Falling back to AVX only.")
   else()
-     set(AVX2_BUILD_FLAGS " -Wno-ignored-attributes -mavx2 -mfma -mno-vzeroupper -O3 ")
+     set(AVX2_BUILD_FLAGS " -Wno-ignored-attributes -mavx2 -mfma -O3 ")
   endif()
 endif()
-set(AVX_BUILD_FLAGS " -Wno-ignored-attributes -mavx -mno-vzeroupper -O3 ")
+set(AVX_BUILD_FLAGS " -Wno-ignored-attributes -mavx -O3 ")
 message(STATUS "AVX  build flags = " ${AVX_BUILD_FLAGS})
 message(STATUS "AVX2 build flags = " ${AVX2_BUILD_FLAGS})
 
@@ -52,13 +52,13 @@ set_property(SOURCE src/RichRayTracing_SSE4.cpp     APPEND_STRING PROPERTY COMPI
 set_property(SOURCE src/RichRayTracing_AVX.cpp      APPEND_STRING PROPERTY COMPILE_FLAGS ${AVX_BUILD_FLAGS} )
 set_property(SOURCE src/RichRayTracing_AVX2FMA.cpp  APPEND_STRING PROPERTY COMPILE_FLAGS ${AVX2_BUILD_FLAGS} )
 
-# Temp fix for GCC7. Add option -faligned-new.
+# Fixes for GCC7.
 if( BINARY_TAG_COMP_NAME STREQUAL "gcc" AND BINARY_TAG_COMP_VERSION VERSION_GREATER "6.99")
- set_property(SOURCE src/RichRayTracing_AVX.cpp      APPEND_STRING PROPERTY COMPILE_FLAGS " -faligned-new " )
- set_property(SOURCE src/RichRayTracing_AVX2FMA.cpp  APPEND_STRING PROPERTY COMPILE_FLAGS " -faligned-new " )
+ set_property(SOURCE src/RichRayTracing_AVX.cpp      APPEND_STRING PROPERTY COMPILE_FLAGS " -faligned-new -mno-vzeroupper " )
+ set_property(SOURCE src/RichRayTracing_AVX2FMA.cpp  APPEND_STRING PROPERTY COMPILE_FLAGS " -faligned-new -mno-vzeroupper " )
 endif()
 
-# Fix for gcc 4.
+# Fixes for GCC4.
 if(LCG_COMP STREQUAL "gcc" OR
     (BINARY_TAG_COMP_NAME STREQUAL "gcc" AND BINARY_TAG_COMP_VERSION VERSION_LESS "5"))
   set_property(SOURCE src/RichRayTracing_AVX.cpp     APPEND_STRING PROPERTY COMPILE_FLAGS " -fabi-version=0 " )