aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog9
-rw-r--r--libstdc++-v3/config/cpu/s390/bits/cpu_limits.h5
-rw-r--r--libstdc++-v3/config/os/aix/bits/os_defines.h1
-rw-r--r--libstdc++-v3/config/os/gnu-linux/bits/os_defines.h12
-rw-r--r--libstdc++-v3/include/bits/std_limits.h2
5 files changed, 14 insertions, 15 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b64f570..65f391e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,4 +1,13 @@
2001-10-25 Benjamin Kosnik <bkoz@redhat.com>
+ Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
+ Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
+
+ * config/os/gnu-linux/bits/os_defines.h: Set to 64 bit longs with
+ __s390x__ only.
+ * include/bits/std_limits.h: Fix wchar_t issues.
+ * config/os/aix/bits/os_defines.h: Fix.
+
+2001-10-25 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/locale_facets.tcc (collate::do_transform): Fix.
diff --git a/libstdc++-v3/config/cpu/s390/bits/cpu_limits.h b/libstdc++-v3/config/cpu/s390/bits/cpu_limits.h
index 21d31e3..f0ff04d 100644
--- a/libstdc++-v3/config/cpu/s390/bits/cpu_limits.h
+++ b/libstdc++-v3/config/cpu/s390/bits/cpu_limits.h
@@ -28,11 +28,6 @@
#ifndef _GLIBCPP_CPU_LIMITS
#define _GLIBCPP_CPU_LIMITS 1
-#define __glibcpp_long_bits 64
-
#define __glibcpp_long_double_bits 64
#endif
-
-
-
diff --git a/libstdc++-v3/config/os/aix/bits/os_defines.h b/libstdc++-v3/config/os/aix/bits/os_defines.h
index 188ced19..6a658a1 100644
--- a/libstdc++-v3/config/os/aix/bits/os_defines.h
+++ b/libstdc++-v3/config/os/aix/bits/os_defines.h
@@ -65,4 +65,3 @@
#endif
#endif
-
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 f5612ed..4b51540 100644
--- a/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h
+++ b/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h
@@ -58,18 +58,14 @@ typedef __loff_t __off64_t;
// our definitions.
#define __NO_MATH_INLINES
-#endif /* not glibc 2.1 or higher. */
+#endif
-# if defined __GLIBC__ && __GLIBC__ >= 2
+#if defined __GLIBC__ && __GLIBC__ >= 2
// We must not see the optimized string functions GNU libc defines.
-# define __NO_STRING_INLINES
-# endif
-
-#if defined(__sparc__) && defined(__arch64__)
-#define __glibcpp_long_bits 64
+#define __NO_STRING_INLINES
#endif
-#ifdef __powerpc64__
+#if defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__))
#define __glibcpp_long_bits 64
#endif
diff --git a/libstdc++-v3/include/bits/std_limits.h b/libstdc++-v3/include/bits/std_limits.h
index 3fca4dc..10a5a38 100644
--- a/libstdc++-v3/include/bits/std_limits.h
+++ b/libstdc++-v3/include/bits/std_limits.h
@@ -96,7 +96,7 @@
#define __glibcpp_wchar_t_bits 32
#endif
#ifndef __glibcpp_wchar_t_is_signed
-#define __glibcpp_wchar_t_is_signed false
+#define __glibcpp_wchar_t_is_signed true
#endif
#ifdef _GLIBCPP_USE_LONG_LONG
#ifndef __glibcpp_long_long_bits