diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-02-21 16:01:05 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-02-21 16:01:05 +0000 |
| commit | 5b876c83edaeef0d45ab9fc077659145cfe97f23 (patch) | |
| tree | c860f49531a7b13623c52475182ad72e8cfac8b1 /gnu/usr.bin | |
| parent | 087477a275b631918db59e41d7ca7e5cb378df9a (diff) | |
back out recent change. completely breaks ld on the sparc:
collect2: ld terminated with signal 11 [Segmentation fault]
Diffstat (limited to 'gnu/usr.bin')
| -rw-r--r-- | gnu/usr.bin/ld/ld.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/gnu/usr.bin/ld/ld.c b/gnu/usr.bin/ld/ld.c index 4067441b55a..d29b195fe70 100644 --- a/gnu/usr.bin/ld/ld.c +++ b/gnu/usr.bin/ld/ld.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ld.c,v 1.13 2000/02/11 23:45:06 espie Exp $ */ +/* $OpenBSD: ld.c,v 1.14 2000/02/21 16:01:04 deraadt Exp $ */ /* $NetBSD: ld.c,v 1.52 1998/02/20 03:12:51 jonathan Exp $ */ /*- @@ -1882,7 +1882,6 @@ digest_pass1() FOR_EACH_SYMBOL(i, sp) { symbol *spsave; struct localsymbol *lsp; - struct nlist *q; int defs = 0; if (!(sp->flags & GS_REFERENCED)) { @@ -2030,11 +2029,6 @@ digest_pass1() common_defined_global_count--; undefined_global_sym_count++; } - /* Let WEAK symbols take precedence over second class */ - if (q != 0 && N_ISWEAK(q) && - (lsp->entry->flags & E_SECONDCLASS)) - continue; - q = p; sp->def_lsp = lsp; sp->so_defined = type; |