svn commit: r284815 - head/share/mk

[Andrew Turner]

Author: andrew
Date: Thu Jun 25 16:47:11 2015
New Revision: 284815
URL: https://svnweb.freebsd.org/changeset/base/284815

Log:
  Sort the cpu architectures by name rather than a combination of
  alphabetical order and appending new architectures to the end of the list.
  
  Obtained from:	ABT Systems Ltd
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/mk/bsd.cpu.mk

Modified: head/share/mk/bsd.cpu.mk
==============================================================================
--- head/share/mk/bsd.cpu.mk	Thu Jun 25 15:05:58 2015	(r284814)
+++ head/share/mk/bsd.cpu.mk	Thu Jun 25 16:47:11 2015	(r284815)
@@ -6,18 +6,18 @@
 
 .if !defined(CPUTYPE) || empty(CPUTYPE)
 _CPUCFLAGS =
-. if ${MACHINE_CPUARCH} == "i386"
-MACHINE_CPU = i486
-. elif ${MACHINE_CPUARCH} == "amd64"
+. if ${MACHINE_CPUARCH} == "amd64"
 MACHINE_CPU = amd64 sse2 sse mmx
-. elif ${MACHINE_CPUARCH} == "powerpc"
-MACHINE_CPU = aim
-. elif ${MACHINE_CPUARCH} == "sparc64"
-MACHINE_CPU = ultrasparc
 . elif ${MACHINE_CPUARCH} == "arm"
 MACHINE_CPU = arm
+. elif ${MACHINE_CPUARCH} == "i386"
+MACHINE_CPU = i486
 . elif ${MACHINE_CPUARCH} == "mips"
 MACHINE_CPU = mips
+. elif ${MACHINE_CPUARCH} == "powerpc"
+MACHINE_CPU = aim
+. elif ${MACHINE_CPUARCH} == "sparc64"
+MACHINE_CPU = ultrasparc
 . endif
 .else