* mkimport: Specify .text for stub explicitly.

* speclib: Add a dummy '.idata$7' section referring to the dll associated with
the real import library.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3c5d3e5..59ac132 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-18  Christopher Faylor  <me+cygwin@cgf.cx>
+
+       * mkimport: Specify .text for stub explicitly.
+       * speclib: Add a dummy '.idata$7' section referring to the dll
+       associated with the real import library.
+
 2009-04-18  Corinna Vinschen  <corinna@vinschen.de>
 
        * dcrt0.cc (globify): Only call mbtowc for non-ascii chars.

diff --git a/winsup/cygwin/mkimport b/winsup/cygwin/mkimport
index 99d8ef0..abca729 100755 (executable)
--- a/winsup/cygwin/mkimport
+++ b/winsup/cygwin/mkimport
@@ -54,6 +54,7 @@ for my $f (keys %text) {
        $text{$f} = 1;
        open my $as_fd, '|-', $as, '-o', "$dir/t-$f", "-";
        print $as_fd <<EOF;
+       .text
        .extern $imp_sym
        .global $glob_sym
 $glob_sym:

diff --git a/winsup/cygwin/speclib b/winsup/cygwin/speclib
index 9a0b678..10218d8 100755 (executable)
--- a/winsup/cygwin/speclib
+++ b/winsup/cygwin/speclib
@@ -19,6 +19,8 @@ $_ = File::Spec->rel2abs($_) for @ARGV;
 
 my $libdll = shift;
 my $lib =  pop;
+(my $iname = basename $lib) =~ s/\.a$//o;
+$iname = '_' . $iname . '_dll_iname';
 
 open my $nm_fd, '-|', $nm, '-Apg', '--defined-only', @ARGV, $libdll or
   die "$0: execution of $nm for object files failed - $!\n";
@@ -29,17 +31,23 @@ my $lastfn;
 my %extract = ();
 my $exclude_regex = @exclude ? join('|', @exclude) : '\\UnLiKeLy//';
 $exclude_regex = qr/$exclude_regex/;
+my $dllname;
 while (<$nm_fd>) {
     study;
-    my ($file, $member, $symbol) = m%^([^:]*):([^:]*(?=:))?.* T (.*)%o;
-    next if !defined($symbol) || $symbol =~ $exclude_regex;
-    if ($file ne $libdll) {
-        $match_syms{$symbol} = 1;
-     } elsif ($match_syms{$symbol} ? !$inverse : $inverse) {
-        $extract{$member} = 1;
-     }
+    if (/ I _(.*)_dll_iname/o) {
+       $dllname ||= $1;
+    } else {
+       my ($file, $member, $symbol) = m%^([^:]*):([^:]*(?=:))?.* T (.*)%o;
+       next if !defined($symbol) || $symbol =~ $exclude_regex;
+       if ($file ne $libdll) {
+            $match_syms{$symbol} = 1;
+        } elsif ($match_syms{$symbol} ? !$inverse : $inverse) {
+            $extract{$member} = 1;
+        }
+    }
 }
 close $nm_fd;
+   
 
 %extract or die "$0: couldn't find symbols for $lib\n";
 
@@ -50,6 +58,20 @@ chdir $dir;
 my $res = system $ar, 'x', $libdll, sort keys %extract;
 die "$0: $ar extraction exited with non-zero status\n" if $res;
 unlink $lib;
+
+# Add a dummy .idata object for libtool so that it will think
+# this library is an import library.
+my $iname_o = 'd000000.o';
+$extract{$iname_o} = 1;
+open my $as_fd, '|-', $as, '-R', '-o', $iname_o, "-";
+print $as_fd <<EOF;
+       .section .idata\$7
+.global $iname
+$iname: .asciz "$dllname.dll"
+EOF
+close $as_fd or exit 1;
+system $objcopy, '-j', '.idata$7', $iname_o;
+
 $res = system $ar, 'crus', $lib, sort keys %extract;
 unlink keys %extract;
 die "$0: ar creation of $lib exited with non-zero status\n" if $res;