* include/bits/c++config(__NO_MATH_INLINES): Move to...

      * config/os/gnu-linux/bits/os_defines.h: ...here.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42538 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 70ce13e..c69a31a 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-24  Gabriel Dos Reis  <gdr@merlin.codesourcery.com>
+
+       * include/bits/c++config(__NO_MATH_INLINES): Move to...
+       * config/os/gnu-linux/bits/os_defines.h: ...here.
+
 2001-05-24  Gabriel Dos Reis  <gdr@codesourcery.com>
 
        * include/bits/c++config (__NO_MATH_INLINES): New macro.

diff --git a/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h b/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h
index 72c2242..538b354 100644 (file)
--- a/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h
+++ b/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h
@@ -51,6 +51,11 @@ typedef __loff_t __off64_t;
 #undef __THROW
 #define __THROW
 
+// Tell Glibc not to try to provide its own inline versions of
+// some math functions.  Those cause assembly-time clashes with
+// our definitions.
+#define __NO_MATH_INLINES
+
 #endif /* not glibc 2.1 or higher.  */
 
 # if defined __GLIBC__ && __GLIBC__ >= 2

diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index bd9c55c..f87f58e 100644 (file)
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -33,11 +33,6 @@
 // Pick up any OS-specific definitions.
 #include <bits/os_defines.h>
 
-// Tell Glibc not to try to provide its own inline versions of
-// some math functions.  Those cause assembly-time clashes with
-// our definitions.
-#define __NO_MATH_INLINES
-
 // The current version of the C++ library in compressed ISO date format.
 #define __GLIBCPP__ 20010517