From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Sun, 23 Nov 2008 14:23:58 +0000 (+0100)
Subject: Fix func_win32_libid for 64-bit Windows.
X-Git-Tag: v2.2.7b~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5282894cf194b878322bf2688bd90571bef1c69;p=thirdparty%2Flibtool.git

Fix func_win32_libid for 64-bit Windows.

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

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index f40536c23..af83a7281 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-23  Alon Bar-Lev  <alon.barlev@gmail.com>  (tiny change)
+
+	Fix func_win32_libid for 64-bit Windows.
+	* libltdl/config/ltmain.m4sh (func_win32_libid): Accept file
+	format 'pe-x86-64'.
+	* NEWS: Update.
+
 2008-11-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Avoid newlines in some AT_CHECK commands.
diff --git a/NEWS b/NEWS
index c00e404d8..1c9904279 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 28ad40de5..e7dcdf290 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{