diff --git a/Makefile.system b/Makefile.system
index 79fb41569..5bdeeaf42 100644
--- a/Makefile.system
+++ b/Makefile.system
@@ -103,10 +103,11 @@ GETARCH_FLAGS	+= -DGEMM_MULTITHREAD_THRESHOLD=$(GEMM_MULTITHREAD_THRESHOLD)
 
 ifeq ($(NO_AVX), 1)
 GETARCH_FLAGS	+= -DNO_AVX
+endif
+
 ifeq ($(BINARY), 32)
 GETARCH_FLAGS	+= -DNO_AVX
 endif
-endif
 
 ifeq ($(DEBUG), 1)
 GETARCH_FLAGS	+= -g
@@ -770,12 +771,11 @@ endif
 
 ifeq ($(NO_AVX), 1)
 CCOMMON_OPT	+= -DNO_AVX
-else
+endif
+
 ifeq ($(BINARY), 32)
 CCOMMON_OPT	+= -DNO_AVX
 endif
-endif
-
 
 ifdef SMP
 CCOMMON_OPT	+= -DSMP_SERVER
diff --git a/cpuid_x86.c b/cpuid_x86.c
index 7bcd16899..a15bb11a3 100644
--- a/cpuid_x86.c
+++ b/cpuid_x86.c
@@ -40,6 +40,7 @@
 #include <string.h>
 #include "cpuid.h"
 
+/*
 #ifdef NO_AVX
 #define CPUTYPE_HASWELL CPUTYPE_NEHALEM
 #define CORE_HASWELL CORE_NEHALEM
@@ -50,6 +51,7 @@
 #define CPUTYPE_PILEDRIVER CPUTYPE_BARCELONA
 #define CORE_PILEDRIVER CORE_BARCELONA
 #endif
+*/
 
 #ifndef CPUIDEMU