317ff0084b
This patch deals with the auto-import feature. There are 2 versions
of this feature: the original one, which was piggybacked on the OS
loader with an optional help from the runtime (--enable-auto-import
--enable-runtime-pseudo-reloc-v1) and is still the one mostly
documented in the sources and manual; the enhanced one by Kai Tietz,
which is entirely piggybacked on the runtime (--enable-auto-import
--enable-runtime-pseudo-reloc-v2) and is the default for Mingw and
Cygwin nowadays.
The implementation is inefficient because of pe[p]_find_data_imports:
for every undefined symbol, the function walks the entire set of
relocations for all the input files and does a direct name comparison
for each of them.
This is easily fixable by using a hash-based map for v1 and a simple
hash table for v2. This patch leaves v1 alone and only changes v2.
It also factors out pe[p]_find_data_imports into a common function,
removes old cruft left and right, and attempts to better separate
the implementations of v1 and v2 in the code.
ld/
* emultempl/pe.em (U_SIZE): Delete.
(pe_data_import_dll): Likewise.
(make_import_fixup): Return void, take 4th parameter and pass it down
in call to pe_create_import_fixup.
(pe_find_data_imports): Move to...
(gld_${EMULATION_NAME}_after_open): Run the stdcall fixup pass after
the auto-import pass and add a guard before running the latter.
* emultempl/pep.em (U_SIZE): Delete.
(pep_data_import_dll): Likewise.
(make_import_fixup): Return void, take 4th parameter and pass it down
in call to pe_create_import_fixup.
(pep_find_data_imports): Move to...
(gld_${EMULATION_NAME}_after_open): Run the stdcall fixup pass after
the auto-import pass and add a guard before running the latter.
* pe-dll.c (runtime_pseudp_reloc_v2_init): Change type to bfd_boolean.
(pe_walk_relocs_of_symbol): Rename into...
(pe_walk_relocs): ...this. Add 2 more parameters,4th parameter to the
callback prototype and pass 4th parameter in calls to the callback.
If the import hash table is present, invoke the callback on the reloc
if the symbol name is in the table.
(pe_find_data_imports): ...here. Take 2 parameters. Build an import
hash table for the pseudo-relocation support version 2. When it is
built, walk the relocations only once at the end; when it is not, do
not build a fixup when the symbol isn't part of an import table.
Issue the associated warning only after a first fixup is built.
(tmp_seq2): Delete.
(make_singleton_name_imp): Likewise.
(make_import_fixup_mark): Return const char * and a stable string.
(make_import_fixup_entry): Do not deal with the pseudo-relocation
support version 2.
(make_runtime_pseudo_reloc): Factor out code and fix formatting.
(pe_create_import_fixup): Add 5th parameter. Clearly separate the
pseudo-relocation support version 2 from the rest. Fix formatting.
* pe-dll.h (pe_walk_relocs_of_symbol): Delete.
(pe_find_data_imports): Declare.
(pe_create_import_fixup): Add 5th parameter.
* pep-dll.c (pe_data_import_dll): Delete.
(pe_find_data_imports): Define.
(pe_walk_relocs_of_symbol): Delete.
* pep-dll.h (pep_walk_relocs_of_symbol): Delete.
(pep_find_data_imports): Declare.
(pep_create_import_fixup): Add 5th parameter.
* ld.texinfo (--enable-auto-import): Adjust to new implementation.
64 lines
2.7 KiB
C
64 lines
2.7 KiB
C
/* Routines to help build PEPI-format DLLs (Win64 etc)
|
|
Copyright (C) 2006-2018 Free Software Foundation, Inc.
|
|
Written by Kai Tietz, OneVision Software GmbH&CoKg.
|
|
|
|
This file is part of the GNU Binutils.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
MA 02110-1301, USA. */
|
|
|
|
#define COFF_IMAGE_WITH_PE
|
|
#define COFF_WITH_PE
|
|
#define COFF_WITH_pex64
|
|
|
|
/* Local defined globals. */
|
|
#define pe_def_file pep_def_file
|
|
#define pe_details pep_details
|
|
#define pe_dll_compat_implib pep_dll_compat_implib
|
|
#define pe_dll_extra_pe_debug pep_dll_extra_pe_debug
|
|
#define pe_dll_export_everything pep_dll_export_everything
|
|
#define pe_dll_exclude_all_symbols pep_dll_exclude_all_symbols
|
|
#define pe_dll_do_default_excludes pep_dll_do_default_excludes
|
|
#define pe_dll_kill_ats pep_dll_kill_ats
|
|
#define pe_dll_stdcall_aliases pep_dll_stdcall_aliases
|
|
#define pe_dll_warn_dup_exports pep_dll_warn_dup_exports
|
|
#define pe_use_nul_prefixed_import_tables \
|
|
pep_use_nul_prefixed_import_tables
|
|
#define pe_use_coff_long_section_names \
|
|
pep_use_coff_long_section_names
|
|
#define pe_leading_underscore pep_leading_underscore
|
|
|
|
/* Unique global name for functions to avoid double defined symbols. */
|
|
#define pe_find_data_imports pep_find_data_imports
|
|
#define pe_create_import_fixup pep_create_import_fixup
|
|
#define pe_dll_generate_def_file pep_dll_generate_def_file
|
|
#define pe_process_import_defs pep_process_import_defs
|
|
#define pe_dll_id_target pep_dll_id_target
|
|
#define pe_implied_import_dll pep_implied_import_dll
|
|
#define pe_dll_build_sections pep_dll_build_sections
|
|
#define pe_exe_build_sections pep_exe_build_sections
|
|
#define pe_dll_fill_sections pep_dll_fill_sections
|
|
#define pe_exe_fill_sections pep_exe_fill_sections
|
|
#define pe_dll_generate_implib pep_dll_generate_implib
|
|
#define pe_dll_add_excludes pep_dll_add_excludes
|
|
#define pe_bfd_is_dll pep_bfd_is_dll
|
|
#define pe_output_file_set_long_section_names \
|
|
pep_output_file_set_long_section_names
|
|
|
|
/* Uses x86_64 PE+. */
|
|
#define pe_use_x86_64
|
|
|
|
#include "pe-dll.c"
|