FYI: another PGI update + partial backport

libtool-patches
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: another PGI update + partial backport

From:	Ralf Wildenhues
Subject:	FYI: another PGI update + partial backport
Date:	Sun, 15 May 2005 16:15:00 +0200
User-agent:	Mutt/1.5.9i
For x86_64, all of pgcc, pgCC, pgf77, pgf90 need $pic_flag as option to
$archive_cmds and $archive_expsyms_cmds (but they also work on x86).
Furthermore, I deemed my PGI whole_archive patch trivial enough that it
could be backported.

So, I have installed the following patches, against HEAD, branch-2-0,
and branch-1-5, respectively.

Regards,
Ralf

HEAD:
2005-05-15  Ralf Wildenhues  <address@hidden>

        * m4/libtool.m4 (_LT_COMPILER_PIC, _LT_LINKER_SHLIBS,
        _LT_LANG_CXX_CONFIG) [ linux ]: PGI:
        Add $pic_flag to archive_cmds and archive_expsyms_cmds.
        Bug reported against LAM by Troy Telford <address@hidden>.

Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.191
diff -u -r1.191 libtool.m4
--- m4/libtool.m4       27 Apr 2005 11:51:50 -0000      1.191
+++ m4/libtool.m4       15 May 2005 14:03:03 -0000
@@ -3722,10 +3724,11 @@
        case $cc_basename,$host_cpu in
         pgcc*)                         # Portland Group C compiler
          _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for 
conv in $convenience\"\"; do test  -n \"$conv\" && 
new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` 
${wl}--no-whole-archive'
+         tmp_addflag=' $pic_flag'
          ;;
        pgf77* | pgf90* )               # Portland Group f77 and f90 compilers
          _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for 
conv in $convenience\"\"; do test  -n \"$conv\" && 
new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` 
${wl}--no-whole-archive'
-         tmp_addflag=' -fpic -Mnomain' ;;
+         tmp_addflag=' $pic_flag -Mnomain' ;;
        ecc*,ia64* | icc*,ia64*)        # Intel C compiler on ia64
          tmp_addflag=' -i_dynamic' ;;
        efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
@@ -5275,15 +5278,15 @@
              _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
                rm -rf $tpldir~
                $CC --prelink_objects --instantiation_dir $tpldir 
$predep_objects $libobjs $deplibs $convenience $postdep_objects~
-               $CC -shared $predep_objects $libobjs $deplibs `find $tpldir 
-name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname 
-o $lib'
+               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find 
$tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname 
${wl}$soname -o $lib'
              _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
                rm -rf $tpldir~
                $CC --prelink_objects --instantiation_dir $tpldir 
$predep_objects $libobjs $deplibs $convenience $postdep_objects~
-               $CC -shared $predep_objects $libobjs $deplibs `find $tpldir 
-name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname 
${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find 
$tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname 
${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
              ;;
            *) # Version 6 will use weak symbols
-             _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(archive_cmds, $1)='$CC -shared $pic_flag 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname 
${wl}$soname -o $lib'
+             _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname 
${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
              ;;
            esac
 


branch-2-0:
2005-05-15  Ralf Wildenhues  <address@hidden>

        * m4/libtool.m4 (_LT_COMPILER_PIC, _LT_LINKER_SHLIBS,
        _LT_LANG_CXX_CONFIG) [ linux ]: PGI: Backport whole_archive changes
        from HEAD.  Add $pic_flag to archive_cmds and archive_expsyms_cmds.
        Bug reported against LAM by Troy Telford <address@hidden>.

Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.125.2.55
diff -u -r1.125.2.55 libtool.m4
--- m4/libtool.m4       27 Apr 2005 11:52:13 -0000      1.125.2.55
+++ m4/libtool.m4       15 May 2005 14:04:52 -0000
@@ -3134,7 +3134,6 @@
            _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
            _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-           _LT_TAGVAR(whole_archive_flag_spec, $1)=''
            ;;
          cxx*)
            # Compaq C++
@@ -3702,11 +3701,12 @@
        tmp_addflag=
        case $cc_basename,$host_cpu in
         pgcc*)                         # Portland Group C compiler
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+         _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for 
conv in $convenience\"\"; do test  -n \"$conv\" && 
new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` 
${wl}--no-whole-archive'
+         tmp_addflag=' $pic_flag'
          ;;
        pgf77* | pgf90* )               # Portland Group f77 and f90 compilers
-         _LT_TAGVAR(whole_archive_flag_spec, $1)=
-         tmp_addflag=' -fpic -Mnomain' ;;
+         _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for 
conv in $convenience\"\"; do test  -n \"$conv\" && 
new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` 
${wl}--no-whole-archive'
+         tmp_addflag=' $pic_flag -Mnomain' ;;
        ecc*,ia64* | icc*,ia64*)        # Intel C compiler on ia64
          tmp_addflag=' -i_dynamic' ;;
        efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
@@ -5236,12 +5236,12 @@
            ;;
           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(archive_cmds, $1)='$CC -shared $pic_flag 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname 
${wl}$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag 
$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'
-           _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+           _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for 
conv in $convenience\"\"; do test  -n \"$conv\" && 
new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` 
${wl}--no-whole-archive'
             ;;
          cxx*)
            # Compaq C++


branch-1-5:
2005-05-15  Ralf Wildenhues  <address@hidden>

        * libtool.m4 (AC_LIBTOOL_LANG_CXX_CONFIG, AC_LIBTOOL_PROG_LD_SHLIBS)
        [linux]: PGI: Backport whole_archive changes from HEAD.
        Add $pic_flag to archive_cmds and archive_expsyms_cmds.
        Bug reported against LAM by Troy Telford <address@hidden>.

Index: libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/libtool.m4,v
retrieving revision 1.314.2.89
diff -u -r1.314.2.89 libtool.m4
--- libtool.m4  28 Apr 2005 12:51:17 -0000      1.314.2.89
+++ libtool.m4  15 May 2005 14:05:52 -0000
@@ -3237,12 +3237,12 @@
        ;;
       pgCC*)
         # Portland Group C++ compiler
-       _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(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o 
$lib'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag 
$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 ${wl}$libdir'
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for 
conv in $convenience\"\"; do test  -n \"$conv\" && 
new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` 
${wl}--no-whole-archive'
         ;;
       cxx*)
        # Compaq C++
@@ -5344,11 +5344,12 @@
        tmp_addflag=
        case $cc_basename,$host_cpu in
        pgcc*)                          # Portland Group C compiler
-         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for 
conv in $convenience\"\"; do test  -n \"$conv\" && 
new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` 
${wl}--no-whole-archive'
+         tmp_addflag=' $pic_flag'
          ;;
        pgf77* | pgf90* )                       # Portland Group f77 and f90 
compilers
-         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-         tmp_addflag=' -fpic -Mnomain' ;;
+         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive,`for 
conv in $convenience\"\"; do test  -n \"$conv\" && 
new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` 
${wl}--no-whole-archive'
+         tmp_addflag=' $pic_flag -Mnomain' ;;
        ecc*,ia64* | icc*,ia64*)                # Intel C compiler on ia64
          tmp_addflag=' -i_dynamic' ;;
        efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
[Prev in Thread]
Current Thread
[Next in Thread]
FYI: another PGI update + partial backport, Ralf Wildenhues <=
Prev by Date: Better than Viagra
Next by Date: Need software? Click here.
Previous by thread: Better than Viagra
Next by thread: Need software? Click here.
Index(es):
- Date
- Thread