diff options
| author | paul <paul@FreeBSD.org> | 1993-11-16 00:42:57 +0000 |
|---|---|---|
| committer | paul <paul@FreeBSD.org> | 1993-11-16 00:42:57 +0000 |
| commit | 0d6de7cdb157115ed482a2de1b4661a50ad1182a (patch) | |
| tree | bd7f805979ee78965391de15b60de9442362aaed /gnu/usr.bin/ld/ld.c | |
| parent | 4d25c340fff572f212169f58e4624d3c147afc49 (diff) | |
| download | FreeBSD-src-0d6de7cdb157115ed482a2de1b4661a50ad1182a.zip FreeBSD-src-0d6de7cdb157115ed482a2de1b4661a50ad1182a.tar.gz | |
Swapped meaning of -Z and -z options.
On any other system -z means "standard" ZMAGIC format and is the
default. Therefore I've made -z be standard ZMAGIC and -Z be ZMAGIC
stored in the new a_midmag format.
The "standard" ZMAGIC format is now the default as well.
Diffstat (limited to 'gnu/usr.bin/ld/ld.c')
| -rw-r--r-- | gnu/usr.bin/ld/ld.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/usr.bin/ld/ld.c b/gnu/usr.bin/ld/ld.c index 5aa4234..64c0241 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.5 1993/11/09 04:18:56 paul Exp $ + * $Id: ld.c,v 1.6 1993/11/15 20:58:05 paul Exp $ */ /* Define how to initialize system-dependent header fields. */ @@ -173,6 +173,7 @@ 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; @@ -543,10 +544,11 @@ decode_option(swt, arg) case 'Q': magic = oldmagic = QMAGIC; return; +#endif case 'Z': - magic = oldmagic = ZMAGIC; + magic = ZMAGIC; + oldmagic = 0; return; -#endif case 'o': output_filename = arg; @@ -608,7 +610,7 @@ decode_option(swt, arg) return; case 'z': - magic = ZMAGIC; + oldmagic = magic = ZMAGIC; return; default: |
