[RFC] Remove i386 from bsd.cpu.mk

[Jung-uk Kim]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I'd like to remove i386 from bsd.cpu.mk on head.  Please see the
attachment.  It is also available from here:

http://people.freebsd.org/~jkim/cpu-i386.diff

Any objection?

Jung-uk Kim
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iQEcBAEBAgAGBQJQt+LTAAoJECXpabHZMqHOXz4H/1R+8y8x+au79mkYVixCN9Yz
jO0rw3EbcEGZSs61GbRKfSUdvbmcwHcXl3vnRyADRBESKGntTMFVTE3vwwbwCszG
uARreZ5SORY7fKkFn+3wHmZGe19x4Ln9ouZMXVRXZX8hO8V1zM59uPXKwlbGTDbl
y4Oq2m/vTmLMSpVPvhArRaHFKa8mGAhhf0J/o7oaknUZkNE2tiTm+bgnFjpSYbaS
ozN+20Utrt2jSJqfNLWjjksLqqQDSmNvGSK4YEFBNWxqkCjmBz4VPbx+urmxv9qM
eIkHM0T8JWoV01lO+weyhFGn4BMgvPJkGGmtuZarTaiQbnkg5TmdQ8fnk8XdwIw=
=Tb0N
-----END PGP SIGNATURE-----
-------------- next part --------------
Index: share/examples/etc/make.conf
===================================================================
--- share/examples/etc/make.conf	(revision 243683)
+++ share/examples/etc/make.conf	(working copy)
@@ -35,7 +35,7 @@
 #			athlon-tbird, athlon, k7, geode, k6-3, k6-2, k6, k5
 #       (Intel CPUs)	core2, core, nocona, pentium4m, pentium4, prescott,
 #			pentium3m, pentium3, pentium-m, pentium2,
-#			pentiumpro, pentium-mmx, pentium, i486, i386
+#			pentiumpro, pentium-mmx, pentium, i486
 #       (VIA CPUs)	c7, c3-2, c3
 #   AMD64 architecture:	opteron-sse3, athlon64-sse3, k8-sse3, opteron,
 #			athlon64, k8, core2, nocona, prescott
Index: share/mk/bsd.cpu.mk
===================================================================
--- share/mk/bsd.cpu.mk	(revision 243683)
+++ share/mk/bsd.cpu.mk	(working copy)
@@ -145,59 +145,54 @@ _CPUCFLAGS = -mcpu=ultrasparc3
 . if ${MACHINE_CPUARCH} == "i386"
 .  if ${CPUTYPE} == "bdver1" || ${CPUTYPE} == "bdver2"
 MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
-MACHINE_CPU += i486 i386
 .  elif ${CPUTYPE} == "btver1"
-MACHINE_CPU = ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 i486 i386
+MACHINE_CPU = ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "amdfam10"
 MACHINE_CPU = athlon-xp athlon k7 3dnow sse4a sse3 sse2 sse mmx k6 k5 i586
-MACHINE_CPU += i486 i386
 .  elif ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3"
-MACHINE_CPU = athlon-xp athlon k7 3dnow sse3 sse2 sse mmx k6 k5 i586 i486 i386
+MACHINE_CPU = athlon-xp athlon k7 3dnow sse3 sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64"
-MACHINE_CPU = athlon-xp athlon k7 3dnow sse2 sse mmx k6 k5 i586 i486 i386
+MACHINE_CPU = athlon-xp athlon k7 3dnow sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \
     ${CPUTYPE} == "athlon-4"
-MACHINE_CPU = athlon-xp athlon k7 3dnow sse mmx k6 k5 i586 i486 i386
+MACHINE_CPU = athlon-xp athlon k7 3dnow sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "athlon" || ${CPUTYPE} == "athlon-tbird"
-MACHINE_CPU = athlon k7 3dnow mmx k6 k5 i586 i486 i386
+MACHINE_CPU = athlon k7 3dnow mmx k6 k5 i586
 .  elif ${CPUTYPE} == "k6-3" || ${CPUTYPE} == "k6-2" || ${CPUTYPE} == "geode"
-MACHINE_CPU = 3dnow mmx k6 k5 i586 i486 i386
+MACHINE_CPU = 3dnow mmx k6 k5 i586
 .  elif ${CPUTYPE} == "k6"
-MACHINE_CPU = mmx k6 k5 i586 i486 i386
+MACHINE_CPU = mmx k6 k5 i586
 .  elif ${CPUTYPE} == "k5"
-MACHINE_CPU = k5 i586 i486 i386
+MACHINE_CPU = k5 i586
 .  elif ${CPUTYPE} == "c3"
-MACHINE_CPU = 3dnow mmx i586 i486 i386
+MACHINE_CPU = 3dnow mmx i586
 .  elif ${CPUTYPE} == "c3-2"
-MACHINE_CPU = sse mmx i586 i486 i386
+MACHINE_CPU = sse mmx i586
 .  elif ${CPUTYPE} == "c7"
-MACHINE_CPU = sse3 sse2 sse i686 mmx i586 i486 i386
+MACHINE_CPU = sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "corei7-avx" || ${CPUTYPE} == "core-avx-i"
-MACHINE_CPU = avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 i486 i386
+MACHINE_CPU = avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "corei7"
-MACHINE_CPU = sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 i486 i386
+MACHINE_CPU = sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "core2"
-MACHINE_CPU = ssse3 sse3 sse2 sse i686 mmx i586 i486 i386
+MACHINE_CPU = ssse3 sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "prescott"
-MACHINE_CPU = sse3 sse2 sse i686 mmx i586 i486 i386
+MACHINE_CPU = sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "pentium4" || ${CPUTYPE} == "pentium4m" || \
     ${CPUTYPE} == "pentium-m"
-MACHINE_CPU = sse2 sse i686 mmx i586 i486 i386
+MACHINE_CPU = sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "pentium3" || ${CPUTYPE} == "pentium3m"
-MACHINE_CPU = sse i686 mmx i586 i486 i386
+MACHINE_CPU = sse i686 mmx i586
 .  elif ${CPUTYPE} == "pentium2"
-MACHINE_CPU = i686 mmx i586 i486 i386
+MACHINE_CPU = i686 mmx i586
 .  elif ${CPUTYPE} == "pentiumpro"
-MACHINE_CPU = i686 i586 i486 i386
+MACHINE_CPU = i686 i586
 .  elif ${CPUTYPE} == "pentium-mmx"
-MACHINE_CPU = mmx i586 i486 i386
+MACHINE_CPU = mmx i586
 .  elif ${CPUTYPE} == "pentium"
-MACHINE_CPU = i586 i486 i386
-.  elif ${CPUTYPE} == "i486"
-MACHINE_CPU = i486 i386
-.  elif ${CPUTYPE} == "i386"
-MACHINE_CPU = i386
+MACHINE_CPU = i586
 .  endif
+MACHINE_CPU += i486
 . elif ${MACHINE_CPUARCH} == "amd64"
 .  if ${CPUTYPE} == "bdver1" || ${CPUTYPE} == "bdver2"
 MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3
Index: usr.bin/make/main.c
===================================================================
--- usr.bin/make/main.c	(revision 243683)
+++ usr.bin/make/main.c	(working copy)
@@ -976,7 +976,7 @@ main(int argc, char **argv)
 	 */
 	if ((machine_cpu = getenv("MACHINE_CPU")) == NULL) {
 		if (!strcmp(machine_arch, "i386"))
-			machine_cpu = "i386";
+			machine_cpu = "i486";
 		else
 			machine_cpu = "unknown";
 	}