aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Dos Reis <gdr@merlin.codesourcery.com>2001-05-24 20:51:33 +0000
committerGabriel Dos Reis <gdr@gcc.gnu.org>2001-05-24 20:51:33 +0000
commit3e0105a41d387cbd41d5a6f2c9e27ac34c6c4a0a (patch)
treec920a89852db664d01f53912d6705707e0589615
parenta0a843c7bfc41a872cea4dce8b972ac97528dfad (diff)
downloadgcc-3e0105a41d387cbd41d5a6f2c9e27ac34c6c4a0a.zip
gcc-3e0105a41d387cbd41d5a6f2c9e27ac34c6c4a0a.tar.gz
gcc-3e0105a41d387cbd41d5a6f2c9e27ac34c6c4a0a.tar.bz2
c++config (__NO_MATH_INLINES): Move to...
* include/bits/c++config(__NO_MATH_INLINES): Move to... * config/os/gnu-linux/bits/os_defines.h: ...here. From-SVN: r42538
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/config/os/gnu-linux/bits/os_defines.h5
-rw-r--r--libstdc++-v3/include/bits/c++config5
3 files changed, 10 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 70ce13e..c69a31a 100644
--- 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
--- 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
--- 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