Final(?) patch to update libtool in GCC and src trees

Steve Ellcey
2007-04-10T18:25:43Z

Here is what I hope is the final patch to update libtool in the GCC and
src trees. I tested this on HPPA HP-UX, IA64 HP-UX, IA64 Linux, and
X86_64 Linux. I did get a few more errors with the new libtool than the
old. Most seemed to be unrelated (timeouts on long running tests that I
have seen before), I got 60 failures in ObjC (instead of 24) on IA64
Linux. I don't build ObjC on HP-UX platforms. The failures involve
having an undefined reference to __gnu_objc_personality_v0 when linking
and I haven't investigated them further.

Other than that the testing looked good.

Given these results is it OK to checkin the new libtool? I'd rather not
wait to fix the objc problem because maintaining all these changes in
both the GCC and src trees is a bit of a pain.

Here is the final patch with everthing but the new libtool, the new
libtool that I am using can be found in the message:

http://gcc.gnu.org/ml/gcc-patches/2007-04/msg00211.html

along with most of these changes. The only difference in this patch
from that one is the change to ml-config.in but here are the complete
GCC changelog files, the gcc diffs, the src ChangeLogs and the src diffs
(but not the new libtool).

OK to checkin?

Steve Ellcey
sje@cup.hp.com

Top level GCC tree ChangeLog:

2007-03-22 Steve Ellcey <sje@cup.hp.com>
* ltmain.sh: Update from ToT Libtool.
* libtool.m4: Update from ToT Libtool.
* ltsugar.m4: New. Update from ToT Libtool.
* ltversion.m4: New. Update from ToT Libtool.
* ltoptions.m4: New. Update from ToT Libtool.
* ltconfig: Remove.
* ltcf-c.sh: Remove.
* ltcf-cxx.sh: Remove.
* ltcf-gcj.sh: Remove.
* config-ml.in: Pass ${ml_config_env} to configure calls.

libgfortran/ChangeLog:

2007-03-22 Steve Ellcey <sje@cup.hp.com>
* Makefile.am: Add -I .. to ACLOCAL_AMFLAGS. Add libgfortran_la_LINK.
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* configure: Regenerate.

libgomp/ChangeLog:

2007-03-22 Steve Ellcey <sje@cup.hp.com>
* Makefile.am: Add -I .. to ACLOCAL_AMFLAGS.
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* configure: Regenerate.

zlib/ChangeLog:

2007-03-22 Steve Ellcey <sje@cup.hp.com>
* Makefile.am: Add -I .. to ACLOCAL_AMFLAGS.
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* configure: Regenerate.

libstdc++-v3/ChangeLog:

2007-03-22 Steve Ellcey <sje@cup.hp.com>
* configure.ac: Change how LIBSUPCXX_PICFLAGS is set.
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
* po/Makefile.in: Regenerate.
* libmath/Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
* libsupc++/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* configure: Regenerate.

libobjc/ChangeLog:

2007-03-22 Steve Ellcey <sje@cup.hp.com>
* aclocal.m4: Regenerate.
* configure: Regenerate.

libmudflap/ChangeLog:

2007-03-22 Steve Ellcey <sje@cup.hp.com>
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* configure: Regenerate.

boehm-gc/ChangeLog:

2007-03-22 Steve Ellcey <sje@cup.hp.com>
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
* configure: Regenerate.

libffi/ChangeLog:

2007-03-22 Steve Ellcey <sje@cup.hp.com>
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* configure: Regenerate.

libssp/ChangeLog:

2007-03-22 Steve Ellcey <sje@cup.hp.com>
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* configure: Regenerate.

libjava/ChangeLog:

2007-03-22 Steve Ellcey <sje@cup.hp.com>
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
* gcj/Makefile.in: Regenerate.
* testsuite/Makefile.in: Regenerate.
* configure: Regenerate.

Index: config-ml.in
===================================================================
--- config-ml.in (revision 123670)
+++ config-ml.in (working copy)
@@ -890,7 +890,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n

if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
--with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
- ${ac_configure_args} ${ml_srcdiroption} ; then
+ ${ac_configure_args} ${ml_config_env} ${ml_srcdiroption} ; then
true
else
exit 1
Index: libgfortran/Makefile.am
===================================================================
--- libgfortran/Makefile.am (revision 123670)
+++ libgfortran/Makefile.am (working copy)
@@ -1,12 +1,13 @@
## Process this file with automake to produce Makefile.in

-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I .. -I ../config

## May be used by toolexeclibdir.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)

toolexeclib_LTLIBRARIES = libgfortran.la
+libgfortran_la_LINK = $(LINK)
libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm $(extra_ldflags_libgfortran)

myexeclib_LTLIBRARIES = libgfortranbegin.la
Index: libgomp/Makefile.am
===================================================================
--- libgomp/Makefile.am (revision 123670)
+++ libgomp/Makefile.am (working copy)
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in

-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I .. -I ../config
SUBDIRS = testsuite

## May be used by toolexeclibdir.
Index: zlib/Makefile.am
===================================================================
--- zlib/Makefile.am (revision 123670)
+++ zlib/Makefile.am (working copy)
@@ -2,7 +2,7 @@

AUTOMAKE_OPTIONS = 1.8 cygnus

-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I .. -I ../config

ZLIB_SOURCES = adler32.c compress.c crc32.c crc32.h deflate.c \
deflate.h gzio.c infback.c inffast.c inffast.h inffixed.h inflate.c \
Index: libstdc++-v3/configure.ac
===================================================================
--- libstdc++-v3/configure.ac (revision 123670)
+++ libstdc++-v3/configure.ac (working copy)
@@ -355,10 +355,8 @@ GLIBCXX_EXPORT_INSTALL_INFO
GLIBCXX_EXPORT_INCLUDES
GLIBCXX_EXPORT_FLAGS

-if ${CONFIG_SHELL-/bin/sh} ./libtool --tag CXX --features |
- grep "enable shared" > /dev/null;
-then
- LIBSUPCXX_PICFLAGS=-prefer-pic
+if test "$enable_shared" = yes; then
+ LIBSUPCXX_PICFLAGS="-prefer-pic"
else
LIBSUPCXX_PICFLAGS=
fi

Top level src tree ChangeLog:

2007-03-22 Steve Ellcey <sje@cup.hp.com>
* ltmain.sh: Update from GCC.
* libtool.m4: Update from GCC.
* ltsugar.m4: New. Update from GCC.
* ltversion.m4: New. Update from GCC.
* ltoptions.m4: New. Update from GCC.
* ltconfig: Remove.
* ltcf-c.sh: Remove.
* ltcf-cxx.sh: Remove.
* ltcf-gcj.sh: Remove.
* src-release: Update with new libtool file list.

bfd/ChangeLog
2007-03-22 Steve Ellcey <sje@cup.hp.com>
* acinclude.m4: Add new includes.
* configure.in: Change macro call order.
* aclocal.m4: Regenerate.
* Makefile.in: Regnerate.
* configure: Regenerate.

binutils/ChangeLog
2007-03-22 Steve Ellcey <sje@cup.hp.com>
* configure.in: Change macro call order.
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* configure: Regenerate.

gas/ChangeLog
2007-03-22 Steve Ellcey <sje@cup.hp.com>
* acinclude.m4: Add new includes.
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* configure: Regenerate.

gprof/ChangeLog
2007-03-22 Steve Ellcey <sje@cup.hp.com>
* acinclude.m4: Add new includes.
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* configure: Regenerate.

rda/ChangeLog
2007-03-22 Steve Ellcey <sje@cup.hp.com>
* acinclude.m4: Add new includes.
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* configure: Regenerate.

ld/ChangeLog
2007-03-22 Steve Ellcey <sje@cup.hp.com>
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* configure: Regenerate.

opcodes/ChangeLog
2007-03-22 Steve Ellcey <sje@cup.hp.com>
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* configure: Regenerate.

newlib/ChangeLog
2007-03-22 Steve Ellcey <sje@cup.hp.com>
* aclocal.m4: Regenerate.
* Makefile.in: Regenerate.
* configure: Regenerate.

Index: src-release
===================================================================
RCS file: /cvs/src/src/src-release,v
retrieving revision 1.22
diff -u -p -r1.22 src-release
--- src-release 9 Feb 2007 15:15:38 -0000 1.22
+++ src-release 4 Apr 2007 16:58:29 -0000
@@ -49,8 +49,8 @@ PWD = $${PWDCMD-pwd}
DEVO_SUPPORT= README Makefile.in configure configure.ac \
config.guess config.sub config move-if-change \
COPYING COPYING.LIB install-sh config-ml.in symlink-tree \
- mkinstalldirs ltconfig ltmain.sh missing ylwrap \
- libtool.m4 ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh \
+ mkinstalldirs ltmain.sh missing ylwrap \
+ libtool.m4 ltsugar.m4, ltversion.m4, ltoptions.m4 \
Makefile.def Makefile.tpl src-release config.rpath

# Files in devo/etc used in any net release.
Index: bfd/acinclude.m4
===================================================================
RCS file: /cvs/src/src/bfd/acinclude.m4,v
retrieving revision 1.16
diff -u -p -r1.16 acinclude.m4
--- bfd/acinclude.m4 31 May 2006 15:14:35 -0000 1.16
+++ bfd/acinclude.m4 4 Apr 2007 16:58:29 -0000
@@ -49,6 +49,9 @@ else
fi
AC_SUBST(EXEEXT_FOR_BUILD)])dnl

+sinclude(../ltsugar.m4)
+sinclude(../ltversion.m4)
+sinclude(../ltoptions.m4)
sinclude(../libtool.m4)
dnl The lines below arrange for aclocal not to bring libtool.m4
dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
Index: bfd/configure.in
===================================================================
RCS file: /cvs/src/src/bfd/configure.in,v
retrieving revision 1.226
diff -u -p -r1.226 configure.in
--- bfd/configure.in 23 Mar 2007 02:51:30 -0000 1.226
+++ bfd/configure.in 4 Apr 2007 16:58:30 -0000
@@ -19,7 +19,10 @@ dnl Default to a non shared library. Th
dnl configure option --enable-shared.
AM_DISABLE_SHARED

-AM_PROG_LIBTOOL
+AC_PROG_CC
+AC_GNU_SOURCE
+
+AC_PROG_LIBTOOL

AC_ARG_ENABLE(64-bit-bfd,
[ --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)],
@@ -85,9 +88,6 @@ bfd_default_target_size=32

# host stuff:

-AC_PROG_CC
-AC_GNU_SOURCE
-
ALL_LINGUAS="fr tr ja es sv da zh_CN ro rw vi"
ZW_GNU_GETTEXT_SISTER_DIR
AM_PO_SUBDIRS
Index: binutils/configure.in
===================================================================
RCS file: /cvs/src/src/binutils/configure.in,v
retrieving revision 1.77
diff -u -p -r1.77 configure.in
--- binutils/configure.in 15 Mar 2007 14:17:16 -0000 1.77
+++ binutils/configure.in 4 Apr 2007 16:58:30 -0000
@@ -11,7 +11,9 @@ BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOM
changequote([,])dnl
AM_INIT_AUTOMAKE(binutils, ${BFD_VERSION})

-AM_PROG_LIBTOOL
+AC_PROG_CC
+AC_GNU_SOURCE
+AC_PROG_LIBTOOL

AC_ARG_ENABLE(targets,
[ --enable-targets alternative target configurations],
@@ -40,9 +42,6 @@ if test -z "$host" ; then
AC_MSG_ERROR(Unrecognized host system type; please check config.sub.)
fi

-AC_PROG_CC
-AC_GNU_SOURCE
-
AC_PROG_YACC
AM_PROG_LEX

Index: gas/acinclude.m4
===================================================================
RCS file: /cvs/src/src/gas/acinclude.m4,v
retrieving revision 1.6
diff -u -p -r1.6 acinclude.m4
--- gas/acinclude.m4 2 Aug 2006 14:26:07 -0000 1.6
+++ gas/acinclude.m4 4 Apr 2007 16:58:30 -0000
@@ -71,6 +71,9 @@ done
$1=[$]_gas_uniq_newlist
])dnl

+sinclude(../ltsugar.m4)
+sinclude(../ltversion.m4)
+sinclude(../ltoptions.m4)
sinclude(../libtool.m4)
dnl The lines below arrange for aclocal not to bring libtool.m4
dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
Index: gprof/acinclude.m4
===================================================================
RCS file: /cvs/src/src/gprof/acinclude.m4,v
retrieving revision 1.3
diff -u -p -r1.3 acinclude.m4
--- gprof/acinclude.m4 31 May 2006 15:14:37 -0000 1.3
+++ gprof/acinclude.m4 4 Apr 2007 16:58:30 -0000
@@ -4,6 +4,9 @@ sinclude(../config/nls.m4)
sinclude(../config/po.m4)
sinclude(../config/progtest.m4)

+sinclude(../ltsugar.m4)
+sinclude(../ltversion.m4)
+sinclude(../ltoptions.m4)
sinclude(../libtool.m4)
dnl The lines below arrange for aclocal not to bring libtool.m4
dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
Index: rda/acinclude.m4
===================================================================
RCS file: /cvs/src/src/rda/acinclude.m4,v
retrieving revision 1.2
diff -u -p -r1.2 acinclude.m4
--- rda/acinclude.m4 31 May 2006 15:14:39 -0000 1.2
+++ rda/acinclude.m4 4 Apr 2007 16:58:30 -0000
@@ -1,3 +1,6 @@
+sinclude(../ltsugar.m4)
+sinclude(../ltversion.m4)
+sinclude(../ltoptions.m4)
sinclude(../libtool.m4)
dnl The lines below arrange for aclocal not to bring libtool.m4
dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake