Re: [PATCH] msvc: handle symbols from different files independently.

[Peter Rosin]

Den 2010-10-02 08:40 skrev Ralf Wildenhues:
> Hi Peter,
> 
> * Peter Rosin wrote on Fri, Oct 01, 2010 at 01:38:42PM CEST:
>> Anyway, is this test case good enough?  Should I find a better
>> way to skip on non-dumpbin runs?  How?
> 
> Skip if $NM != $DUMPBIN?  But then you'd need to ensure DUMPBIN is set.

It's a pest that you can have:

DUMPBIN="link -dump"
NM="dumpbin -symbols"

or

DUMPBIN=dumpbin
NM="link -dump -symbols"

I.e. link -dump is a synonym for dumpbin.

> How for a slight improvement at least something that's bound to remain
> even if the symbol pipe is rewritten in sed or another language, e.g.,
> looking whether ' UNDEF ' or 'Section length' is present?

I redid it in the same manner the configure test is doing it instead.

> Please consider moving testsuite additions which are clearly system-
> specific to other tests which are clearly system-specific, and grouping
> those testing the same systems, or family of systems (such as w32).
> And then using one AT_BANNER for a set of test groups.

I moved it before deplibs-mingw.at and changed the banner to "Windows
tests.", quietly fixing the cosmetic bug that deplibs-mingw.at isn't a
darwin test to begin with.

> OK with nits below.

One more iteration since I'm not sure if redoing the configure test
is ok.

Cheers,
Peter

>From 2975fc3e74374fcf1c949766f65db5670d8c61a9 Mon Sep 17 00:00:00 2001
From: Peter Rosin <address@hidden>
Date: Mon, 4 Oct 2010 13:13:01 +0200
Subject: [PATCH] msvc: handle symbols from different files independently.

* libltdl/m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS)
<dumpbin, lt_cv_sys_global_symbol_pipe>: Make all sections
viable for symbol extraction again when the symbols from a new
file starts.  Fixes tests/tagdemo-make.test for MSVC 10.
* tests/dumpbin-symbols.at: New test, making sure we don't
regress.
* Makefile.am (TESTSUITE_AT): Update.

Signed-off-by: Peter Rosin <address@hidden>
---
 ChangeLog                |   11 +++++
 Makefile.am              |    1 +
 libltdl/m4/libtool.m4    |    1 +
 tests/dumpbin-symbols.at |  111 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 124 insertions(+), 0 deletions(-)
 create mode 100644 tests/dumpbin-symbols.at

diff --git a/ChangeLog b/ChangeLog
index a7aa489..4477414 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-04  Peter Rosin  <address@hidden>
+
+       msvc: handle symbols from different files independently.
+       * libltdl/m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS)
+       <dumpbin, lt_cv_sys_global_symbol_pipe>: Make all sections
+       viable for symbol extraction again when the symbols from a new
+       file starts.  Fixes tests/tagdemo-make.test for MSVC 10.
+       * tests/dumpbin-symbols.at: New test, making sure we don't
+       regress.
+       * Makefile.am (TESTSUITE_AT): Update.
+
 2010-09-27  Peter Rosin  <address@hidden>
 
        tests: check if sys_lib_search_path_spec works on MSVC.
diff --git a/Makefile.am b/Makefile.am
index 6e29a29..6c23a5e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -503,6 +503,7 @@ TESTSUITE_AT        = tests/testsuite.at \
                  tests/cmdline_wrap.at \
                  tests/pic_flag.at \
                  tests/darwin.at \
+                 tests/dumpbin-symbols.at \
                  tests/deplibs-mingw.at \
                  tests/sysroot.at
 
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index fd732d0..967dd38 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -3645,6 +3645,7 @@ for ac_symprfx in "" "_"; do
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
diff --git a/tests/dumpbin-symbols.at b/tests/dumpbin-symbols.at
new file mode 100644
index 0000000..e184306
--- /dev/null
+++ b/tests/dumpbin-symbols.at
@@ -0,0 +1,111 @@
+# dumpbin-symbols.at -- libtool "dumpbin -symbols" support    -*- Autotest -*-
+
+#   Copyright (C) 2010 Free Software Foundation, Inc.
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from  http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+####
+
+AT_BANNER([Windows tests.])
+AT_SETUP([dumpbin -symbols section hiding])
+
+# I don't know of a stable way to create a pair of objects that
+# exhibits the potential problem, so this test fakes it by
+# testing with output from a case that do have the potential
+# problem.
+
+# First check if the global_symbol_pipe can handle the below
+# test case at all, and skip if $NM is not MS dumpbin.
+
+AT_DATA([variable.c],
+[[
+int some_variable = 0;
+]])
+
+AT_CHECK([$CC $CPPFLAGS $CFLAGS -c variable.c], [], [ignore], [ignore])
+AT_CHECK([$NM variable.$OBJEXT], [], [stdout], [ignore])
+AT_CHECK([grep 'External.*some_variable' stdout || exit 77], [], [ignore])
+
+eval `$LIBTOOL --config | $EGREP '^(global_symbol_pipe)='`
+
+AT_DATA([dumpbin-output],
+[[
+Dump of file foo.obj
+
+File Type: COFF OBJECT
+
+COFF SYMBOL TABLE
+000 00AB766F ABS    notype       Static       | @comp.id
+001 00000001 ABS    notype       Static       | @feat.00
+002 00000000 SECT1  notype       Static       | .drectve
+    Section length   8F, #relocs    0, #linenums    0, checksum        0
+004 00000000 SECT2  notype       Static       | .debug$S
+    Section length 44B4, #relocs   1C, #linenums    0, checksum        0
+006 00000000 SECT3  notype       Static       | .rdata
+    Section length    1, #relocs    0, #linenums    0, checksum        0, 
selection    2 (pick any)
+008 00000000 SECT3  notype       External     | 
address@hidden@_N$0A@@address@hidden@@2_NB (public: static bool const 
std::tr1::integral_constant<bool,0>::value)
+009 00000000 SECT4  notype       Static       | .rdata
+    Section length    1, #relocs    0, #linenums    0, checksum 77073096, 
selection    2 (pick any)
+*snip lots of uninteresting crap*
+12A 00000000 SECT5B notype       Static       | .text
+    Section length   4B, #relocs    2, #linenums    0, checksum 22AE8362, 
selection    2 (pick any)
+12C 00000000 SECT5C notype       Static       | .debug$S
+    Section length  150, #relocs    B, #linenums    0, checksum        0, 
selection    5 (pick associative Section 0x5B)
+12F 00000000 SECT5D notype       Static       | .debug$T
+    Section length   5C, #relocs    0, #linenums    0, checksum        0
+
+String Table Size = 0x15EF bytes
+
+
+Dump of file conv.lib
+
+File Type: LIBRARY
+
+COFF SYMBOL TABLE
+000 00AB766F ABS    notype       Static       | @comp.id
+001 00000001 ABS    notype       Static       | @feat.00
+002 00000000 SECT1  notype       Static       | .drectve
+    Section length   2F, #relocs    0, #linenums    0, checksum        0
+004 00000000 SECT2  notype       Static       | .debug$S
+    Section length  70C, #relocs    5, #linenums    0, checksum        0
+006 00000000 SECT3  notype       Static       | .text
+    Section length    A, #relocs    0, #linenums    0, checksum BAFC81C1
+008 00000000 SECT3  notype ()    External     | _convenience
+009 00000000 SECT4  notype       Static       | .debug$T
+    Section length   5C, #relocs    0, #linenums    0, checksum        0
+
+String Table Size = 0x11 bytes
+
+  Summary
+
+        5B3C .debug$S
+          B8 .debug$T
+          BE .drectve
+         129 .rdata
+           C .sxdata
+         613 .text
+          6C .text$x
+          B8 .xdata$x
+]])
+
+# Check if the _convenience symbol from section SECT3 in conv.lib is
+# present even if section SECT3 in foo.obj is hidden.
+AT_CHECK([eval "cat dumpbin-output | $global_symbol_pipe"], [], [stdout])
+AT_CHECK([grep convenience stdout], [], [ignore])
+
+AT_CLEANUP
-- 
1.7.1