aboutsummaryrefslogtreecommitdiff
path: root/binutils/dlltool.c
diff options
context:
space:
mode:
authorDave Korn <dave.korn@artimi.com>2009-04-01 17:20:19 +0000
committerDave Korn <dave.korn@artimi.com>2009-04-01 17:20:19 +0000
commit2fe50fe3ef07d80e667b932f46098d6b0b966d65 (patch)
tree5337c22f6d4b491bc572643034ff77f792b8afee /binutils/dlltool.c
parent4343666d145c423a5207b9ef168817387cd4079c (diff)
downloadgdb-2fe50fe3ef07d80e667b932f46098d6b0b966d65.zip
gdb-2fe50fe3ef07d80e667b932f46098d6b0b966d65.tar.gz
gdb-2fe50fe3ef07d80e667b932f46098d6b0b966d65.tar.bz2
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.
Diffstat (limited to 'binutils/dlltool.c')
-rw-r--r--binutils/dlltool.c25
1 files changed, 17 insertions, 8 deletions
diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index a24a552..85ddaac 100644
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -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;
}