* m4/libtool.m4 [linux] (_LT_COMPILER_PIC, _LT_LINKER_SHLIBS,

_LT_LANG_CXX_CONFIG), NEWS, THANKS: Support for Portland Group
(aka "pgi") compilers.

diff --git a/ChangeLog b/ChangeLog
index 6e3cb1bd7832cfec5d8ab9222a768607b393a854..14f7fb56af61443a03ceeee0522a5f4f19a3f527 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-24  Jeff Squyres <jsquyres@lam-mpi.org>
+
+       * m4/libtool.m4 [linux] (_LT_COMPILER_PIC, _LT_LINKER_SHLIBS,
+       _LT_LANG_CXX_CONFIG), NEWS, THANKS: Support for Portland Group
+       (aka "pgi") compilers.
+
 2004-11-23  Gary V. Vaughan  <gary@gnu.org>
 
        If the user's login shell is something crazy like, oooh,

diff --git a/NEWS b/NEWS
index b9d827822bc8580735b657e13f3c9473bca76ff4..08b81a16c1131b8f1c69186e4997838ab5fad5a0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 NEWS - list of user-visible changes between releases of GNU Libtool
 
 New in 1.9h: 2004-??-??; CVS version 1.9g, Libtool team:
+* Support for Portland Group compiler on Linux.
 \f
 New in 1.9f: 2004-10-23; CVS version 1.9e, Libtool team:
 * Calculate dllsearchpath correctly for wrapper scripts on cygwin.

diff --git a/THANKS b/THANKS
index 197009de660961ce1567a87b3509d3e83d790192..471c933c4a23ac522779b06d6781d8ff4405cb94 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -75,6 +75,7 @@
   Frank Ch. Eigler             fche@cygnus.com
   H.J. Lu                      hjl@gnu.org
   Ian Lance Taylor             ian@cygnus.com
+  Jeff Squyres                 jsquyres@lam-mpi.org
   Joel N. Weber II             devnull@gnu.org
   Joseph Beckenbach III                jrb3@best.com
   Kenneth Albanowski           kjahds@kjahds.com

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 9fe7ddbbf049ffc55c5ce435f36a456dfc2181f0..33df32adbeaa8d48b1579bb1612eef168770805c 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -3082,6 +3082,12 @@ m4_if([$1], [CXX], [
            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
            _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
            ;;
+         pgCC)
+           # Portland Group C++ compiler
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+           ;;
          cxx)
            # Compaq C++
            # Make sure the PIC flag is empty.  It appears that all Alpha
@@ -3329,6 +3335,13 @@ m4_if([$1], [CXX], [
        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
        _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
         ;;
+      pgcc | pgf77 | pgf90)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+       # which looks to be a dead project)
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
       ccc*)
         _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
         # All Alpha code is PIC.
@@ -3599,7 +3612,12 @@ _LT_EOF
 
     linux*|tpf*)
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       # Portland Group f77 and f90 compilers require an additonal -fpic
+       if test "$CC" = "pgf77" -o "$CC" = "pgf90"; then
+          tmp_archive_cmds="$tmp_archive_cmds -fpic"
+        fi
+       _LT_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
         case `$LD -v 2>&1` in
           *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
           *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -5100,6 +5118,14 @@ if test "$_lt_caught_CXX_error" != yes; then
            _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
            _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
            ;;
+          pgCC)
+            # Portland Group C++ compiler
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+            _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+           _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+            ;;
          cxx)
            # Compaq C++
            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'