Sync with trunk.

16 files changed, 32 insertions, 82 deletions

diff --git a/libm/Makefile.in b/libm/Makefile.in
index 7ec925653..9ddd8c8a5 100644
--- a/libm/Makefile.in
+++ b/libm/Makefile.in
@@ -48,7 +48,6 @@ libm_ARCH_fpu_OUT:=$(libm_ARCH_OUT)/fpu
 ifeq ($(UCLIBC_HAS_FPU),y)
 ifeq ($(DO_C99_MATH),y)
 -include $(libm_ARCH_DIR)/Makefile.arch
--include $(libm_ARCH_fpu_DIR)/Makefile.arch
 endif
 endif
 
diff --git a/libm/float_wrappers.c b/libm/float_wrappers.c
index 58d3926a7..26041d088 100644
--- a/libm/float_wrappers.c
+++ b/libm/float_wrappers.c
@@ -10,6 +10,9 @@
  * GNU Lesser General Public License version 2.1 or later.
  */
 
+#include <features.h>
+/* Prevent math.h from defining colliding inlines */
+#undef __USE_EXTERN_INLINES
 #include <math.h>
 #include <complex.h>
 
diff --git a/libm/ldouble_wrappers.c b/libm/ldouble_wrappers.c
index d82436da4..62732bae9 100644
--- a/libm/ldouble_wrappers.c
+++ b/libm/ldouble_wrappers.c
@@ -10,6 +10,9 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
+#include <features.h>
+/* Prevent math.h from defining colliding inlines */
+#undef __USE_EXTERN_INLINES
 #include "math.h"
 
 /* Implement the following, as defined by SuSv3 */
diff --git a/libm/s_ceil.c b/libm/s_ceil.c
index 76be3ea43..c488510b1 100644
--- a/libm/s_ceil.c
+++ b/libm/s_ceil.c
@@ -23,6 +23,9 @@ static char rcsid[] = "$NetBSD: s_ceil.c,v 1.8 1995/05/10 20:46:53 jtc Exp $";
  *	Inexact flag raised if x not equal to ceil(x).
  */
 
+#include <features.h>
+/* Prevent math.h from defining a colliding inline */
+#undef __USE_EXTERN_INLINES
 #include "math.h"
 #include "math_private.h"
 
diff --git a/libm/s_fabs.c b/libm/s_fabs.c
index deb91382d..942a9b802 100644
--- a/libm/s_fabs.c
+++ b/libm/s_fabs.c
@@ -18,6 +18,9 @@ static char rcsid[] = "$NetBSD: s_fabs.c,v 1.7 1995/05/10 20:47:13 jtc Exp $";
  * fabs(x) returns the absolute value of x.
  */
 
+#include <features.h>
+/* Prevent math.h from defining a colliding inline */
+#undef __USE_EXTERN_INLINES
 #include "math.h"
 #include "math_private.h"
 
diff --git a/libm/s_finite.c b/libm/s_finite.c
index 758da9a40..2235d0a42 100644
--- a/libm/s_finite.c
+++ b/libm/s_finite.c
@@ -15,6 +15,9 @@
  * no branching!
  */
 
+#include <features.h>
+/* Prevent math.h from defining a colliding inline */
+#undef __USE_EXTERN_INLINES
 #include "math.h"
 #include "math_private.h"
 
diff --git a/libm/s_floor.c b/libm/s_floor.c
index 1eccfcd8c..c9bc2a0d0 100644
--- a/libm/s_floor.c
+++ b/libm/s_floor.c
@@ -23,6 +23,9 @@ static char rcsid[] = "$NetBSD: s_floor.c,v 1.8 1995/05/10 20:47:20 jtc Exp $";
  *	Inexact flag raised if x not equal to floor(x).
  */
 
+#include <features.h>
+/* Prevent math.h from defining a colliding inline */
+#undef __USE_EXTERN_INLINES
 #include "math.h"
 #include "math_private.h"
 
diff --git a/libm/s_fpclassifyf.c b/libm/s_fpclassifyf.c
index 602d8b2b4..edc0db635 100644
--- a/libm/s_fpclassifyf.c
+++ b/libm/s_fpclassifyf.c
@@ -21,7 +21,7 @@
 #include <math.h>
 #include "math_private.h"
 
-libm_hidden_proto (__fpclassifyf)
+libm_hidden_proto(__fpclassifyf)
 int
 __fpclassifyf (float x)
 {
diff --git a/libm/s_isnanf.c b/libm/s_isnanf.c
index 97c354d1a..6afa5df06 100644
--- a/libm/s_isnanf.c
+++ b/libm/s_isnanf.c
@@ -21,7 +21,7 @@
 #include "math.h"
 #include "math_private.h"
 
-libm_hidden_proto (__isnanf)
+libm_hidden_proto(__isnanf)
 int __isnanf(float x)
 {
 	int32_t ix;
diff --git a/libm/s_llrint.c b/libm/s_llrint.c
index 96e1495c7..b5f75c2e2 100644
--- a/libm/s_llrint.c
+++ b/libm/s_llrint.c
@@ -19,8 +19,10 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <features.h>
+/* Prevent math.h from defining a colliding inline */
+#undef __USE_EXTERN_INLINES
 #include <math.h>
-
 #include "math_private.h"
 
 static const double two52[2] =
diff --git a/libm/s_lrint.c b/libm/s_lrint.c
index a0db12d76..3cdc8a253 100644
--- a/libm/s_lrint.c
+++ b/libm/s_lrint.c
@@ -19,8 +19,10 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <features.h>
+/* Prevent math.h from defining a colliding inline */
+#undef __USE_EXTERN_INLINES
 #include <math.h>
-
 #include "math_private.h"
 
 static const double two52[2] =
diff --git a/libm/s_signbit.c b/libm/s_signbit.c
index c9f6527af..ee1b7c62e 100644
--- a/libm/s_signbit.c
+++ b/libm/s_signbit.c
@@ -18,8 +18,10 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <features.h>
+/* Prevent math.h from defining a colliding inline */
+#undef __USE_EXTERN_INLINES
 #include <math.h>
-
 #include "math_private.h"
 
 int
diff --git a/libm/s_signbitf.c b/libm/s_signbitf.c
index ef83d6b7f..3a5cf0c2a 100644
--- a/libm/s_signbitf.c
+++ b/libm/s_signbitf.c
@@ -18,8 +18,10 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <features.h>
+/* Prevent math.h from defining a colliding inline */
+#undef __USE_EXTERN_INLINES
 #include <math.h>
-
 #include "math_private.h"
 
 libm_hidden_proto(__signbitf)
diff --git a/libm/sh/fpu/Makefile.arch b/libm/sh/fpu/Makefile.arch
deleted file mode 100644
index e0f4fe952..000000000
--- a/libm/sh/fpu/Makefile.arch
+++ /dev/null
@@ -1,18 +0,0 @@
-# Makefile for uClibc
-#
-# Copyright (c) 2007  STMicroelectronics Ltd
-#
-# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-#
-
-libm_ARCH_SRC:=$(wildcard $(libm_ARCH_fpu_DIR)/*.c)
-libm_ARCH_OBJ:=$(patsubst $(libm_ARCH_fpu_DIR)/%.c,$(libm_ARCH_fpu_OUT)/%.o,$(libm_ARCH_SRC))
-
-libm_ARCH_OBJS:=$(libm_ARCH_OBJ)
-
-ifeq ($(DOPIC),y)
-libm-a-y+=$(libm_ARCH_OBJS:.o=.os)
-else
-libm-a-y+=$(libm_ARCH_OBJS)
-endif
-libm-so-y+=$(libm_ARCH_OBJS:.o=.os)
diff --git a/libm/sh/fpu/feholdexcpt.c b/libm/sh/fpu/feholdexcpt.c
deleted file mode 100644
index 1af79b31f..000000000
--- a/libm/sh/fpu/feholdexcpt.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- * Copyright (c) 2007  STMicroelectronics Ltd
- * Filippo Arcidiacono (filippo.arcidiacono@st.com)
- *
- * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
- *
- * Taken from glibc 2.6
- *
- */
-
-#include <fenv.h>
-#include <fpu_control.h>
-
-int
-feholdexcept (fenv_t *envp)
-{
-  unsigned long int temp;
-
-  /* Store the environment.  */
-  _FPU_GETCW (temp);
-  envp->__fpscr = temp;
-
-  /* Now set all exceptions to non-stop.  */
-  temp &= ~FE_ALL_EXCEPT;
-  _FPU_SETCW (temp);
-
-  return 1;
-}
-libm_hidden_def (feholdexcept)
diff --git a/libm/sh/fpu/fesetenv.c b/libm/sh/fpu/fesetenv.c
deleted file mode 100644
index 9f9082cf3..000000000
--- a/libm/sh/fpu/fesetenv.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *
- * Copyright (c) 2007  STMicroelectronics Ltd
- * Filippo Arcidiacono (filippo.arcidiacono@st.com)
- *
- * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
- *
- * Taken from glibc 2.6
- *
- */
-
-#include <fenv.h>
-#include <fpu_control.h>
-
-int
-fesetenv (const fenv_t *envp)
-{
-  if (envp == FE_DFL_ENV)
-      _FPU_SETCW (_FPU_DEFAULT);
-  else
-    {
-      unsigned long int temp = envp->__fpscr;
-      _FPU_SETCW (temp);
-    }
-  return 0;
-}
-libm_hidden_def (fesetenv)