diff options
| author | Luca Bacci <luca.bacci@outlook.com> | 2023-05-17 13:38:14 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2023-05-17 13:38:14 +0100 |
| commit | 80d4e113d7b9af8a5a36e5ea4399bca86050784f (patch) | |
| tree | a471fa8b0176805e795dd73a3a97b5af94630482 /ld/pe-dll.c | |
| parent | 80b6c32f233ed28607643c4e4e4e2ee3399fdfd7 (diff) | |
| download | binutils-80d4e113d7b9af8a5a36e5ea4399bca86050784f.zip binutils-80d4e113d7b9af8a5a36e5ea4399bca86050784f.tar.gz binutils-80d4e113d7b9af8a5a36e5ea4399bca86050784f.tar.bz2 | |
Decorated symbols in import libs (BUG 30421)
PR 30421
* cofflink.c (_decoration_hash_newfunc): New function. (_bfd_coff_link_hash_table_init): Call it.
* libcoff-in.h (struct coff_link_hash_table): Add decoration_hash field. (struct decoration_hash_entry): Declare. (_decoration_hash_newfunc): Prototype.
* libcoff.h: Regenerate.
* emultempl/pe.em (set_decoration): New function. (pe_fixup_stdcalls): Call the new function.
* emultempl/pep.em (set_decoration): New function. (pep_fixup_stdcalls): Call the new function.
* pe-dll.c (make_one): Check for decoated symbols.
Diffstat (limited to 'ld/pe-dll.c')
| -rw-r--r-- | ld/pe-dll.c | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/ld/pe-dll.c b/ld/pe-dll.c index 8d74dba..e45ae10 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c @@ -2321,6 +2321,31 @@ make_one (def_file_export *exp, bfd *parent, bool include_jmp_stub) bfd *abfd; const unsigned char *jmp_bytes = NULL; int jmp_byte_count = 0; + const char *internal_name = exp->internal_name; + + if (!exp->flag_noname) + { + /* Check for a decorated symbol name */ + struct decoration_hash_entry *entry; + + entry = (struct decoration_hash_entry *) + bfd_hash_lookup (&(coff_hash_table (&link_info)->decoration_hash), + internal_name, false, false); + if (entry) + { + if (entry->decorated_link) + { + internal_name = entry->decorated_link->root.string; + + if (pe_details->underscored && internal_name[0] == '_') + internal_name++; + } + else + { + einfo (_("%P: error: NULL decorated name for %s\n"), internal_name); + } + } + } /* Include the jump stub section only if it is needed. A jump stub is needed if the symbol being imported <sym> is a function @@ -2382,13 +2407,13 @@ make_one (def_file_export *exp, bfd *parent, bool include_jmp_stub) id4 = quick_section (abfd, ".idata$4", SEC_HAS_CONTENTS, 2); id6 = quick_section (abfd, ".idata$6", SEC_HAS_CONTENTS, 2); - if (*exp->internal_name == '@') + if (*internal_name == '@') { quick_symbol (abfd, U ("_head_"), dll_symname, "", UNDSEC, BSF_GLOBAL, 0); if (include_jmp_stub) - quick_symbol (abfd, "", exp->internal_name, "", tx, BSF_GLOBAL, 0); - quick_symbol (abfd, "__imp_", exp->internal_name, "", id5, + quick_symbol (abfd, "", internal_name, "", tx, BSF_GLOBAL, 0); + quick_symbol (abfd, "__imp_", internal_name, "", id5, BSF_GLOBAL, 0); /* Fastcall applies only to functions, so no need for auto-import symbol. */ @@ -2398,18 +2423,18 @@ make_one (def_file_export *exp, bfd *parent, bool include_jmp_stub) quick_symbol (abfd, U ("_head_"), dll_symname, "", UNDSEC, BSF_GLOBAL, 0); if (include_jmp_stub) - quick_symbol (abfd, U (""), exp->internal_name, "", tx, + quick_symbol (abfd, U (""), internal_name, "", tx, BSF_GLOBAL, 0); - quick_symbol (abfd, "__imp_", U (""), exp->internal_name, id5, + quick_symbol (abfd, "__imp_", U (""), internal_name, id5, BSF_GLOBAL, 0); /* Symbol to reference ord/name of imported data symbol, used to implement auto-import. */ if (exp->flag_data) - quick_symbol (abfd, "__nm_", U (""), exp->internal_name, id6, + quick_symbol (abfd, "__nm_", U (""), internal_name, id6, BSF_GLOBAL,0); } if (pe_dll_compat_implib) - quick_symbol (abfd, "___imp_", exp->internal_name, "", id5, + quick_symbol (abfd, "___imp_", internal_name, "", id5, BSF_GLOBAL, 0); if (include_jmp_stub) |