From owner-svn-src-head@FreeBSD.ORG Sat Nov 10 21:43:49 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DF0059C7; Sat, 10 Nov 2012 21:43:49 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) by mx1.freebsd.org (Postfix) with ESMTP id 79A068FC0A; Sat, 10 Nov 2012 21:43:49 +0000 (UTC) Received: from tom.home (localhost [127.0.0.1]) by kib.kiev.ua (8.14.5/8.14.5) with ESMTP id qAALhjw9076925; Sat, 10 Nov 2012 23:43:45 +0200 (EET) (envelope-from kostikbel@gmail.com) X-DKIM: OpenDKIM Filter v2.5.2 kib.kiev.ua qAALhjw9076925 Received: (from kostik@localhost) by tom.home (8.14.5/8.14.5/Submit) id qAALhjSl076924; Sat, 10 Nov 2012 23:43:45 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 10 Nov 2012 23:43:45 +0200 From: Konstantin Belousov To: Dimitry Andric Subject: Re: svn commit: r242879 - in head/lib: libc/gen msun/src Message-ID: <20121110214345.GT73505@kib.kiev.ua> References: <201211102122.qAALMAnO014246@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="99MdDuYC93zIKUQv" Content-Disposition: inline In-Reply-To: <201211102122.qAALMAnO014246@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Status: No, score=0.2 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on tom.home Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Nov 2012 21:43:50 -0000 --99MdDuYC93zIKUQv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Nov 10, 2012 at 09:22:10PM +0000, Dimitry Andric wrote: > Author: dim > Date: Sat Nov 10 21:22:10 2012 > New Revision: 242879 > URL: http://svnweb.freebsd.org/changeset/base/242879 >=20 > Log: > Only define isnan, isnanf, __isnan and __isnanf in libc.so, not in > libc.a and libc_p.a. In addition, define isnan in libm.a and libm_p.a, > but not in libm.so. > =20 > This makes it possible to statically link executables using both isnan > and isnanf with libc and libm. > =20 > Tested by: kargl > MFC after: 1 week >=20 > Modified: > head/lib/libc/gen/isnan.c > head/lib/msun/src/s_isnan.c >=20 > Modified: head/lib/libc/gen/isnan.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/lib/libc/gen/isnan.c Sat Nov 10 21:09:17 2012 (r242878) > +++ head/lib/libc/gen/isnan.c Sat Nov 10 21:22:10 2012 (r242879) > @@ -35,6 +35,7 @@ > * binary compat until we can bump libm's major version number. > */ > =20 > +#ifdef PIC > __weak_reference(__isnan, isnan); > __weak_reference(__isnanf, isnanf); > =20 > @@ -55,3 +56,4 @@ __isnanf(float f) > u.f =3D f; > return (u.bits.exp =3D=3D 255 && u.bits.man !=3D 0); > } > +#endif /* PIC */ >=20 > Modified: head/lib/msun/src/s_isnan.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/lib/msun/src/s_isnan.c Sat Nov 10 21:09:17 2012 (r242878) > +++ head/lib/msun/src/s_isnan.c Sat Nov 10 21:22:10 2012 (r242879) > @@ -30,8 +30,9 @@ > =20 > #include "fpmath.h" > =20 > -/* Provided by libc */ > -#if 0 > +/* Provided by libc.so */ > +#ifndef PIC > +#undef isnan > int > isnan(double d) > { > @@ -40,7 +41,7 @@ isnan(double d) > u.d =3D d; > return (u.bits.exp =3D=3D 2047 && (u.bits.manl !=3D 0 || u.bits.manh != =3D 0)); > } > -#endif > +#endif /* !PIC */ > =20 > int > __isnanf(float f) So you broke ABI for libm ? --99MdDuYC93zIKUQv Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlCeypAACgkQC3+MBN1Mb4gQBACfX3Lbm8p1JdV2Sn8achQSsHEO dxwAn1K1VSurCuOH3Y8Z4yxwxPh/QaaZ =o0Bs -----END PGP SIGNATURE----- --99MdDuYC93zIKUQv--