Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't barf if two file names are the same.

This commit is contained in:
mycroft 1993-09-05 18:19:31 +00:00
parent 59d53ecfbf
commit d8e126d18b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/usr.bin/ld/ld.c
View File

@ -7,7 +7,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)ld.c 6.10 (Berkeley) 5/22/91";*/
static char rcsid[] = "$Id: ld.c,v 1.4 1993/08/01 18:46:55 mycroft Exp $";
static char rcsid[] = "$Id: ld.c,v 1.5 1993/09/05 18:19:31 mycroft Exp $";
#endif /* not lint */
/* Linker `ld' for GNU
@ -2433,7 +2433,8 @@ digest_symbols ()
}
set_vectors[setv_fill_count++] = p->n_value;
}
else if ((type & N_EXT) && type != (N_UNDF | N_EXT))
else if ((type & N_EXT) && type != (N_UNDF | N_EXT) &&
type != (N_FN | N_EXT))
{
/* non-common definition */
if (defs++ && sp->value != p->n_value)

5
gnu/usr.bin/ld/ld/ld.c
View File

@ -7,7 +7,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)ld.c 6.10 (Berkeley) 5/22/91";*/
static char rcsid[] = "$Id: ld.c,v 1.4 1993/08/01 18:46:55 mycroft Exp $";
static char rcsid[] = "$Id: ld.c,v 1.5 1993/09/05 18:19:31 mycroft Exp $";
#endif /* not lint */
/* Linker `ld' for GNU
@ -2433,7 +2433,8 @@ digest_symbols ()
}
set_vectors[setv_fill_count++] = p->n_value;
}
else if ((type & N_EXT) && type != (N_UNDF | N_EXT))
else if ((type & N_EXT) && type != (N_UNDF | N_EXT) &&
type != (N_FN | N_EXT))
{
/* non-common definition */
if (defs++ && sp->value != p->n_value)