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
---
 libexec/Makefile          | 8 +-------
 libexec/rtld-aout/shlib.c | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'libexec')

diff --git a/libexec/Makefile b/libexec/Makefile
index a9ede3e..75c768b 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -23,6 +23,7 @@ SUBDIR=	atrun \
 	rpc.rwalld \
 	rpc.sprayd \
 	rshd \
+	rtld-elf \
 	save-entropy \
 	talkd \
 	tcpd \
@@ -38,13 +39,6 @@ SUBDIR+=named-xfer
 SUBDIR+=mail.local smrsh
 .endif
 
-.if ${OBJFORMAT} == aout
-SUBDIR+=rtld-aout
-.endif
-
-.if ${OBJFORMAT} == elf
-SUBDIR+=rtld-elf
-.endif
 
 .if defined(RELEASEDIR) || \
     (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberosIV)) || \
diff --git a/libexec/rtld-aout/shlib.c b/libexec/rtld-aout/shlib.c
index 989cf45..9fd2c66 100644
--- a/libexec/rtld-aout/shlib.c
+++ b/libexec/rtld-aout/shlib.c
@@ -44,7 +44,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <link.h>
+#include <sys/link_aout.h>
 #include "shlib.h"
 #include "support.h"
 
-- 
cgit v1.1