mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-23 19:50:13 +08:00
binutils/ChangeLog
* dlltool.c (set_dll_name_from_def): Accept new second arg that indicates if we are building DLL or EXE, and use it to add a default suffix to the output filename when none is already present. (def_name): Indicate we are building an EXE when calling it. (def_library): Indicate we are building a DLL when calling it. ld/testsuite/ChangeLog * ld-cygwin/exe-export.exp: Add "-lkernel32" when linking test exe. * ld-cygwin/testexe.c (testexe_main): Indicate whether global_a was set to correct final value using error return status. (testexe_dummy): Dummy function calls an import from kernel32.dll to ensure it is mapped into the process space at runtime.
This commit is contained in:
@ -782,7 +782,7 @@ static void fill_ordinals (export_type **);
|
||||
static void mangle_defs (void);
|
||||
static void usage (FILE *, int);
|
||||
static void inform (const char *, ...) ATTRIBUTE_PRINTF_1;
|
||||
static void set_dll_name_from_def (const char *);
|
||||
static void set_dll_name_from_def (const char *name, char is_dll);
|
||||
|
||||
static char *
|
||||
prefix_encode (char *start, unsigned code)
|
||||
@ -1001,13 +1001,22 @@ def_exports (const char *name, const char *internal_name, int ordinal,
|
||||
}
|
||||
|
||||
static void
|
||||
set_dll_name_from_def (const char * name)
|
||||
set_dll_name_from_def (const char *name, char is_dll)
|
||||
{
|
||||
const char* image_basename = lbasename (name);
|
||||
const char *image_basename = lbasename (name);
|
||||
if (image_basename != name)
|
||||
non_fatal (_("%s: Path components stripped from image name, '%s'."),
|
||||
def_file, name);
|
||||
dll_name = xstrdup (image_basename);
|
||||
/* Append the default suffix, if none specified. */
|
||||
if (strchr (image_basename, '.') == 0)
|
||||
{
|
||||
const char * suffix = is_dll ? ".dll" : ".exe";
|
||||
|
||||
dll_name = xmalloc (strlen (image_basename) + strlen (suffix) + 1);
|
||||
sprintf (dll_name, "%s%s", image_basename, suffix);
|
||||
}
|
||||
else
|
||||
dll_name = xstrdup (image_basename);
|
||||
}
|
||||
|
||||
void
|
||||
@ -1021,8 +1030,8 @@ def_name (const char *name, int base)
|
||||
|
||||
/* If --dllname not provided, use the one in the DEF file.
|
||||
FIXME: Is this appropriate for executables? */
|
||||
if (! dll_name)
|
||||
set_dll_name_from_def (name);
|
||||
if (!dll_name)
|
||||
set_dll_name_from_def (name, 0);
|
||||
d_is_exe = 1;
|
||||
}
|
||||
|
||||
@ -1036,8 +1045,8 @@ def_library (const char *name, int base)
|
||||
non_fatal (_("Can't have LIBRARY and NAME"));
|
||||
|
||||
/* If --dllname not provided, use the one in the DEF file. */
|
||||
if (! dll_name)
|
||||
set_dll_name_from_def (name);
|
||||
if (!dll_name)
|
||||
set_dll_name_from_def (name, 1);
|
||||
d_is_dll = 1;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user