svn commit: branches/uClibc-nptl/libm

[sjhill at uclibc.org]

Author: sjhill
Date: 2006-08-20 21:53:46 -0700 (Sun, 20 Aug 2006)
New Revision: 15883

Log:
Merge from trunk.


Modified:
   branches/uClibc-nptl/libm/Makefile.in
   branches/uClibc-nptl/libm/k_standard.c
   branches/uClibc-nptl/libm/math_private.h
   branches/uClibc-nptl/libm/s_lib_version.c
   branches/uClibc-nptl/libm/s_matherr.c


Changeset:
Modified: branches/uClibc-nptl/libm/Makefile.in
===================================================================
--- branches/uClibc-nptl/libm/Makefile.in	2006-08-21 04:49:01 UTC (rev 15882)
+++ branches/uClibc-nptl/libm/Makefile.in	2006-08-21 04:53:46 UTC (rev 15883)
@@ -21,7 +21,7 @@
 #
 
 CFLAGS-libm := -DNOT_IN_libc -DIS_IN_libm $(SSP_ALL_CFLAGS)
-CFLAGS-libm += -D_IEEE_LIBM -D_ISOC99_SOURCE -D_SVID_SOURCE
+CFLAGS-libm += -D_IEEE_LIBM
 
 LDFLAGS-libm.so := $(LDFLAGS)
 

Modified: branches/uClibc-nptl/libm/k_standard.c
===================================================================
--- branches/uClibc-nptl/libm/k_standard.c	2006-08-21 04:49:01 UTC (rev 15882)
+++ branches/uClibc-nptl/libm/k_standard.c	2006-08-21 04:53:46 UTC (rev 15883)
@@ -18,10 +18,11 @@
 #include "math_private.h"
 #include <errno.h>
 
+#ifndef _IEEE_LIBM
+
 libm_hidden_proto(copysign)
 libm_hidden_proto(matherr)
 libm_hidden_proto(rint)
-libm_hidden_proto(_LIB_VERSION)
 
 #ifndef _USE_WRITE
 #include <stdio.h>			/* fputs(), stderr */
@@ -785,3 +786,4 @@
 	}
 	return exc.retval;
 }
+#endif /* _IEEE_LIBM */

Modified: branches/uClibc-nptl/libm/math_private.h
===================================================================
--- branches/uClibc-nptl/libm/math_private.h	2006-08-21 04:49:01 UTC (rev 15882)
+++ branches/uClibc-nptl/libm/math_private.h	2006-08-21 04:53:46 UTC (rev 15883)
@@ -186,7 +186,9 @@
 #endif
 
 /* fdlibm kernel function */
+#ifndef _IEEE_LIBM
 extern double __kernel_standard (double,double,int) attribute_hidden;
+#endif
 extern double __kernel_sin (double,double,int) attribute_hidden;
 extern double __kernel_cos (double,double) attribute_hidden;
 extern double __kernel_tan (double,double,int) attribute_hidden;

Modified: branches/uClibc-nptl/libm/s_lib_version.c
===================================================================
--- branches/uClibc-nptl/libm/s_lib_version.c	2006-08-21 04:49:01 UTC (rev 15882)
+++ branches/uClibc-nptl/libm/s_lib_version.c	2006-08-21 04:53:46 UTC (rev 15883)
@@ -24,7 +24,6 @@
 /*
  * define and initialize _LIB_VERSION
  */
-libm_hidden_proto(_LIB_VERSION)
 #ifdef _POSIX_MODE
 _LIB_VERSION_TYPE _LIB_VERSION = _POSIX_;
 #else
@@ -38,4 +37,3 @@
 #endif
 #endif
 #endif
-libm_hidden_data_def(_LIB_VERSION)

Modified: branches/uClibc-nptl/libm/s_matherr.c
===================================================================
--- branches/uClibc-nptl/libm/s_matherr.c	2006-08-21 04:49:01 UTC (rev 15882)
+++ branches/uClibc-nptl/libm/s_matherr.c	2006-08-21 04:53:46 UTC (rev 15883)
@@ -17,6 +17,8 @@
 #include "math.h"
 #include "math_private.h"
 
+#ifndef _IEEE_LIBM
+
 libm_hidden_proto(matherr)
 #ifdef __STDC__
 	int matherr(struct exception *x)
@@ -30,3 +32,4 @@
 	return n;
 }
 libm_hidden_def(matherr)
+#endif