Patch to update libtool in GCC and binutils trees
Steve Ellcey <[email protected]>
| Newsgroups | gmane.comp.gcc.patches,gmane.comp.gdb.general |
|---|---|
| Message-ID | <[email protected]> |
Here is a patch to update the libtool in the GCC and src trees to the ToT libtool. I did not include the actual new libtool in this patch but if you pick up the latest snapshot (anything after March 19th) it should work. I can send the libtool I used as a patch if people want me to. I left it out of this patch in order to make it simpler to see what I did. I have tested this on one platform only so far so I think it needs more testing before we do anything further. Here is what I did: In GCC and Src trees I updated libtool by removing ltconfig, ltcf-c.sh, ltcf-cxx.sh, and ltcf-gcj.sh; updating ltmain.sh and libtool.m4; and adding ltsugar.m4, ltversion.m4, and ltoptions.m4. In the Src tree; in bfd, binutils, gas, gprof, and rda I added some includes and some macro calls and reordered a few things. In these directories plus in ld, opcodes, and newlib I regenerated everthing by running "aclocal;automake -cygnus;autoconf". Except in rda where -cygnus was not used. In the GCC tree I updated Makfile.am in libgfortran, libgomp, and zlib to include "-I .." in the ACLOCAL_AMFLAGS argument and I made one other change in the libgfortran Makefile.am to link libgfortran with gcc instead of with gfortran. After that I regenerated everthing. In boehm-gc, libffi, libgfortran, libgomp, libmudflap, libssp, and zlib: I ran "aclocal -I .. -I ../config;automake;autoconf". In libjava and libstdc++-v4 I added "-I ." to the aclocal options and in libobjc I skipped the automake step because it doesn't use automake. Here are ChangeLog files and diffs for both GCC and the Src tree. Testing with more platforms would be greatly appreciated. Steve Ellcey [email protected] Top level GCC tree ChangeLog: 2007-03-22 Steve Ellcey <[email protected]> * 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. <Actual ToT Libtool code not included in this patch.> libgfortran/ChangeLog: 2007-03-22 Steve Ellcey <[email protected]> * Makefile.am: Add -I .. to ACLOCAL_AMFLAGS. Add libgfortran_la_LINK. * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * configure: Regenerate. Index: Makefile.am =================================================================== --- Makefile.am (revision 123081) +++ 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 libgomp/ChangeLog: 2007-03-22 Steve Ellcey <[email protected]> * Makefile.am: Add -I .. to ACLOCAL_AMFLAGS. * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. * configure: Regenerate. Index: Makefile.am =================================================================== --- Makefile.am (revision 123081) +++ 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. zlib/ChangeLog: 2007-03-22 Steve Ellcey <[email protected]> * Makefile.am: Add -I .. to ACLOCAL_AMFLAGS. * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * configure: Regenerate. Index: Makefile.am =================================================================== --- Makefile.am (revision 123081) +++ 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 \ libstdc++-v3/ChangeLog: 2007-03-22 Steve Ellcey <[email protected]> * 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 <[email protected]> * aclocal.m4: Regenerate. * configure: Regenerate. libmudflap/ChangeLog: 2007-03-22 Steve Ellcey <[email protected]> * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. * configure: Regenerate. boehm-gc/ChangeLog: 2007-03-22 Steve Ellcey <[email protected]> * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * configure: Regenerate. libffi/ChangeLog: 2007-03-22 Steve Ellcey <[email protected]> * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. * configure: Regenerate. libssp/ChangeLog: 2007-03-22 Steve Ellcey <[email protected]> * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * configure: Regenerate. libjava/ChangeLog: 2007-03-22 Steve Ellcey <[email protected]> * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * gcj/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. * configure: Regenerate. ++++++++++++++++++++++++++++++++++++++++++++++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++ Top level src tree ChangeLog: 2007-03-22 Steve Ellcey <[email protected]> * 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. Index: src-release =================================================================== RCS file: /cvs/src/src/src-release,v retrieving revision 1.22 diff -u -r1.22 src-release --- src-release 9 Feb 2007 15:15:38 -0000 1.22 +++ src-release 9 Mar 2007 23:37:34 -0000 @@ -49,8 +49,8 @@ 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. bfd/ChangeLog 2007-03-22 Steve Ellcey <[email protected]> * acinclude.m4: Add new includes. * configure.in: Change macro call order. * aclocal.m4: Regenerate. * Makefile.in: Regnerate. * configure: Regenerate. Index: acinclude.m4 =================================================================== RCS file: /cvs/src/src/bfd/acinclude.m4,v retrieving revision 1.16 diff -u -r1.16 acinclude.m4 --- acinclude.m4 31 May 2006 15:14:35 -0000 1.16 +++ acinclude.m4 9 Mar 2007 23:36:49 -0000 @@ -49,6 +49,9 @@ 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: configure.in =================================================================== RCS file: /cvs/src/src/bfd/configure.in,v retrieving revision 1.222 diff -u -r1.222 configure.in --- configure.in 1 Mar 2007 15:48:36 -0000 1.222 +++ configure.in 9 Mar 2007 23:37:07 -0000 @@ -19,7 +19,10 @@ 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)], @@ -95,9 +98,6 @@ # 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 binutils/ChangeLog 2007-03-22 Steve Ellcey <[email protected]> * configure.in: Change macro call order. * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * configure: Regenerate. Index: configure.in =================================================================== RCS file: /cvs/src/src/binutils/configure.in,v retrieving revision 1.75 diff -u -r1.75 configure.in --- configure.in 28 Feb 2007 01:29:32 -0000 1.75 +++ configure.in 9 Mar 2007 23:36:12 -0000 @@ -11,7 +11,9 @@ 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], @@ -53,9 +55,6 @@ AC_MSG_ERROR(Unrecognized host system type; please check config.sub.) fi -AC_PROG_CC -AC_GNU_SOURCE - AC_PROG_YACC AM_PROG_LEX gas/ChangeLog 2007-03-22 Steve Ellcey <[email protected]> * acinclude.m4: Add new includes. * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * configure: Regenerate. Index: acinclude.m4 =================================================================== RCS file: /cvs/src/src/gas/acinclude.m4,v retrieving revision 1.6 diff -u -r1.6 acinclude.m4 --- acinclude.m4 2 Aug 2006 14:26:07 -0000 1.6 +++ acinclude.m4 9 Mar 2007 23:35:46 -0000 @@ -71,6 +71,9 @@ $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 gprof/ChangeLog 2007-03-22 Steve Ellcey <[email protected]> * acinclude.m4: Add new includes. * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * configure: Regenerate. Index: acinclude.m4 =================================================================== RCS file: /cvs/src/src/gprof/acinclude.m4,v retrieving revision 1.3 diff -u -r1.3 acinclude.m4 --- acinclude.m4 31 May 2006 15:14:37 -0000 1.3 +++ acinclude.m4 9 Mar 2007 23:35:04 -0000 @@ -4,6 +4,9 @@ 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 rda/ChangeLog 2007-03-22 Steve Ellcey <[email protected]> * acinclude.m4: Add new includes. * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * configure: Regenerate. Index: acinclude.m4 =================================================================== RCS file: /cvs/src/src/rda/acinclude.m4,v retrieving revision 1.2 diff -u -r1.2 acinclude.m4 --- acinclude.m4 31 May 2006 15:14:39 -0000 1.2 +++ acinclude.m4 9 Mar 2007 23:34:41 -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 ld/ChangeLog 2007-03-22 Steve Ellcey <[email protected]> * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * configure: Regenerate. opcodes/ChangeLog 2007-03-22 Steve Ellcey <[email protected]> * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * configure: Regenerate. newlib/ChangeLog 2007-03-22 Steve Ellcey <[email protected]> * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * configure: Regenerate.