diff --git a/cmake/system.cmake b/cmake/system.cmake
index 83b79bab2..48d206b12 100644
--- a/cmake/system.cmake
+++ b/cmake/system.cmake
@@ -67,34 +67,31 @@ if (DEFINED TARGET)
         set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -msse3 -mavx2")
       endif()
     elseif (${CMAKE_C_COMPILER_ID} STREQUAL "CLANG")
-      set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -msse3 -mavx2")
+      set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -msse -msse3 -mavx2")
     endif()
   endif()
+  if (${TARGET} STREQUAL "HASWELL" AND NOT NO_AVX2)
+      set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -msse3 -mavx2")
+  endif()
   if (${TARGET} STREQUAL "ZEN" AND NOT NO_AVX2)
       set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -msse3 -mavx2")
   endif()
   if (${TARGET} STREQUAL "SANDYBRIDGE" AND NOT NO_AVX)
       set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -msse3 -mavx")
   endif()
-  if (${TARGET} STREQUAL "BARCELONA")
+  if (${TARGET} STREQUAL "BARCELONA" OR ${TARGET} STREQUAL "STEAMROLLER" OR ${TARGET} STREQUAL "BULLDOZER" OR ${TARGET} STREQUAL "EXCAVATOR")
       set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -msse3")
   endif()
-  if (${TARGET} STREQUAL "STEAMROLLER")
+  if (${TARGET} STREQUAL "PILEDRIVER" OR ${TARGET} STREQUAL "BOBCAT" OR ${TARGET} STREQUAL "OPTERON_SSE3")
       set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -msse3")
   endif()
-  if (${TARGET} STREQUAL "EXCAVATOR")
+  if (${TARGET} STREQUAL "PRESCOTT" OR ${TARGET} STREQUAL "NANO")
       set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -msse3")
   endif()
-  if (${TARGET} STREQUAL "PILEDRIVER")
+  if (${TARGET} STREQUAL "NEHALEM" OR ${TARGET} STREQUAL "ATOM")
       set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -msse3")
   endif()
-  if (${TARGET} STREQUAL "PRESCOTT")
-      set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -msse3")
-  endif()
-  if (${TARGET} STREQUAL "NEHALEM")
-      set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -msse3")
-  endif()
-  if (${TARGET} STREQUAL "CORE2")
+  if (${TARGET} STREQUAL "CORE2" OR ${TARGET} STREQUAL "PENRYN" OR ${TARGET} STREQUAL "DUNNINGTON")
       set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -msse3")
   endif()
   if (DEFINED HAVE_SSE)