From: Peter Rosin <peda@lysator.liu.se>
Date: Wed, 18 Mar 2009 18:52:27 +0000 (+0100)
Subject: Don't settle for any dumpbin/link program as name lister.
X-Git-Tag: v2.2.7b~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=032d3cc9c17b51649153f51c50d1586774799cbd;p=thirdparty%2Flibtool.git

Don't settle for any dumpbin/link program as name lister.

* libltdl/m4/libtool.m4 (LT_PATH_NM): When locating dumpbin or
link -dump, check if they appear to really be capable of name
listing, in order to eliminate e.g. link from coreutils. This
makes the name lister decision fall back on nm as the default if
no acceptable candidate is found, which mainly happens on
(arguably broken) cross compiles.
* NEWS: Update
* THANKS: Update
Reports by Rudolf Leitgeb and Peter Kjellerstedt.

Signed-off-by: Peter Rosin <peda@lysator.liu.se>
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index ea0b35edd..2699a0927 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-01-26  Peter Rosin  <peda@lysator.liu.se>
+
+	Don't settle for any dumpbin/link program as name lister.
+	* libltdl/m4/libtool.m4 (LT_PATH_NM): When locating dumpbin or
+	link -dump, check if they appear to really be capable of name
+	listing, in order to eliminate e.g. link from coreutils. This
+	makes the name lister decision fall back on nm as the default if
+	no acceptable candidate is found, which mainly happens on
+	(arguably broken) cross compiles.
+	* NEWS: Update
+	* THANKS: Update
+	Reports by Rudolf Leitgeb and Peter Kjellerstedt.
+
 2009-03-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Document INNER_TESTSUITEFLAGS, drop leading space.
diff --git a/NEWS b/NEWS
index 8c3fa330a..ec9c83579 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,8 @@ New in 2.2.8 2009-??-??: git version 2.2.7a, Libtool team:
   - Link tests are guarded by cache variables so they can be avoided for
     bootstrapping purposes (e.g., when link tests are not possible).
   - Argument mangling of execute mode has been improved (i.e., lessened).
+  - Fix 2.1b regression that caused nm to not be the default name lister.
+    The regression affected mainly (arguably broken) cross compiles.
 
 * Miscellaneous changes:
 
diff --git a/THANKS b/THANKS
index 0f72886b8..1094becc8 100644
--- a/THANKS
+++ b/THANKS
@@ -127,6 +127,7 @@
   Paul Eggert			eggert@twinsun.com
   Peter Eisentraut		peter_e@gmx.net
   Peter Jeremy			peterjeremy@optushome.com.au
+  Peter Kjellerstedt		peter.kjellerstedt@axis.com
   Rainer Orth			ro@TechFak.Uni-Bielefeld.DE
   Rainer Tammer			tammer@tammer.net
   Ralf Menzel			menzel@ls6.cs.uni-dortmund.de
@@ -136,6 +137,7 @@
   Roberto Bagnara		bagnara@cs.unipr.it
   Roland Mainz			roland.mainz@nrubsig.org
   Roumen Petrov			bugtrack@roumenpetrov.info
+  Rudolf Leitgeb		r.leitgeb@x-pin.com
   Sam Thursfield		ssssam@gmail.com
   Sebastian Wilhelmi		wilhelmi@ira.uka.de
   Simon Josefsson		jas@extundo.com
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index b6f9f069c..8fca51362 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -3156,7 +3156,19 @@ if test "$lt_cv_path_NM" != "no"; then
   NM="$lt_cv_path_NM"
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
-  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
   AC_SUBST([DUMPBIN])
   if test "$DUMPBIN" != ":"; then
     NM="$DUMPBIN"