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

Add symbol called __nm_<name> to exported symbols created by dlltool.

Browse Source 
PR 20881
	* dlltool.c (secdata): Align .idata$6 on 2 byte boundary.
	(make_one_lib_file): Export a symbol called __nm_<symbol> for use
	with auto-importing.
This commit is contained in:
Rudy Y
2017-02-27 15:02:52 +00:00
committed by Nick Clifton
parent bd757ca7bf
commit 47612ae91c
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
binutils/ChangeLog
View File

@ -1,3 +1,10 @@
2017-02-27 Rudy Y <rudyy.id@gmail.com>
PR 20881
* dlltool.c (secdata): Align .idata$6 on 2 byte boundary.
(make_one_lib_file): Export a symbol called __nm_<symbol> for use
with auto-importing.
2017-02-25 Alan Modra <amodra@gmail.com> 2017-02-25 Alan Modra <amodra@gmail.com>
* testsuite/binutils-all/dw5.S: Replace .string with .asciz. * testsuite/binutils-all/dw5.S: Replace .string with .asciz.

20
binutils/dlltool.c
View File

@ -2338,7 +2338,7 @@ static sinfo secdata[NSECS] =
INIT_SEC_DATA (IDATA7, ".idata$7", SEC_HAS_CONTENTS, 2), INIT_SEC_DATA (IDATA7, ".idata$7", SEC_HAS_CONTENTS, 2),
INIT_SEC_DATA (IDATA5, ".idata$5", SEC_HAS_CONTENTS, 2), INIT_SEC_DATA (IDATA5, ".idata$5", SEC_HAS_CONTENTS, 2),
INIT_SEC_DATA (IDATA4, ".idata$4", SEC_HAS_CONTENTS, 2), INIT_SEC_DATA (IDATA4, ".idata$4", SEC_HAS_CONTENTS, 2),
INIT_SEC_DATA (IDATA6, ".idata$6", SEC_HAS_CONTENTS, 1) INIT_SEC_DATA (IDATA6, ".idata$6", SEC_HAS_CONTENTS, 2)
}; };
#else #else
@ -2543,6 +2543,18 @@ make_one_lib_file (export_type *exp, int i, int delay)
#endif #endif
ptrs[oidx++] = exp_label; ptrs[oidx++] = exp_label;
} }
#ifndef DLLTOOL_PPC
else
{
/* PR 20881: Add __nm_<symbol> for the exported library.
FIXME: Might be needed for PowerPC, but currently unable to test this. */
exp_label = bfd_make_empty_symbol (abfd);
exp_label->name = make_imp_label ("__nm_", exp->name);
exp_label->section = secdata[IDATA6].sec;
exp_label->flags = BSF_GLOBAL;
exp_label->value = 0;
}
#endif
/* Generate imp symbols with one underscore for Microsoft /* Generate imp symbols with one underscore for Microsoft
compatibility, and with two underscores for backward compatibility, and with two underscores for backward
@ -2573,6 +2585,12 @@ make_one_lib_file (export_type *exp, int i, int delay)
if (create_compat_implib) if (create_compat_implib)
ptrs[oidx++] = iname; ptrs[oidx++] = iname;
ptrs[oidx++] = iname2; ptrs[oidx++] = iname2;
#ifndef DLLTOOL_PPC
/* PR 20881:
According to pe-dll.c __nm_<symbol> should be add after __imp_<symbol>. */
if (exp->data)
ptrs[oidx++] = exp_label;
#endif
iname_lab_pp = ptrs + oidx; iname_lab_pp = ptrs + oidx;
ptrs[oidx++] = iname_lab; ptrs[oidx++] = iname_lab;