Updated to recent version of Paul K.'s shlib code. This code has better

warning handling and allows for link-time warnings with a modified
version of gas.

Note: Not all of the newer bits were updated such as some of the non-x86
machine-dependant code is relevant to FreeBSD right now.

Obtained from: NetBSD

3 files changed, 9 insertions, 12 deletions

diff --git a/libexec/rtld-aout/i386/md.c b/libexec/rtld-aout/i386/md.c
index ce61355..40d9916 100644
--- a/libexec/rtld-aout/i386/md.c
+++ b/libexec/rtld-aout/i386/md.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: md.c,v 1.9 1994/02/13 20:42:09 jkh Exp $
+ *	$Id: md.c,v 1.10 1994/06/15 22:40:44 rich Exp $
  */
 
 #include <sys/param.h>
@@ -228,7 +228,7 @@ long	*savep;
 
 #ifndef RTLD
 
-#ifdef FreeBSD
+#ifdef __FreeBSD__
 int	netzmagic;
 #endif
 
@@ -247,7 +247,7 @@ int		magic, flags;
 	else
 		N_SETMAGIC((*hp), magic, MID_I386, flags);
 #endif
-#ifdef FreeBSD
+#ifdef __FreeBSD__
 	if (oldmagic)
 		hp->a_midmag = magic;
 	else if (netzmagic)
diff --git a/libexec/rtld-aout/i386/md.h b/libexec/rtld-aout/i386/md.h
index 1209aee..89c1213 100644
--- a/libexec/rtld-aout/i386/md.h
+++ b/libexec/rtld-aout/i386/md.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: md.h,v 1.9 1994/02/13 20:42:11 jkh Exp $
+ *	$Id: md.h,v 1.10 1994/06/15 22:40:46 rich Exp $
  */
 
 
@@ -63,7 +63,7 @@
 /*
  * FreeBSD does it differently
  */
-#ifdef FreeBSD
+#ifdef __FreeBSD__
 #define N_SET_FLAG(ex,f)	(oldmagic ? (0) :			\
 				  (netzmagic == 0 ?			\
 					N_SETMAGIC(ex,			\
diff --git a/libexec/rtld-aout/i386/mdprologue.S b/libexec/rtld-aout/i386/mdprologue.S
index 6a582be..43640c6 100644
--- a/libexec/rtld-aout/i386/mdprologue.S
+++ b/libexec/rtld-aout/i386/mdprologue.S
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mdprologue.S,v 1.3 1993/12/10 10:16:00 jkh Exp $
+ *	$Id: mdprologue.S,v 1.4 1994/06/15 22:40:49 rich Exp $
  */
 
 /*
@@ -43,13 +43,10 @@
 /*
  *	_rtl(int version, struct crt_ldso *crtp)
  */
-#define FRAME	12			/* Size of stack frame */
-
 
 _rtl:					# crt0 calls us here
 	pushl	%ebp			# Allocate stack frame
 	movl	%esp, %ebp
-	subl	$FRAME, %esp
 	pushl	%ebx
 	call	1f			# PIC function prologue
 1:
@@ -68,9 +65,9 @@ _rtl:					# crt0 calls us here
 	call	%eax			# _rtld(version, crtp, DYNAMIC)
 	addl	$12,%esp		# pop arguments
 
-	movl	(-FRAME-4)(%ebp), %ebx	# restore %ebx
+	movl	-4(%ebp), %ebx		# restore %ebx
 	leave				# remove stack frame,
-	ret				# lets rock
+	ret				# let's rock
 
  # First call to a procedure generally comes through here for
  # binding.
@@ -96,7 +93,7 @@ _binder_entry:
 	ret
 
  # Special system call stubs which return real and effective user and group
- # ids.  Saves overhead of making separate calls for each.
+ # id's.  Saves overhead of making separate calls for each.
  # !! Relies on compatability option in BSD 4.three-and-a-half
 
 	.globl	_getreuid, _getregid