diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2f7d4963df8..5e0cc180125 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-22  Gabriel Dos Reis  <gdr@merlin.codesourcery.com>
+
+	* libmath/stubs.c: New file.
+	* libmath/Makefile.am (libmath_la_SOURCES): Add.
+	* libmath/Makefile.in.  Regenerate.
+
 2001-06-21  Phil Edwards  <pme@sources.redhat.com>
 
 	* include/backward/algo.h:  Add "GPL plus runtime exception" comment.
diff --git a/libstdc++-v3/libmath/Makefile.am b/libstdc++-v3/libmath/Makefile.am
index f8554b66abd..b79ec793b9c 100644
--- a/libstdc++-v3/libmath/Makefile.am
+++ b/libstdc++-v3/libmath/Makefile.am
@@ -40,8 +40,7 @@ libmath_la_LIBADD = \
 
 libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
 
-libmath_la_SOURCES = \
-	signbit.c signbitf.c
+libmath_la_SOURCES = signbit.c signbitf.c stubs.c
 
 LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 
diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in
index 470dc123a72..d136282c1fb 100644
--- a/libstdc++-v3/libmath/Makefile.in
+++ b/libstdc++-v3/libmath/Makefile.in
@@ -128,8 +128,7 @@ libmath_la_LIBADD =  	@LIBMATHOBJS@ 	$(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUB
 
 libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
 
-libmath_la_SOURCES =  	signbit.c signbitf.c
-
+libmath_la_SOURCES = signbit.c signbitf.c stubs.c
 
 LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 
@@ -154,7 +153,7 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libmath_la_LDFLAGS = 
-libmath_la_OBJECTS =  signbit.lo signbitf.lo
+libmath_la_OBJECTS =  signbit.lo signbitf.lo stubs.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/libstdc++-v3/libmath/stubs.c b/libstdc++-v3/libmath/stubs.c
new file mode 100644
index 00000000000..b990dc0ddc2
--- /dev/null
+++ b/libstdc++-v3/libmath/stubs.c
@@ -0,0 +1,111 @@
+/* Stub definitions for libmath subpart of libstdc++. */
+
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+
+   This file is part of the GNU ISO C++ Library.  This library is free
+   software; you can redistribute it and/or modify it under the
+   terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this library; see the file COPYING.  If not, write to the Free
+   Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.
+
+   As a special exception, you may use this file as part of a free software
+   library without restriction.  Specifically, if other files instantiate
+   templates or use macros or inline functions from this file, or you compile
+   this file and link it with other files to produce an executable, this
+   file does not by itself cause the resulting executable to be covered by
+   the GNU General Public License.  This exception does not however
+   invalidate any other reasons why the executable file might be covered by
+   the GNU General Public License.  */
+
+#include <math.h>
+#include <bits/c++config.h>
+
+#if !defined(_GLIBCPP_HAVE_COSF) && !defined(_GLIBCPP_HAVE___BUILTIN_COSF)
+extern float
+cosf(float x)
+{
+  return (float) cos(x);
+}
+#endif
+
+#ifndef _GLIBCPP_HAVE_COSHF
+extern float
+coshf(float x)
+{
+  return (float) cosh(x);
+}
+#endif
+
+#ifndef _GLIBCPP_HAVE_EXPF
+extern float
+expf(float x)
+{
+  return (float) exp(x);
+}
+#endif
+
+#ifndef _GLIBCPP_HAVE_LOGF
+extern float
+logf(float x)
+{
+  return (float) log(x);
+}
+#endif
+
+#ifndef _GLIBCPP_HAVE_LOG10F
+extern float
+log10f(float x)
+{
+  return (float) log10(x);
+}
+#endif
+
+#ifndef _GLIBCPP_HAVE_POWF
+extern float
+powf(float x)
+{
+  return (float) pow(x);
+}
+#endif
+
+#if !defined(_GLIBCPP_HAVE_SINF) && !defined(_GLIBCPP_HAVE___BUILTIN_SINF)
+extern float
+sinf(float x)
+{
+  return (float) sin(x);
+}
+#endif
+
+#ifndef _GLIBCPP_HAVE_SINHF
+extern float
+sinhf(float x)
+{
+  return (float) sinh(x);
+}
+#endif
+
+#ifndef _GLIBCPP_HAVE_TANF
+extern float
+tanf(float x)
+{
+  return (float) tanf(x);
+}
+#endif
+
+#ifndef _GLIBCPP_HAVE_TANHF
+extern float
+tanhf(float x)
+{
+  return (float) tanhf(x);
+}
+#endif