From 4411a04f871d94ae997fb7262a428fe2ee988eb3 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Thu, 21 Jul 2016 17:16:09 -0300
Subject: Linux-libre 4.6.4-gnu

---
 arch/x86/Kconfig.cpu     | 10 ----------
 arch/x86/Makefile_32.cpu |  5 -----
 2 files changed, 15 deletions(-)

(limited to 'arch/x86')

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index ee3e7d4dd..f7b401627 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -435,16 +435,6 @@ config X86_GENERIC
 	  This is really intended for distributors who need more
 	  generic optimizations.
 
-config X86_MARCH_NATIVE
-	bool "Use -march=native cflag (EXPERIMENTAL)"
-	help
-	  Setting Y here, will result in passing the -march=native and
-	  -mtune=native cflags to GCC while compiling the kernel, which
-	  makes GCC check the CPU capabilities and use the best cflags
-	  for your computer.
-
-	  Set Y here only if you use >=gcc-4.2.0.
-
 #
 # Define implied options from the CPU selection here
 config X86_INTERNODE_CACHE_SHIFT
diff --git a/arch/x86/Makefile_32.cpu b/arch/x86/Makefile_32.cpu
index 6b71290d8..56aa88a41 100644
--- a/arch/x86/Makefile_32.cpu
+++ b/arch/x86/Makefile_32.cpu
@@ -10,9 +10,6 @@ tune		= $(call cc-option,-mcpu=$(1),$(2))
 endif
 
 align := $(cc-option-align)
-ifeq ($(CONFIG_X86_MARCH_NATIVE),y)
-cflags-y			+= -march=native
-else
 cflags-$(CONFIG_M486)		+= -march=i486
 cflags-$(CONFIG_M586)		+= -march=i586
 cflags-$(CONFIG_M586TSC)	+= -march=i586
@@ -61,8 +58,6 @@ cflags-$(CONFIG_MELAN)		+= -march=i486
 # Geode GX1 support
 cflags-$(CONFIG_MGEODEGX1)	+= -march=pentium-mmx
 cflags-$(CONFIG_MGEODE_LX)	+= $(call cc-option,-march=geode,-march=pentium-mmx)
-endif
-
 # add at the end to overwrite eventual tuning options from earlier
 # cpu entries
 cflags-$(CONFIG_X86_GENERIC) 	+= $(call tune,generic,$(call tune,i686))
-- 
cgit v1.2.3-54-g00ecf