Re: mingw win64 comatibility

[Ralf Wildenhues]

* Alon Bar-Lev wrote on Thu, Nov 13, 2008 at 10:45:23AM CET:
> --- a/libltdl/config/ltmain.m4sh
> +++ b/libltdl/config/ltmain.m4sh
> @@ -2156,7 +2156,7 @@ func_win32_libid ()
>      ;;
>    *ar\ archive*) # could be an import, or static
>      if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
> -       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
> +       $EGREP 'file format pe-i386(.*architecture: i386)?|file format 
> pe-x86-64' >/dev/null ; then
>        win32_nmres=`eval $NM -f posix -A $1 |
>       $SED -n -e '
>           1,100{

Committed like this.

Cheers, and thanks,
Ralf

2008-11-23  Alon Bar-Lev  <...>

        Fix func_win32_libid for 64-bit Windows.
        * libltdl/config/ltmain.m4sh (func_win32_libid): Accept file
        format 'pe-x86-64'.
        * NEWS: Update.

diff --git a/NEWS b/NEWS
index c00e404..1c99042 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ New in 2.2.8 2008-??-??: git version 2.2.7a, Libtool team:
   - New libtool command line flag --no-verbose, which disables only
     the extra "verbose" output messages and has no effect on the
     default informational messages.
+  - Improved support for 64bit Windows (mingw64).
 
 * Bug fixes:
 
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 28ad40d..e7dcdf2 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -2159,6 +2159,7 @@ static const void *lt_preloaded_setup() {
 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
 func_win32_libid ()
 {
   $opt_debug
@@ -2170,7 +2171,7 @@ func_win32_libid ()
     ;;
   *ar\ archive*) # could be an import, or static
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+       $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-x86-64)' 
>/dev/null; then
       win32_nmres=`eval $NM -f posix -A $1 |
        $SED -n -e '
            1,100{