espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 09:58:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

When scanning MS import libraries allow for the possible presence of static

Browse Source 
objects.
This commit is contained in:
Nick Clifton
2003-12-18 14:56:44 +00:00
parent 18ab192184
commit 44dbf3639f
2 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ld/ChangeLog
View File

@ -1,3 +1,9 @@
2003-12-18 Eric Youngdale <eric@mkssoftware.com>
Nick Clifton <nickc@redhat.com>
* emultempl/pe.em (_after_open): When scanning MS import
libraries allow for the possible presence of static objects.
2003-12-07 H.J. Lu <hongjiu.lu@intel.com>
* ldlang.c (lang_vers_match): Pass "DMGL_PARAMS | DMGL_ANSI" to

51
ld/emultempl/pe.em
View File

@ -1115,6 +1115,7 @@ gld_${EMULATION_NAME}_after_open (void)
int is_ms_arch = 0;
bfd *cur_arch = 0;
lang_input_statement_type *is2;
lang_input_statement_type *is3;
/* Careful - this is a shell script. Watch those dollar signs! */
/* Microsoft import libraries have every member named the same,
@ -1129,21 +1130,59 @@ gld_${EMULATION_NAME}_after_open (void)
{
if (is->the_bfd->my_archive)
{
char *pnt;
bfd *arch = is->the_bfd->my_archive;
if (cur_arch != arch)
{
cur_arch = arch;
is_ms_arch = 1;
for (is2 = is;
is2 && is2->the_bfd->my_archive == arch;
is2 = (lang_input_statement_type *)is2->next)
for (is3 = is;
is3 && is3->the_bfd->my_archive == arch;
is3 = (lang_input_statement_type *) is3->next)
{
if (strcmp (is->the_bfd->filename, is2->the_bfd->filename))
is_ms_arch = 0;
/* A MS dynamic import library can also contain static
members, so look for the first element with a .dll
extension, and use that for the remainder of the
comparisons. */
pnt = strrchr (is3->the_bfd->filename, '.');
if (pnt != NULL && strcmp (pnt, ".dll") != 0)
continue;
}
if (is3 == NULL)
is_ms_arch = 0;
else
{
/* OK, found one. Now look to see if the remaining
(dynamic import) members use the same name. */
for (is2 = is;
is2 && is2->the_bfd->my_archive == arch;
is2 = (lang_input_statement_type *) is2->next)
{
/* Skip static members, ie anything with a .obj
extension. */
pnt = strrchr (is2->the_bfd->filename, '.');
if (pnt != NULL && strcmp (pnt, ".obj") == 0)
continue;
if (strcmp (is3->the_bfd->filename,
is2->the_bfd->filename))
{
is_ms_arch = 0;
break;
}
}
}
}
if (is_ms_arch)
/* This fragment might have come from an .obj file in a Microsoft
import, and not an actual import record. If this is the case,
then leave the filename alone. */
pnt = strrchr (is->the_bfd->filename, '.');
if (is_ms_arch && (strcmp (pnt, ".dll") == 0))
{
int idata2 = 0, reloc_count=0;
asection *sec;