Correct __s390__ definitions.

From-SVN: r45140

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 95b7ad92895c8c87cd4b182a1f61d9b1e149d6ce..b977a802549a8a3d9ef01df7ef27e17f53fde088 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-23  David Edelsohn  <edelsohn@gnu.org>
+
+       * config/os/gnu-linux/bits/os_defines.h: Correct __s390__ definitions.
+
 2001-08-23  Jason Merrill  <jason_merrill@redhat.com>
 
        * testsuite_flags.in (build-includes): Re-add backward.

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 db67d9752d46c7c5ad1981bbd924e884ca1e5711..474238cebb88b5420e4fe9cf10cabe5ffa9f7b3a 100644 (file)
--- a/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h
+++ b/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h
@@ -63,15 +63,15 @@ typedef __loff_t __off64_t;
 #  define __NO_STRING_INLINES
 # endif
 
-#if defined (__powerpc__) || defined (__s390__) || defined (__s390x__)
+#if defined (__powerpc__) || defined (__s390__)
 #define __glibcpp_wchar_t_is_signed true
 #endif
 
-#if defined (__alpha__) || defined (__powerpc64__) || (defined (__sparc__) && defined(__arch64__)) || defined (__s390__) || defined (__s390x__)
+#if defined (__alpha__) || defined (__powerpc64__) || (defined (__sparc__) && defined(__arch64__)) || defined (__s390x__)
 #define __glibcpp_long_bits 64
 #endif
 
-#if defined (__alpha__) || defined (__powerpc64__)
+#if defined (__alpha__) || defined (__powerpc64__) || defined (__s390__)
 #define __glibcpp_long_double_bits 64
 #endif