From 43aba0eadbacbb7ff1055111dc699f3f16d85dcd Mon Sep 17 00:00:00 2001
From: Mark Peek <mp@FreeBSD.org>
Date: Fri, 19 Oct 2001 22:19:06 +0000
Subject: [PATCH] Make override of nm consistent across all platforms and sort
 the overrides.

Reminded by:	obrien
---
 sys/conf/Makefile.alpha   | 5 +++--
 sys/conf/Makefile.i386    | 5 +++--
 sys/conf/Makefile.ia64    | 3 ++-
 sys/conf/Makefile.pc98    | 5 +++--
 sys/conf/Makefile.powerpc | 4 ++--
 sys/conf/Makefile.sparc64 | 5 +++--
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 23d5cec7b2c..97cfe5c8e2c 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -34,8 +34,9 @@ S=	../../..
 .endif
 M=	${MACHINE_ARCH}
 
-SIZE?=		size
+NM?=		nm
 OBJCOPY?=	objcopy
+SIZE?=		size
 
 COPTFLAGS?=-O -pipe
 .if !defined(NO_CPU_COPTFLAGS)
@@ -174,7 +175,7 @@ hack.So: Makefile
 ./assym.s: assym.s
 
 assym.s: $S/kern/genassym.sh genassym.o
-	OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
+	NM=${NM} OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
 
 genassym.o: $S/$M/$M/genassym.c
 	${CC} -c ${CFLAGS} -elf $S/$M/$M/genassym.c
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 0d6dcdd0cfb..a87234ea5b5 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -34,8 +34,9 @@ S=	../../..
 .endif
 M=	${MACHINE_ARCH}
 
-SIZE?=		size
+NM?=		nm
 OBJCOPY?=	objcopy
+SIZE?=		size
 
 COPTFLAGS?=-O -pipe
 .if !defined(NO_CPU_COPTFLAGS)
@@ -177,7 +178,7 @@ hack.So: Makefile
 ./assym.s: assym.s
 
 assym.s: $S/kern/genassym.sh genassym.o
-	OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
+	NM=${NM} OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
 
 genassym.o: $S/$M/$M/genassym.c
 	${CC} -c ${CFLAGS} -elf $S/$M/$M/genassym.c
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index 998e4031102..986fa184547 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -44,8 +44,9 @@ S=	../../..
 .endif
 M=	${MACHINE_ARCH}
 
-SIZE?=		size
+NM?=		nm
 OBJCOPY?=	objcopy
+SIZE?=		size
 
 COPTFLAGS?=-O -pipe
 .if !defined(NO_CPU_COPTFLAGS)
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 620c16a1538..172974119d0 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -36,8 +36,9 @@ S=	../../..
 .endif
 M=	${MACHINE_ARCH}
 
-SIZE?=		size
+NM?=		nm
 OBJCOPY?=	objcopy
+SIZE?=		size
 
 COPTFLAGS?=-O -pipe
 .if !defined(NO_CPU_COPTFLAGS)
@@ -179,7 +180,7 @@ hack.So: Makefile
 ./assym.s: assym.s
 
 assym.s: $S/kern/genassym.sh genassym.o
-	OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
+	NM=${NM} OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
 
 genassym.o: $S/$M/$M/genassym.c
 	${CC} -c ${CFLAGS} -elf $S/$M/$M/genassym.c
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index e530ab6d8ba..144476c8a7e 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -37,9 +37,9 @@ S=	../../..
 .endif
 M=	${MACHINE_ARCH}
 
-SIZE?=		size
-OBJCOPY?=	objcopy
 NM?=		nm
+OBJCOPY?=	objcopy
+SIZE?=		size
 
 COPTFLAGS?=-O -pipe
 .if !defined(NO_CPU_COPTFLAGS)
diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index 8d94ffc76a0..8ab67f7b73c 100644
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
@@ -49,8 +49,9 @@ S=	../../..
 .endif
 M=	${MACHINE_ARCH}
 
-SIZE?=		size
+NM?=		nm
 OBJCOPY?=	objcopy
+SIZE?=		size
 
 COPTFLAGS?=-O -pipe
 .if !defined(NO_CPU_COPTFLAGS)
@@ -193,7 +194,7 @@ hack.So: Makefile
 ./assym.s: assym.s
 
 assym.s: $S/kern/genassym.sh genassym.o
-	OBJFORMAT=elf NM=${NM} sh $S/kern/genassym.sh genassym.o > ${.TARGET}
+	NM=${NM} OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
 
 genassym.o: $S/$M/$M/genassym.c
 	${CC} -c ${CFLAGS} -elf $S/$M/$M/genassym.c