From e1402a88c62366b1e370ee8d25d50814e41b0abd Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Mon, 29 Dec 2003 11:34:33 +0000
Subject: [PATCH] Garbage-collected some vestiges of objformat support (mainly
 ${FMT}).

---
 sys/conf/Makefile.alpha | 2 +-
 sys/conf/kern.post.mk   | 4 +---
 sys/conf/kern.pre.mk    | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 3055712c3db1..6bc78506a4dd 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -28,7 +28,7 @@ S=	../../..
 .endif
 .include "$S/conf/kern.pre.mk"
 
-SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \
+SYSTEM_LD= @${LD} -Bdynamic -T $S/conf/ldscript.$M \
 	-e locorestart \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index 96b02b48d5df..0bc5801f3183 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -103,7 +103,7 @@ lint: ${LNFILES}
 HACK_EXTRA_FLAGS?= -shared
 hack.So: Makefile
 	touch hack.c
-	${CC} ${FMT} ${HACK_EXTRA_FLAGS} -nostdlib hack.c -o hack.So
+	${CC} ${HACK_EXTRA_FLAGS} -nostdlib hack.c -o hack.So
 	rm -f hack.c
 
 # This rule stops ./assym.s in .depend from causing problems.
@@ -112,8 +112,6 @@ hack.So: Makefile
 assym.s: $S/kern/genassym.sh genassym.o
 	NM=${NM} sh $S/kern/genassym.sh genassym.o > ${.TARGET}
 
-# XXX used to force -elf after CFLAGS to work around breakage of cc -aout
-# (genassym.sh makes some assumptions and cc stopped satisfying them).
 genassym.o: $S/$M/$M/genassym.c
 	${CC} -c ${CFLAGS:N-fno-common} -Wno-inline $S/$M/$M/genassym.c
 
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 9202d6691596..518c4729ef0f 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -78,11 +78,11 @@ SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
 SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS}
 SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}
 SYSTEM_OBJS+= hack.So
-SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \
+SYSTEM_LD= @${LD} -Bdynamic -T $S/conf/ldscript.$M \
 	-warn-common -export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \
-	${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET}
+	${SIZE} ${.TARGET} ; chmod 755 ${.TARGET}
 SYSTEM_DEP+= $S/conf/ldscript.$M
 
 # MKMODULESENV is set here so that port makefiles can augment