Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Nov 2012 21:22:10 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r242879 - in head/lib: libc/gen msun/src
Message-ID:  <201211102122.qAALMAnO014246@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Sat Nov 10 21:22:10 2012
New Revision: 242879
URL: http://svnweb.freebsd.org/changeset/base/242879

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.
  
  This makes it possible to statically link executables using both isnan
  and isnanf with libc and libm.
  
  Tested by:	kargl
  MFC after:	1 week

Modified:
  head/lib/libc/gen/isnan.c
  head/lib/msun/src/s_isnan.c

Modified: head/lib/libc/gen/isnan.c
==============================================================================
--- 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.
  */
 
+#ifdef PIC
 __weak_reference(__isnan, isnan);
 __weak_reference(__isnanf, isnanf);
 
@@ -55,3 +56,4 @@ __isnanf(float f)
 	u.f = f;
 	return (u.bits.exp == 255 && u.bits.man != 0);
 }
+#endif /* PIC */

Modified: head/lib/msun/src/s_isnan.c
==============================================================================
--- 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 @@
 
 #include "fpmath.h"
 
-/* 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 = d;
 	return (u.bits.exp == 2047 && (u.bits.manl != 0 || u.bits.manh != 0));
 }
-#endif
+#endif /* !PIC */
 
 int
 __isnanf(float f)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211102122.qAALMAnO014246>