From a51c9b66271f0551fb83b90a7db6c464eac2318b Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Tue, 17 Sep 2002 01:49:00 +0000
Subject: Initiate deorbit burn for the i386-only a.out related support.  Moves
 are under way to move the remnants of the a.out toolchain to ports.  As the
 comment in src/Makefile said, this stuff is deprecated and one should not
 expect this to remain beyond 4.0-REL.  It has already lasted WAY beyond that.

Notable exceptions:
gcc - I have not touched the a.out generation stuff there.
ldd/ldconfig - still have some code to interface with a.out rtld.
old as/ld/etc - I have not removed these yet, pending their move to ports.
some includes - necessary for ldd/ldconfig for now.

Tested on: i386 (extensively), alpha
---
 share/mk/bsd.dep.mk  |  9 ---------
 share/mk/bsd.lib.mk  | 20 --------------------
 share/mk/bsd.own.mk  |  7 -------
 share/mk/bsd.prog.mk |  7 -------
 share/mk/sys.mk      | 10 +---------
 5 files changed, 1 insertion(+), 52 deletions(-)

(limited to 'share')

diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index bf996d5..fc6ed71 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -153,7 +153,6 @@ cleandepend:
 
 .if !target(checkdpadd) && (defined(DPADD) || defined(LDADD))
 checkdpadd:
-.if ${OBJFORMAT} != aout
 	@ldadd=`echo \`for lib in ${DPADD} ; do \
 		echo $$lib | sed 's;^/usr/lib/lib\(.*\)\.a;-l\1;' ; \
 	done \`` ; \
@@ -163,12 +162,4 @@ checkdpadd:
 		echo "DPADD -> $$ldadd" ; \
 		echo "LDADD -> $$ldadd1" ; \
 	fi
-.else
-	@dpadd=`echo \`ld -Bstatic -f ${LDADD}\`` ; \
-	if [ "$$dpadd" != "${DPADD}" ] ; then \
-		echo ${.CURDIR} ; \
-		echo "LDADD -> $$dpadd" ; \
-		echo "DPADD =  ${DPADD}" ; \
-	fi
-.endif
 .endif
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 6ff36d9..1e70165 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -12,7 +12,6 @@
 .undef SHLIB_NAME
 .undef INSTALL_PIC_ARCHIVE
 .else
-.if ${OBJFORMAT} == elf
 .if !defined(SHLIB_NAME) && defined(LIB) && defined(SHLIB_MAJOR)
 SHLIB_NAME=	lib${LIB}.so.${SHLIB_MAJOR}
 .endif
@@ -20,11 +19,6 @@ SHLIB_NAME=	lib${LIB}.so.${SHLIB_MAJOR}
 SHLIB_LINK?=	${SHLIB_NAME:R}
 .endif
 SONAME?=	${SHLIB_NAME}
-.else
-.if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
-SHLIB_NAME?=	lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
-.endif
-.endif
 .endif
 
 .if defined(DEBUG_FLAGS)
@@ -35,9 +29,7 @@ CFLAGS+= ${DEBUG_FLAGS}
 STRIP?=	-s
 .endif
 
-.if ${OBJFORMAT} != aout || make(checkdpadd) || defined(NEED_LIBNAMES)
 .include <bsd.libnames.mk>
-.endif
 
 # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
 # .So used for PIC object files
@@ -197,16 +189,10 @@ ${SHLIB_NAME}: ${SOBJS}
 .if defined(SHLIB_LINK)
 	@ln -fs ${.TARGET} ${SHLIB_LINK}
 .endif
-.if ${OBJFORMAT} == aout
-	@${CC} -shared -Wl,-x,-assert,pure-text \
-	    -o ${.TARGET} \
-	    `lorder ${SOBJS} | tsort -q` ${LDADD}
-.else
 	@${CC} ${LDFLAGS} -shared -Wl,-x \
 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
 	    `lorder ${SOBJS} | tsort -q` ${LDADD}
 .endif
-.endif
 
 .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
 _LIBS+=		lib${LIB}_pic.a
@@ -243,16 +229,10 @@ _EXTRADEPEND:
 	    > $$TMP; \
 	mv $$TMP ${DEPENDFILE}
 .if !defined(NOEXTRADEPEND) && defined(SHLIB_NAME)
-.if ${OBJFORMAT} == aout
-	echo ${SHLIB_NAME}: \
-	    `${CC} -shared -Wl,-f ${LDADD}` \
-	    >> ${DEPENDFILE}
-.else
 .if defined(DPADD) && !empty(DPADD)
 	echo ${SHLIB_NAME}: ${DPADD} >> ${DEPENDFILE}
 .endif
 .endif
-.endif
 
 .if !target(install)
 
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index bab9a51..7793cd5 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -21,9 +21,6 @@
 #		own install script so that the entire system can be made
 #		stripped/not-stripped using a single knob. [-s]
 #
-# OBJFORMAT	Default object format that selects which set of tools to run.
-#		[elf]
-#
 # BINOWN	Binary owner. [root]
 #
 # BINGRP	Binary group. [wheel]
@@ -123,11 +120,7 @@ KMODOWN?=	${BINOWN}
 KMODGRP?=	${BINGRP}
 KMODMODE?=	${BINMODE}
 
-.if ${OBJFORMAT} == aout
-LIBDIR?=	/usr/lib/aout
-.else
 LIBDIR?=	/usr/lib
-.endif
 LIBCOMPATDIR?=	/usr/lib/compat
 LIBDATADIR?=	/usr/libdata
 LINTLIBDIR?=	/usr/libdata/lint
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 5cfc877..15f9e37 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -82,16 +82,11 @@ CLEANFILES+= ${PROG} ${OBJS}
 
 .if defined(PROG)
 _EXTRADEPEND:
-.if ${OBJFORMAT} == aout
-	echo ${PROG}: `${CC} -Wl,-f ${CFLAGS} ${LDFLAGS} \
-	    ${LDADD:S/^/-Wl,/}` >> ${DEPENDFILE}
-.else
 	echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
 .if defined(PROG_CXX)
 	echo ${PROG}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}
 .endif
 .endif
-.endif
 
 .if !target(install)
 
@@ -186,9 +181,7 @@ tags: ${SRCS}
 .include <bsd.man.mk>
 .endif
 
-.if ${OBJFORMAT} != aout || make(checkdpadd) || defined(NEED_LIBNAMES)
 .include <bsd.libnames.mk>
-.endif
 
 .include <bsd.dep.mk>
 
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index dcd4208..c24a34ef 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -259,14 +259,6 @@ __MAKE_CONF?=/etc/make.conf
 .include </etc/make.conf.local>
 .endif
 
-#
-# The build tools are indirected by /usr/bin/objformat which determines the
-# object format from the OBJFORMAT environment variable and if this is not
-# defined, it reads /etc/objformat.
-#
-.if exists(/etc/objformat) && !defined(OBJFORMAT)
-.include "/etc/objformat"
-.endif
-
 # Default executable format
+# XXX hint for bsd.port.mk
 OBJFORMAT?=	elf
-- 
cgit v1.1