This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Libtool upgrade for support of HP-UX with GNU ld


Jeff Law had reported problems with building libstdc++-v3 on HP-UX
when using GNU ld.  This merge from the libtool CVS tree fixes the
problem.  I'm checking this in mainline and release branch.

Index: ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>

	* ltconfig, ltmain.sh, ltcf-cxx.sh: Upgraded to libtool 1.4a
	1.641.2.228.

Index: ltconfig
===================================================================
RCS file: /cvs/gcc/egcs/ltconfig,v
retrieving revision 1.18
diff -u -p -r1.18 ltconfig
--- ltconfig 2001/04/12 12:28:03 1.18
+++ ltconfig 2001/04/20 09:24:37
@@ -182,7 +182,7 @@ progname=`$echo "X$0" | $Xsed -e 's%^.*/
 PROGRAM=ltconfig
 PACKAGE=libtool
 VERSION=1.4a
-TIMESTAMP=" (1.641.2.226 2001/04/12 02:39:36)"
+TIMESTAMP=" (1.641.2.228 2001/04/20 08:53:18)"
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 rm="rm -f"
Index: ltmain.sh
===================================================================
RCS file: /cvs/gcc/egcs/ltmain.sh,v
retrieving revision 1.13
diff -u -p -r1.13 ltmain.sh
--- ltmain.sh 2001/04/12 12:28:03 1.13
+++ ltmain.sh 2001/04/20 09:24:37
@@ -56,7 +56,7 @@ modename="$progname"
 PROGRAM=ltmain.sh
 PACKAGE=libtool
 VERSION=1.4a
-TIMESTAMP=" (1.641.2.226 2001/04/12 02:39:36)"
+TIMESTAMP=" (1.641.2.228 2001/04/20 08:53:18)"
 
 default_mode=
 help="Try \`$progname --help' for more information."
Index: ltcf-cxx.sh
===================================================================
RCS file: /cvs/gcc/egcs/ltcf-cxx.sh,v
retrieving revision 1.16
diff -u -p -r1.16 ltcf-cxx.sh
--- ltcf-cxx.sh 2001/04/12 12:28:03 1.16
+++ ltcf-cxx.sh 2001/04/20 09:24:37
@@ -243,12 +243,14 @@ case $host_os in
     ld_shlibs=yes
     ;;
   hpux*)
-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator=:
+    if test $with_gnu_ld = no; then
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      export_dynamic_flag_spec='${wl}-E'
+    fi
     hardcode_direct=yes
     hardcode_minus_L=yes # Not in the search PATH, but as the default
 			 # location of the library.
-    export_dynamic_flag_spec='${wl}-E'
 
     case $cc_basename in
       CC)
@@ -272,10 +274,12 @@ case $host_os in
         ;;
       *)
         if test $with_gcc = yes; then
-	  case "$host_os" in
-	  hpux9*) archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
-	  *) archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;;
-	  esac
+	  if test $with_gnu_ld = no; then
+	    case "$host_os" in
+	    hpux9*) archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
+	    *) archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;;
+	    esac
+	  fi
 	else
 	  # FIXME: insert proper C++ library support
           ld_shlibs=no

-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                  aoliva@{cygnus.com, redhat.com}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist    *Please* write to mailing lists, not to me

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]