aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--binutils/ChangeLog8
-rw-r--r--binutils/dlltool.c25
-rw-r--r--ld/testsuite/ChangeLog8
-rw-r--r--ld/testsuite/ld-cygwin/exe-export.exp2
-rw-r--r--ld/testsuite/ld-cygwin/testexe.c17
5 files changed, 50 insertions, 10 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index fb7bb7f..f047b60 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,11 @@
+2009-04-01 Dave Korn <dave.korn.cygwin@gmail.com>
+
+ * 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.
+
2009-04-01 Jari Aalto <jari.aalto@cante.net>
PR 9972
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;
}
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 209ac99..124b11c 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2009-04-01 Dave Korn <dave.korn.cygwin@gmail.com>
+
+ * 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.
+
2009-04-01 Christophe Lyon <christophe.lyon@st.com>
* ld-arm/arm-elf.exp: BE8 tests expect the same output as the
diff --git a/ld/testsuite/ld-cygwin/exe-export.exp b/ld/testsuite/ld-cygwin/exe-export.exp
index 5fd3cf7..b05cbea 100644
--- a/ld/testsuite/ld-cygwin/exe-export.exp
+++ b/ld/testsuite/ld-cygwin/exe-export.exp
@@ -119,7 +119,7 @@ if ![ld_compile "$CC $CFLAGS" $srcdir/$subdir/testexe.c $tmpdir/testexe.o] {
return
}
-if ![ld_special_link "$CC $LDFLAGS $MYLDFLAGS -e _testexe_main@16" $tmpdir/testexe.exe "$tmpdir/testexe.o $srcdir/$subdir/testexe.def $tmpdir/testdll.lib"] {
+if ![ld_special_link "$CC $LDFLAGS $MYLDFLAGS -e _testexe_main@16" $tmpdir/testexe.exe "$tmpdir/testexe.o $srcdir/$subdir/testexe.def $tmpdir/testdll.lib -lkernel32"] {
fail "linking executable"
return
}
diff --git a/ld/testsuite/ld-cygwin/testexe.c b/ld/testsuite/ld-cygwin/testexe.c
index 333c389..50a980b 100644
--- a/ld/testsuite/ld-cygwin/testexe.c
+++ b/ld/testsuite/ld-cygwin/testexe.c
@@ -12,5 +12,20 @@ int _stdcall
testexe_main (void* p1, void *p2, char* p3, int p4)
{
dllwrite ();
- return 0;
+ /* We can't print or assert in a minimal app like this,
+ so use the return status to indicate if global_a
+ ended up with the correct expected value. */
+ return 1 - global_a;
}
+
+/* We have to import something, anything at all, from
+ kernel32, in order to have the thread and process
+ base thunk routines loaded when we start running!. */
+extern __attribute((dllimport)) void _stdcall Sleep (unsigned int duration);
+
+int _stdcall
+testexe_dummy (unsigned int foobar)
+{
+ Sleep (foobar);
+}
+