From 9ff4f18864dd67b440e023a4a65daa2bffbc495c Mon Sep 17 00:00:00 2001
From: paul <paul@FreeBSD.org>
Date: Tue, 16 Nov 1993 07:20:35 +0000
Subject: Default magic is back to netbsd ZMAGIC, new a_midmag format needed
 for dynamic binaries. -z produces normal ZMAGIC. (this gets our kernel built)
 -Z produces netbsd ZMAGIC. (currently default)

---
 gnu/usr.bin/ld/Makefile | 3 ++-
 gnu/usr.bin/ld/ld.c     | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/usr.bin/ld')

diff --git a/gnu/usr.bin/ld/Makefile b/gnu/usr.bin/ld/Makefile
index 2be311f..e002e96 100644
--- a/gnu/usr.bin/ld/Makefile
+++ b/gnu/usr.bin/ld/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1993/11/09 20:39:26 paul Exp $
+# $Id: Makefile,v 1.6 1993/11/09 21:23:07 paul Exp $
 #
 
 PROG=	ld
@@ -7,6 +7,7 @@ CFLAGS += -static -I$(.CURDIR) -I$(.CURDIR)/$(MACHINE)
 
 LDADD+=	-lgnumalloc
 DPADD+= /usr/lib/libgnumalloc.a
+LDFLAGS+= -Xlinker -Bstatic
 
 SUBDIR=	ldconfig ldd 
 .if !defined(NOPIC)
diff --git a/gnu/usr.bin/ld/ld.c b/gnu/usr.bin/ld/ld.c
index 64c0241..4779887 100644
--- a/gnu/usr.bin/ld/ld.c
+++ b/gnu/usr.bin/ld/ld.c
@@ -32,7 +32,7 @@ static char sccsid[] = "@(#)ld.c	6.10 (Berkeley) 5/22/91";
    Set, indirect, and warning symbol features added by Randy Smith. */
 
 /*
- *	$Id: ld.c,v 1.6 1993/11/15 20:58:05 paul Exp $
+ *	$Id: ld.c,v 1.7 1993/11/16 00:42:57 paul Exp $
  */
    
 /* Define how to initialize system-dependent header fields.  */
@@ -173,7 +173,6 @@ main(argc, argv)
 	T_flag_specified = 0;
 	Tdata_flag_specified = 0;
 	magic = DEFAULT_MAGIC;
-	oldmagic = DEFAULT_MAGIC;
 	make_executable = 1;
 	force_executable = 0;
 	link_mode = DYNAMIC;
-- 
cgit v1.1