From bbab258ae693ba10a4257a7020574f9bbc49f7b1 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 19 Feb 2004 03:36:31 +0000
Subject: [PATCH] Update the x86 processor listing a bit, to preempt further
 questions about the best settings the AMD Elan and the VIA Nehemiah.

---
 Rules.mak                 |  5 ++++-
 extra/Configs/Config.i386 | 24 +++++++++++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Rules.mak b/Rules.mak
index 6a1b235e4..e845f8196 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -95,9 +95,11 @@ ifeq ($(strip $(TARGET_ARCH)),i386)
 	OPTIMIZATION+=$(call check_gcc,-falign-jumps=0 -falign-loops=0,-malign-jumps=0 -malign-loops=0)
 	CPU_CFLAGS-$(CONFIG_386)+=-march=i386
 	CPU_CFLAGS-$(CONFIG_486)+=-march=i486
+	CPU_CFLAGS-$(CONFIG_ELAN)+=-march=i486
 	CPU_CFLAGS-$(CONFIG_586)+=-march=i586
 	CPU_CFLAGS-$(CONFIG_586MMX)+=$(call check_gcc,-march=pentium-mmx,-march=i586)
 	CPU_CFLAGS-$(CONFIG_686)+=-march=i686
+	CPU_CFLAGS-$(CONFIG_PENTIUMII)+=$(call check_gcc,-march=pentium2,-march=i686)
 	CPU_CFLAGS-$(CONFIG_PENTIUMIII)+=$(call check_gcc,-march=pentium3,-march=i686)
 	CPU_CFLAGS-$(CONFIG_PENTIUM4)+=$(call check_gcc,-march=pentium4,-march=i686)
 	CPU_CFLAGS-$(CONFIG_K6)+=$(call check_gcc,-march=k6,-march=i586)
@@ -105,7 +107,8 @@ ifeq ($(strip $(TARGET_ARCH)),i386)
 	CPU_CFLAGS-$(CONFIG_CRUSOE)+=-march=i686 -malign-functions=0 -malign-jumps=0 -malign-loops=0
 	CPU_CFLAGS-$(CONFIG_WINCHIPC6)+=$(call check_gcc,-march=winchip-c6,-march=i586)
 	CPU_CFLAGS-$(CONFIG_WINCHIP2)+=$(call check_gcc,-march=winchip2,-march=i586)
-	CPU_CFLAGS-$(CONFIG_CYRIXIII)+=$(call check_gcc,-march=c3,-march=i586)
+	CPU_CFLAGS-$(CONFIG_CYRIXIII)+=$(call check_gcc,-march=c3,-march=i486) -malign-functions=0 -malign-jumps=0 -malign-loops=0
+	CPU_CFLAGS-$(CONFIG_NEHEMIAH)+=$(call check_gcc,-march=c3-2,-march=i686)
 endif
 
 ifeq ($(strip $(TARGET_ARCH)),arm)
diff --git a/extra/Configs/Config.i386 b/extra/Configs/Config.i386
index 33e48ef7a..94a948ee9 100644
--- a/extra/Configs/Config.i386
+++ b/extra/Configs/Config.i386
@@ -51,11 +51,12 @@ choice
 	  - "Pentium-4" for the Intel Pentium 4.
 	  - "K6" for the AMD K6, K6-II and K6-III (aka K6-3D).
 	  - "Athlon" for the AMD K7 family (Athlon/Duron/Thunderbird).
+	  - "Elan" for the AMD Elan"
 	  - "Crusoe" for the Transmeta Crusoe series.
 	  - "Winchip-C6" for original IDT Winchip.
-	  - "Winchip-2" for IDT Winchip 2.
-	  - "Winchip-2A" for IDT Winchips with 3dNow! capabilities.
+	  - "Winchip-2/Winchip-2A/Winchip-3" for IDT Winchip CPUs
 	  - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.
+	  - "VIA C3-2 Nehemiah" model 9 and above.
 
 	  If you don't know what to do, choose "386".
 
@@ -69,19 +70,22 @@ config CONFIG_486
 	bool "486"
 
 config CONFIG_586
-	bool "Pentium/586/K5/5x86/6x86/6x86MX/Winchip-2A/Winchip-3"
+	bool "Pentium/586/K5/5x86/6x86/6x86MX"
 
 config CONFIG_586MMX
 	bool "Pentium-MMX"
 
 config CONFIG_686
-	bool "Pentium-Pro/Celeron/Pentium-II"
+	bool "Pentium-Pro"
+
+config CONFIG_PENTIUMII
+	bool "Celeron/Pentium-II"
 
 config CONFIG_PENTIUMIII
-	bool "Pentium-III/Celeron(Coppermine)"
+	bool "Pentium-III/Celeron(Coppermine)/Pentium-III Xeon"
 
 config CONFIG_PENTIUM4
-	bool "Pentium-4"
+	bool "Pentium-4/Celeron(P4-based)/Xeon"
 
 config CONFIG_K6
 	bool "K6/K6-II/K6-III"
@@ -89,6 +93,9 @@ config CONFIG_K6
 config CONFIG_K7
 	bool "Athlon/Duron/K7"
 
+config CONFIG_ELAN
+	bool "Elan"
+
 config CONFIG_CRUSOE
 	bool "Crusoe"
 
@@ -96,10 +103,13 @@ config CONFIG_WINCHIPC6
 	bool "Winchip-C6"
 
 config CONFIG_WINCHIP2
-	bool "Winchip-2"
+	bool "Winchip-2/Winchip-2A/Winchip-3"
 
 config CONFIG_CYRIXIII
 	bool "CyrixIII/VIA-C3"
 
+config CONFIG_NEHEMIAH
+	bool "VIA C3-2 (Nehemiah)"
+
 endchoice
 
-- 
2.11.0