From cd601080ceaea5722a4f7bfb069c39b3e7541f0a Mon Sep 17 00:00:00 2001
From: Grigory Antsiferov <azr@bakka.su>
Date: Sun, 14 Aug 2016 18:34:55 +0300
Subject: [PATCH] fils/portage.make.conf: CPU flags have been updated.

---
 Makefile                | 2 +-
 files/portage.make.conf | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 43d3acb..d2623fe 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ repos: $(REPOS_TARGET)
 	echo $(TAG) > $@
 
 test:
-	$(DOCKER) run  "$(REGISTRY)/$(ORG_NAME)/$(SERVICE_NAME):$(shell cat .state)" \
+	$(DOCKER) run "$(REGISTRY)/$(ORG_NAME)/$(SERVICE_NAME):$(shell cat .state)" \
 	bash -c "salt --versions-report; ssh -V"
 
 push:
diff --git a/files/portage.make.conf b/files/portage.make.conf
index 5a1e997..485b5b4 100644
--- a/files/portage.make.conf
+++ b/files/portage.make.conf
@@ -1,4 +1,4 @@
-CFLAGS="-march=native -O2 -pipe -mfpmath=sse"
+CFLAGS="-march=corei7-avx -mtune=corei7-avx -O2 -pipe -mfpmath=sse -mno-fma -mno-fma4 -mno-avx2 -mno-xop"
 CXXFLAGS="${CFLAGS}"
 CHOST="x86_64-pc-linux-gnu"
 PORTDIR="/usr/portage"
@@ -15,7 +15,7 @@ ACCEPT_KEYWORDS="amd64"
 PYTHON_TARGETS="python2_7"
 USE_PYTHON="2.7"
 
-CPU_FLAGS_X86="mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_1 sse4_2 aes avx avx2"
+CPU_FLAGS_X86="mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_1 sse4_2 aes avx"
 USE_SALT="smp sctp xattr ssl openssl vhosts -gnutls -tcpd -doc -examples"
 USE="${USE_SALT}"