* m4/libtool.m4 (_LT_LINKER_SHLIBS) [ irix5, irix6, nonstopux ]:

Test if it is possible to use the -exports_file linker option on
irix with gcc, as the gcc specs file may include a -hidden_symbol
option that is clashing with the -exports_file option.
See this gcc bugzilla entry for further details:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15288
* THANKS: Update.

diff --git a/ChangeLog b/ChangeLog
index a2c1df7d877e12c8a650f808d45ceebdc11a68f4..856ff7b6e1f1e07f71fd36d273105082537164e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-03-20  Peter Ekberg  <peda@lysator.liu.se>
+
+       * m4/libtool.m4 (_LT_LINKER_SHLIBS) [ irix5, irix6, nonstopux ]:
+       Test if it is possible to use the -exports_file linker option on
+       irix with gcc, as the gcc specs file may include a -hidden_symbol
+       option that is clashing with the -exports_file option.
+       See this gcc bugzilla entry for further details:
+       http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15288
+       * THANKS: Update.
+
 2005-03-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * tests/demo-nopic.test: Enhance status output

diff --git a/THANKS b/THANKS
index 104dcff1706815b4df0b52f605597277d986b585..52373b688a9727733d790b540f9162dcc1660d4c 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -90,6 +90,7 @@
   Patrick Welche               prlw1@newn.cam.ac.uk
   Paul Eggert                  eggert@twinsun.com
   Peter Eisentraut             peter_e@gmx.net
+  Peter Ekberg                 peda@lysator.liu.se
   Rainer Orth                  ro@TechFak.Uni-Bielefeld.DE
   Sebastian Wilhelmi           wilhelmi@ira.uka.de
   Stephan Kulow                        coolo@kde.org

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 9c4f5fdb87fa56d1d8bf74047b4aa15adb2c11ee..b24b8347716b7683b3719a704d90e59c3a8f8f68 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -4100,7 +4100,15 @@ _LT_EOF
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+       # Try to use the -exported_symbol ld option, if it does not
+       # work, assume that -exports_file does not work either and
+       # implicitly export all symbols.
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        AC_LINK_IFELSE(int foo(void) {},
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+        )
+        LDFLAGS="$save_LDFLAGS"
       else
        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO -set_version $verstring` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'