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

oops - omitted from previous delta

Browse Source
This commit is contained in:
Nick Clifton
2001-09-24 18:21:24 +00:00
parent 96d2f608dc
commit aa3d9aba51
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ld/emultempl/pe.em
View File

@ -153,7 +153,6 @@ static char *pe_out_def_filename = NULL;
static char *pe_implib_filename = NULL; static char *pe_implib_filename = NULL;
static int pe_enable_auto_image_base = 0; static int pe_enable_auto_image_base = 0;
static char *pe_dll_search_prefix = NULL; static char *pe_dll_search_prefix = NULL;
static char *pe_data_import_dll = NULL;
#endif #endif
extern const char *output_filename; extern const char *output_filename;
@ -756,23 +755,12 @@ gld_${EMULATION_NAME}_after_parse ()
ldlang_add_undef (entry_symbol); ldlang_add_undef (entry_symbol);
} }
/* Previously, pe-dll.c directly accessed pe_data_import_dll, /* pe-dll.c directly accesses pe_data_import_dll,
which was only defined if DLL_SUPPORT. This cause a build so it must be defined outside of #ifdef DLL_SUPPORT.
failure on certain targets. At least this function will Note - this variable is deliberately not initialised.
exist regardless of whether DLL_SUPPORT is defined or not. This allows it to be treated as a common varaible, and only
exist in one incarnation in a multiple target enabled linker. */
However, it's still a kludge. pe-dll.c shouldn't directly char * pe_data_import_dll;
call any functions other than the gld_${EMULATION_NAME}_*. */
char *
pe_get_data_import_dll_name ()
{
#ifdef DLL_SUPPORT
return pe_data_import_dll;
#else
return "unknown";
#endif
}
#ifdef DLL_SUPPORT #ifdef DLL_SUPPORT
static struct bfd_link_hash_entry *pe_undef_found_sym; static struct bfd_link_hash_entry *pe_undef_found_sym;

6
ld/pe-dll.c
View File

@ -2069,8 +2069,10 @@ pe_create_import_fixup (rel)
} }
{ {
bfd *b = make_import_fixup_entry (name, fixup_name, extern char * pe_data_import_dll;
pe_get_data_import_dll_name (), char * dll_symname = pe_data_import_dll ? "unknown" : pe_data_import_dll;
bfd *b = make_import_fixup_entry (name, fixup_name, dll_symname,
output_bfd); output_bfd);
add_bfd_to_link (b, b->filename, &link_info); add_bfd_to_link (b, b->filename, &link_info);
} }