From patchwork Sun Feb 13 11:46:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Wildenhues X-Patchwork-Id: 82987 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 064E6B711B for ; Sun, 13 Feb 2011 22:46:56 +1100 (EST) Received: (qmail 4452 invoked by alias); 13 Feb 2011 11:46:54 -0000 Received: (qmail 4438 invoked by uid 22791); 13 Feb 2011 11:46:52 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, TW_SV, T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mailout-de.gmx.net (HELO mailout-de.gmx.net) (213.165.64.23) by sourceware.org (qpsmtpd/0.43rc1) with SMTP; Sun, 13 Feb 2011 11:46:47 +0000 Received: (qmail invoked by alias); 13 Feb 2011 11:46:43 -0000 Received: from xdsl-89-0-154-248.netcologne.de (EHLO localhost.localdomain) [89.0.154.248] by mail.gmx.net (mp003) with SMTP; 13 Feb 2011 12:46:43 +0100 Received: from ralf by localhost.localdomain with local (Exim 4.69) (envelope-from ) id 1PoaPa-0007IO-3P; Sun, 13 Feb 2011 12:46:42 +0100 Date: Sun, 13 Feb 2011 12:46:42 +0100 From: Ralf Wildenhues To: gcc-patches@gcc.gnu.org Cc: java-patches@gcc.gnu.org Subject: [PATCH build, libgo, classpath] Remove freebsd1 from libtool.m4 macros and config.rpath. Message-ID: <20110213114641.GJ26711@gmx.de> Mail-Followup-To: Ralf Wildenhues , gcc-patches@gcc.gnu.org, java-patches@gcc.gnu.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2010-08-04) X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org I'm applying this patch to remove freebsd1 handling from Libtool macros and config.rpath, in order to avoid problems when FreeBSD 10 releases. This just pulls in Gerald's patch which has been applied to upstream Libtool, regenerates all stuff, and adjusts other old files as noted: libgo: The patch includes changes to libgo/configure libgo/config/libtool.m4 which I'm mentioning in the svn log entry but not any ChangeLog. Please sync this to upstream, or consider importing a newer libtool.m4. classpath: I've patched libjava/classpath/config.rpath libjava/classpath/ltcf-c.sh libjava/classpath/ltcf-gcj.sh libjava/classpath/ltconfig to remove freebsd1 handling. Please either sync upstream, or, even better, consider updating config.rpath from gnulib and getting rid of the other ltcf* files which should not be needed any more by a modern Libtool. Your copies are very old. A patch to get src back to sync will follow, probably tonight. Thanks, Ralf ChangeLog: 2011-02-13 Ralf Wildenhues Import from Libtool and gnulib: 2011-01-27 Gerald Pfeifer Prepare for supporting FreeBSD 10. * config.rpath: Remove handling of freebsd1* which soon would match FreeBSD 10.0. 2011-01-20 Gerald Pfeifer (tiny change) Remove support for FreeBSD 1.x. * libtool.m4 (_LT_LINKER_SHLIBS) (_LT_SYS_DYNAMIC_LINKER): Remove handling of freebsd1* which soon would incorrectly match FreeBSD 10.0. boehm-gc/ChangeLog: 2011-02-13 Ralf Wildenhues * configure: Regenerate. gcc/ChangeLog: 2011-02-13 Ralf Wildenhues * configure: Regenerate. libffi/ChangeLog: 2011-02-13 Ralf Wildenhues * configure: Regenerate. libgfortran/ChangeLog: 2011-02-13 Ralf Wildenhues * Makefile.in: Regenerate. * aclocal.m4: Likewise. * configure: Likewise. libgomp/ChangeLog: 2011-02-13 Ralf Wildenhues * configure: Regenerate. libjava/ChangeLog: 2011-02-13 Ralf Wildenhues * configure: Regenerate. * shlibpath.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER): Remove handling of freebsd1* which soon would incorrectly match FreeBSD 10.0. libjava/classpath/ChangeLog.gcj: 2011-02-13 Ralf Wildenhues * config.rpath, ltcf-c.sh, ltcf-gcj.sh, ltconfig: Remove handling of freebsd1* which soon would match FreeBSD 10.0. * configure: Regenerate. libjava/libltdl/ChangeLog: 2011-02-13 Ralf Wildenhues * acinclude.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) (AC_LIBTOOL_SYS_DYNAMIC_LINKER): Remove handling of freebsd1* which soon would incorrectly match FreeBSD 10.0. * configure: Regenerate. libmudflap/ChangeLog: 2011-02-13 Ralf Wildenhues * configure: Regenerate. libobjc/ChangeLog: 2011-02-13 Ralf Wildenhues * configure: Regenerate. libquadmath/ChangeLog: 2011-02-13 Ralf Wildenhues * Makefile.in: Regenerate. * aclocal.m4: Likewise. * configure: Likewise. libssp/ChangeLog: 2011-02-13 Ralf Wildenhues * Makefile.in: Regenerate. * aclocal.m4: Likewise. * configure: Likewise. libstdc++-v3/ChangeLog: 2011-02-13 Ralf Wildenhues * configure: Regenerate. lto-plugin/ChangeLog: 2011-02-13 Ralf Wildenhues * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. zlib/ChangeLog.gcj: 2011-02-13 Ralf Wildenhues * configure: Regenerate. diff --git a/config.rpath b/config.rpath index 9316b91..4dea759 100755 --- a/config.rpath +++ b/config.rpath @@ -284,9 +284,6 @@ else dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; - freebsd1*) - ld_shlibs=no - ;; freebsd2.2*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -448,8 +445,6 @@ case "$host_os" in ;; dgux*) ;; - freebsd1*) - ;; freebsd*) ;; gnu*) diff --git a/libgo/config/libtool.m4 b/libgo/config/libtool.m4 index d7b689e..a546739 100644 --- a/libgo/config/libtool.m4 +++ b/libgo/config/libtool.m4 @@ -2284,10 +2284,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -4814,10 +4810,6 @@ _LT_EOF _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little diff --git a/libjava/classpath/config.rpath b/libjava/classpath/config.rpath index 17298f2..def43dc 100755 --- a/libjava/classpath/config.rpath +++ b/libjava/classpath/config.rpath @@ -357,9 +357,6 @@ else dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; - freebsd1*) - ld_shlibs=no - ;; freebsd2.2*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -534,8 +531,6 @@ case "$host_os" in dgux*) library_names_spec='$libname$shrext' ;; - freebsd1*) - ;; freebsd* | dragonfly*) case "$host_os" in freebsd[123]*) diff --git a/libjava/classpath/ltcf-c.sh b/libjava/classpath/ltcf-c.sh index 5eb05db..565e033 100644 --- a/libjava/classpath/ltcf-c.sh +++ b/libjava/classpath/ltcf-c.sh @@ -423,10 +423,6 @@ else link_all_deplibs=yes ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little diff --git a/libjava/classpath/ltcf-gcj.sh b/libjava/classpath/ltcf-gcj.sh index 3f1c281..b1a42d6 100644 --- a/libjava/classpath/ltcf-gcj.sh +++ b/libjava/classpath/ltcf-gcj.sh @@ -422,10 +422,6 @@ else ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little diff --git a/libjava/classpath/ltconfig b/libjava/classpath/ltconfig index cfbfda8..743d951 100755 --- a/libjava/classpath/ltconfig +++ b/libjava/classpath/ltconfig @@ -1128,10 +1128,6 @@ darwin* | rhapsody*) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` version_type=freebsd-$objformat diff --git a/libjava/libltdl/acinclude.m4 b/libjava/libltdl/acinclude.m4 index 53e3e5c..55beab1 100644 --- a/libjava/libltdl/acinclude.m4 +++ b/libjava/libltdl/acinclude.m4 @@ -1347,10 +1347,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - kfreebsd*-gnu) version_type=linux need_lib_prefix=no @@ -5661,10 +5657,6 @@ EOF _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little diff --git a/libjava/shlibpath.m4 b/libjava/shlibpath.m4 index d6a7ca4..363affa 100644 --- a/libjava/shlibpath.m4 +++ b/libjava/shlibpath.m4 @@ -228,10 +228,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat diff --git a/libtool.m4 b/libtool.m4 index 9abd147..71bcee8 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -2266,10 +2266,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -4796,10 +4792,6 @@ _LT_EOF _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little