Modernize non-AVX2 tuning to haswell

Tuning to an ancient architecture doesn't make a lot of sense; we want
to support the ancient architecture, but don't want to optimize for it.

Also change the AVX2 tuning to use haswell so that optimizations don't
depend on the CPU in the system the build runs on.

CMakeLists.txt

@@ -164,10 +164,10 @@ if(DEBIAN)
   add_definitions(-DDEBIAN)
 elseif(NOT NON_PC_TARGET)
   if (USE_AVX2)
-    set(CRYPTO_FLAGS -march=haswell -mtune=native -mfpmath=sse)
+    set(CRYPTO_FLAGS -march=haswell -mtune=haswell -mfpmath=sse)
   else()
     # Public binary releases
-    set(CRYPTO_FLAGS -march=nocona -mtune=core2 -mfpmath=sse)
+    set(CRYPTO_FLAGS -march=nocona -mtune=haswell -mfpmath=sse)
   endif()
 endif()