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
---
 etc/rc.d/ldconfig | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'etc/rc.d')

diff --git a/etc/rc.d/ldconfig b/etc/rc.d/ldconfig
index f88e918..6723cd4 100755
--- a/etc/rc.d/ldconfig
+++ b/etc/rc.d/ldconfig
@@ -23,18 +23,14 @@ ldconfig_start()
 		ldconfig=${ldconfig_command}
 		checkyesno ldconfig_insecure && ldconfig="${ldconfig} -i"
 		if [ -x "${ldconfig_command}" ]; then
-			case `/usr/bin/objformat` in
-			elf)
-				_LDC=/usr/lib
-				for i in ${ldconfig_paths}; do
-					if [ -d "${i}" ]; then
-						_LDC="${_LDC} ${i}"
-					fi
-				done
-				echo 'ELF ldconfig path:' ${_LDC}
-				${ldconfig} -elf ${_LDC}
-				;;
-			esac
+			_LDC=/usr/lib
+			for i in ${ldconfig_paths}; do
+				if [ -d "${i}" ]; then
+					_LDC="${_LDC} ${i}"
+				fi
+			done
+			echo 'ELF ldconfig path:' ${_LDC}
+			${ldconfig} -elf ${_LDC}
 
 			# Legacy aout support for i386 only
 			case `sysctl -n hw.machine_arch` in
-- 
cgit v1.1