mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-26 19:44:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ld/PE: Handle MS style import libraries for files named *.exe too

Browse Source 
When handling MS style import libraries (also called short import
libraries, or ILF), we need to detect the kind of library.

So far, this has been done by looking at the member file names
in the import library - in an MS style import library, all the
member files for a specific library have the same member file
name - the name of the runtime module to link against. Usually
this is a DLL - thus we do a case insensitive comparison and
check if the suffix is .dll.

However, an .exe can also export symbols which can be linked
against in the same way. In particular, if linking against
WDK (Windows Driver Kit) import libraries, e.g. wdmsec.lib, the
import libraries can provide imports for ntoskrnl.exe.

Instead of specifically checking for *.dll (and *.exe, etc),
invert the condition and skip archive members named *.o and *.obj.
For any remaining archive members, that do contain .idata
sections, apply the renaming. (The renaming is also mostly
harmless if applied where it isn't needed; if archive members
already have unique file names, their relative ordering should
remain intact except for very contrieved cases.)

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2024-09-06 16:18:02 +03:00
parent 595e49a4b7
commit 3c557e1ae9
2 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ld/emultempl/pe.em
View File

@ -1747,13 +1747,28 @@ gld${EMULATION_NAME}_after_open (void)
/* Microsoft import libraries may contain archive members for
one or more DLLs, together with static object files.
Inspect all members that are named *.dll - check whether
they contain .idata sections. Do the renaming of all
archive members that seem to be Microsoft style import
objects. */
The head and sentinels are regular COFF object files,
while the thunks are special ILF files that get synthesized
by bfd into COFF object files.
As Microsoft import libraries can be for a module with
almost any file name (*.dll, *.exe, etc), we can't easily
know which archive members to inspect.
Inspect all members, except ones named *.o or *.obj (which
is the case both for regular static libraries or for GNU
style import libraries). Archive members with file names other
than *.o or *.obj, that do contain .idata sections, are
considered to be Microsoft style import objects, and are
renamed accordingly.
If this heuristic is wrong and we apply this on archive members
that already have unique names, it shouldn't make any difference
as we only append a suffix on the names. */
pnt = strrchr (bfd_get_filename (is->the_bfd), '.');
if (pnt != NULL && (fileext_cmp (pnt + 1, "dll") == 0))
if (pnt != NULL && (fileext_cmp (pnt + 1, "o") != 0 &&
fileext_cmp (pnt + 1, "obj") != 0))
{
int idata2 = 0, reloc_count = 0, idata = 0;
asection *sec;
@ -1768,8 +1783,8 @@ gld${EMULATION_NAME}_after_open (void)
reloc_count += sec->reloc_count;
}
/* An archive member named .dll, but not having any .idata
sections - apparently not a Microsoft import object
/* An archive member not named .o or .obj, but not having any
.idata sections - apparently not a Microsoft import object
after all: Skip renaming it. */
if (!idata)
continue;

29
ld/emultempl/pep.em
View File

@ -1730,13 +1730,28 @@ gld${EMULATION_NAME}_after_open (void)
/* Microsoft import libraries may contain archive members for
one or more DLLs, together with static object files.
Inspect all members that are named *.dll - check whether
they contain .idata sections. Do the renaming of all
archive members that seem to be Microsoft style import
objects. */
The head and sentinels are regular COFF object files,
while the thunks are special ILF files that get synthesized
by bfd into COFF object files.
As Microsoft import libraries can be for a module with
almost any file name (*.dll, *.exe, etc), we can't easily
know which archive members to inspect.
Inspect all members, except ones named *.o or *.obj (which
is the case both for regular static libraries or for GNU
style import libraries). Archive members with file names other
than *.o or *.obj, that do contain .idata sections, are
considered to be Microsoft style import objects, and are
renamed accordingly.
If this heuristic is wrong and we apply this on archive members
that already have unique names, it shouldn't make any difference
as we only append a suffix on the names. */
pnt = strrchr (bfd_get_filename (is->the_bfd), '.');
if (pnt != NULL && (fileext_cmp (pnt + 1, "dll") == 0))
if (pnt != NULL && (fileext_cmp (pnt + 1, "o") != 0 &&
fileext_cmp (pnt + 1, "obj") != 0))
{
int idata2 = 0, reloc_count = 0, idata = 0;
asection *sec;
@ -1751,8 +1766,8 @@ gld${EMULATION_NAME}_after_open (void)
reloc_count += sec->reloc_count;
}
/* An archive member named .dll, but not having any .idata
sections - apparently not a Microsoft import object
/* An archive member not named .o or .obj, but not having any
.idata sections - apparently not a Microsoft import object
after all: Skip renaming it. */
if (!idata)
continue;