FYI: libtool--gary--1.0--patch-12

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied to HEAD and branch-1-5.
- -- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.5
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (Darwin)

iD8DBQFAg8TfFRMICSmD1gYRAqP/AJ40LWI3OUclgynGo0FUWIKrc4YABQCgo//5
utlG5nBEbJcMUqJCrDSoc0M=
=VuQi
-----END PGP SIGNATURE-----

* looking for address@hidden/libtool--gary--1.0--patch-11 to compare with
* comparing to address@hidden/libtool--gary--1.0--patch-11
M  ChangeLog
M  NEWS
M  m4/libtool.m4

* modified files

Index: Changelog
from  Gary V. Vaughan  <address@hidden>

        * m4/libtool.m4 (_LT_LANG_CXX_CONFIG): Intel C++ compiler 8.0 and
        newer adds predep_objects and postdep_objects itself, so don't
        duplicate them in $archive_cmds and $archive_expsym_cmds.
        * NEWS: Updated.
        Reported by Roberto Bagnare <address@hidden>

--- orig/NEWS
+++ mod/NEWS
@@ -49,6 +49,7 @@
   latest files.
 * Extracting symbols from an import library on cygwin and win32 now works.
 * Initial support for amigaos-ppc.
+* Support for Intel C++ version 8.0.
 * New support for IBM's xlc and xlc++ on Mac OS X.
 * Bug fixes.
 


--- orig/m4/libtool.m4
+++ mod/m4/libtool.m4
@@ -2331,7 +2331,7 @@
     if test "$GCC" = yes; then
       reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
     else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'   
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
     ;;
 esac
@@ -3838,7 +3838,7 @@
        *)
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
           ;;
-      esac     
+      esac
     fi
       ;;
     dgux*)
@@ -4955,9 +4955,22 @@
         icpc)
        # Intel C++
        with_gnu_ld=yes
+       # version 8.0 and above of icpc choke on multiply defined symbols
+       # if we add $predep_objects and $postdep_objects, however 7.1 and
+       # earlier do not add the objects themselves.  Only 8.0 (and newer?)
+       # support the --version argument, so we use that to distinguish them:
+       lt_icpc_version=`icpc --version 2>/dev/null`
+       case $lt_icpc_version in
+       [[0-9.]]*)  # Version 8.0 or newer
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file 
$wl$export_symbols -o $lib'
+         ;;
+       *) # No output from 7.1 and older
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs 
$deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname 
${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+         ;;
+       esac
        _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs 
$deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname 
${wl}-retain-symbols-file $wl$export_symbols -o $lib'
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
        _LT_AC_TAGVAR(whole_archive_flag_spec, 
$1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'