summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/ld/ld.c
diff options
context:
space:
mode:
authordg <dg@FreeBSD.org>1994-02-17 03:57:00 +0000
committerdg <dg@FreeBSD.org>1994-02-17 03:57:00 +0000
commitecc51307e301952d74f821e51932ec0d54347337 (patch)
tree0e7814947f2320f199ac6e3ae503e046710893ab /gnu/usr.bin/ld/ld.c
parent9f7c3c3eb03bba7dd33498976c3828d080e08809 (diff)
downloadFreeBSD-src-ecc51307e301952d74f821e51932ec0d54347337.zip
FreeBSD-src-ecc51307e301952d74f821e51932ec0d54347337.tar.gz
Handling of the netzmagic flag was completely missing after the last
update. This completely broke support for all ZMAGIC a.out formats.
Diffstat (limited to 'gnu/usr.bin/ld/ld.c')
-rw-r--r--gnu/usr.bin/ld/ld.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/usr.bin/ld/ld.c b/gnu/usr.bin/ld/ld.c
index 1d63c82..d3ef9f5 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.19 1994/01/19 15:00:27 davidg Exp $
+ * $Id: ld.c,v 1.20 1994/02/13 20:41:28 jkh Exp $
*/
/* Define how to initialize system-dependent header fields. */
@@ -347,7 +347,6 @@ main(argc, argv)
* and initialize the text size accordingly. This depends on the kind
* of system and on the output format selected.
*/
-
if (magic == ZMAGIC || magic == QMAGIC)
page_align_segments = 1;
@@ -755,10 +754,16 @@ decode_option(swt, arg)
case 'z':
magic = ZMAGIC;
oldmagic = 0;
+#ifdef __FreeBSD__
+ netzmagic = 1;
+#endif
return;
case 'Z':
magic = oldmagic = ZMAGIC;
+#ifdef __FreeBSD__
+ netzmagic = 0;
+#endif
return;
default:
OpenPOWER on IntegriCloud