From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28664 invoked by alias); 29 Jun 2012 23:31:25 -0000 Received: (qmail 28654 invoked by uid 22791); 29 Jun 2012 23:31:24 -0000 X-SWARE-Spam-Status: No, hits=-6.0 required=5.0 tests=AWL,BAYES_00,KHOP_PGP_SIGNED,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,URIBL_BLACK X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 29 Jun 2012 23:31:10 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1Skkea-0007bB-AT from Thomas_Schwinge@mentor.com ; Fri, 29 Jun 2012 16:31:08 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 29 Jun 2012 16:30:21 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.1.289.1; Sat, 30 Jun 2012 00:31:06 +0100 From: Thomas Schwinge To: Rainer Orth CC: Subject: Re: Remove obsolete Solaris 8 support In-Reply-To: References: User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Sat, 30 Jun 2012 10:02:00 -0000 Message-ID: <877gup7l25.fsf@schwinge.name> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2012-06/txt/msg01959.txt.bz2 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-length: 5251 Hi! On Mon, 12 Mar 2012 18:44:24 +0100, Rainer Orth wrote: > 2012-03-11 Rainer Orth > gcc: > * config.gcc (enable_obsolete): Remove *-*-solaris2.8*. > (*-*-solaris2.[0-8], *-*-solaris2.[0-8].*): Mark unsupported. > (i[34567]86-*-solaris2*, x86_64-*-solaris2.1[0-9]*): Remove > Solaris 8 support. > * configure.ac (gcc_cv_ld_hidden): Remove *-*-solaris2.8*. > (ld_tls_support): Remove Solaris 8 references. > (lwp_dir, lwp_spec): Remove support for alternate thread library. > * acinclude.m4 (gcc_cv_initfini_array): Remove *-*-solaris2.* > tests. > * configure: Regenerate. > * config.in: Regenerate. > --- a/gcc/acinclude.m4 > +++ b/gcc/acinclude.m4 > @@ -461,23 +461,7 @@ changequote([,])dnl > # error The C library not known to support .init_array/.fini_array > # endif > #endif > -])],[ > - case "${target}" in > - *-*-solaris2.8*) > - # .init_array/.fini_array support was introduced in Solaris 8 > - # patches 109147-08 (sparc) and 109148-08 (x86). Since ld.so.1 and > - # ld are guaranteed to be updated in lockstep, we can check ld -V > - # instead. Unfortunately, proper ld version numbers were only > - # introduced in rev. -14, so we check for that. > - if test "$gcc_cv_sun_ld_vers_minor" -lt 272; then > - gcc_cv_initfini_array=3Dno > - fi > - ;; > - *-*-solaris2.9* | *-*-solaris2.1[[0-9]]*) > - # .init_array/.fini_array support is present since Solaris 9 FCS. > - ;; > - esac > -], [gcc_cv_initfini_array=3Dno]);; > +])],, [gcc_cv_initfini_array=3Dno]);; > esac > else > AC_MSG_CHECKING(cross compile... guessing) It seems to me that gcc_cv_sun_ld_ver* isn't used anywhere anymore, so what about applying the following cleanup (completely untested): gcc/ * acinclude.m4 (gcc_AC_INITFINI_ARRAY): Don't require gcc_SUN_LD_VERSION. (gcc_SUN_LD_VERSION): Remove, preserving some comments... * configure.ac: ... here. diff --git a/gcc/acinclude.m4 b/gcc/acinclude.m4 index c24464b..6410f2c 100644 --- a/gcc/acinclude.m4 +++ b/gcc/acinclude.m4 @@ -278,8 +278,7 @@ fi fi]) =20 AC_DEFUN([gcc_AC_INITFINI_ARRAY], -[AC_REQUIRE([gcc_SUN_LD_VERSION])dnl -AC_ARG_ENABLE(initfini-array, +[AC_ARG_ENABLE(initfini-array, [ --enable-initfini-array use .init_array/.fini_array sections], [], [ AC_CACHE_CHECK(for .preinit_array/.init_array/.fini_array support, @@ -488,43 +487,6 @@ if test $[$2] =3D yes; then $7 fi])]) =20 -dnl gcc_SUN_LD_VERSION -dnl -dnl Determines Sun linker version numbers, setting gcc_cv_sun_ld_vers to -dnl the complete version number and gcc_cv_sun_ld_vers_{major, minor} to -dnl the corresponding fields. -dnl -dnl ld and ld.so.1 are guaranteed to be updated in lockstep, so ld version -dnl numbers can be used in ld.so.1 feature checks even if a different -dnl linker is configured. -dnl -AC_DEFUN([gcc_SUN_LD_VERSION], -[changequote(,)dnl -if test "x${build}" =3D "x${target}" && test "x${build}" =3D "x${host}"; t= hen - case "${target}" in - *-*-solaris2*) - # - # Solaris 2 ld -V output looks like this for a regular version: - # - # ld: Software Generation Utilities - Solaris Link Editors: 5.11-1.1= 699 - # - # but test versions add stuff at the end: - # - # ld: Software Generation Utilities - Solaris Link Editors: 5.11-1.1= 701:onnv-ab196087-6931056-03/25/10 - # - gcc_cv_sun_ld_ver=3D`/usr/ccs/bin/ld -V 2>&1` - if echo "$gcc_cv_sun_ld_ver" | grep 'Solaris Link Editors' > /dev/nu= ll; then - gcc_cv_sun_ld_vers=3D`echo $gcc_cv_sun_ld_ver | sed -n \ - -e 's,^.*: 5\.[0-9][0-9]*-\([0-9]\.[0-9][0-9]*\).*$,\1,p'` - gcc_cv_sun_ld_vers_major=3D`expr "$gcc_cv_sun_ld_vers" : '\([0-9]*\)'` - gcc_cv_sun_ld_vers_minor=3D`expr "$gcc_cv_sun_ld_vers" : '[0-9]*\.\([0-9]= *\)'` - fi - ;; - esac -fi -changequote([,])dnl -]) - dnl GCC_TARGET_TEMPLATE(KEY) dnl ------------------------ dnl Define KEY as a valid configure key on the target machine. diff --git a/gcc/configure.ac b/gcc/configure.ac index 7891fcc..4ea2f9c 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2290,11 +2290,21 @@ if test $in_tree_ld !=3D yes ; then else case "${target}" in *-*-solaris2*) - # See acinclude.m4 (gcc_SUN_LD_VERSION) for the version number - # format. + # Determines Sun linker version numbers, setting gcc_cv_sun_ld_vers to + # the complete version number and gcc_cv_sun_ld_vers_{major, minor} to + # the corresponding fields. # - # Don't reuse gcc_gv_sun_ld_vers_* in case a linker other than - # /usr/ccs/bin/ld has been configured. + # ld and ld.so.1 are guaranteed to be updated in lockstep, so ld + # version numbers can be used in ld.so.1 feature checks even if a + # different linker is configured. + # + # Solaris 2 ld -V output looks like this for a regular version: + # + # ld: Software Generation Utilities - Solaris Link Editors: 5.11-1.1699 + # + # but test versions add stuff at the end: + # + # ld: Software Generation Utilities - Solaris Link Editors: 5.11-1.1701:o= nnv-ab196087-6931056-03/25/10 ld_ver=3D`$gcc_cv_ld -V 2>&1` if echo "$ld_ver" | grep 'Solaris Link Editors' > /dev/null; then ld_vers=3D`echo $ld_ver | sed -n \ Gr=C3=BC=C3=9Fe, Thomas --=-=-= Content-Type: application/pgp-signature Content-length: 489 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAEBAgAGBQJP7jqjAAoJENuKOtuXzphJvvMH/Ryd5Tq2BbxBGnYJjbdh6us+ gmHIJTliVVYxHp86KSJLuXFvGCKrpbVOb/3fPPkHtdNdVXn/5nztGsChvQG3lMA+ d3rlXPiuNBMDfDtI+UnJ6lG98zsB7w5MX+rYm6L4K7adWw13TxvBDzml1NKTpwlC D2PZXgbXLHmWBZQ326sV0P+LWExwgkpMzAZOzKVENk2jeICINQNMObpW+FlWnpqF oTAI82+HKR7GfHOP28ukZRun4XItIjWV0/BdicEfwD1K+qAInnlbTF/sBs6/tnAU uY04zAgqEoZgLgAdt8/E59n12HFgoA9ear28xPnkSlqZKW9XHEjf9kVA+Nw6QWk= =XKHE -----END PGP SIGNATURE----- --=-=-=--