2004-10-14  Jakub Jelinek  <jakub@redhat.com>

	* include/std/std_limits.h: For GCC 3.2.x and earlier include

	GCC 3.2.3 std_limits.h.

	Revert:

	2002-09-25  Benjamin Kosnik  <bkoz@redhat.com>

        * include/Makefile.am (target_headers): Remove cpu_limits.h.

        * include/Makefile.in: Regenerate.

        * configure.in (CPU_LIMITS_INC_SRCDIR): Remove

        * configure: Regenerate.

        * configure.target (CPULIMITS): Remove.

        * config/os/solaris/solaris2.7/os_defines.h (__glibcpp_long_bits):

        Remove.

        * config/os/irix/irix6.5/os_defines.h

        (__glibcpp_long_double_bits): Remove.

        (__glibcpp_wchar_t_bits): Remove.

        (__glibcpp_long_bits): Remove.

        * config/os/irix/irix5.2/os_defines.h

        (__glibcpp_long_double_bits): Remove.

        (__glibcpp_long_bits): Remove.

        * config/os/hpux/os_defines.h (__glibcpp_wchar_t_is_signed): Remove.

        * config/os/bsd/freebsd/os_defines.h:

        (__glibcpp_long_double_bits): Remove.

        * config/os/aix/os_defines.h (__glibcpp_wchar_t_bits): Remove.

        (__glibcpp_wchar_t_is_signed): Remove.

        (__glibcpp_long_bits): Remove.

        * config/os/gnu-linux/os_defines.h (__glibcpp_long_bits): Remove.

        (__glibcpp_long_double_bits): Remove.

        * config/os/osf/osf5.0/cpu_limits.h: Remove.

        * config/cpu/alpha/cpu_limits.h: Remove.

        * config/cpu/arm/cpu_limits.h: Remove.

        * config/cpu/cris/cpu_limits.h: Remove.

        * config/cpu/generic/cpu_limits.h: Remove.

        * config/cpu/generic/limits.h: Remove.

        * config/cpu/ia64/cpu_limits.h: Remove.

        * config/cpu/m68k/cpu_limits.h: Remove.

        * config/cpu/mmix/cpu_limits.h: Remove.

        * config/cpu/powerpc/cpu_limits.h: Remove.

        * config/cpu/S390/cpu_limits.h: Remove.

--- libstdc++33-v3/libmath/Makefile.in.jj	2003-03-17 14:07:39.000000000 -0500

+++ libstdc++33-v3/libmath/Makefile.in	2004-10-14 12:28:01.000000000 -0400

@@ -83,6 +83,7 @@ CMESSAGES_H = @CMESSAGES_H@

 CMONEY_CC = @CMONEY_CC@

 CNUMERIC_CC = @CNUMERIC_CC@

 CPP = @CPP@

+CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@

 CSTDIO_H = @CSTDIO_H@

 CTIME_CC = @CTIME_CC@

 CTIME_H = @CTIME_H@

--- libstdc++33-v3/libsupc++/Makefile.in.jj	2004-06-28 18:29:56.000000000 -0400

+++ libstdc++33-v3/libsupc++/Makefile.in	2004-10-14 12:28:01.000000000 -0400

@@ -82,6 +82,7 @@ CMESSAGES_H = @CMESSAGES_H@

 CMONEY_CC = @CMONEY_CC@

 CNUMERIC_CC = @CNUMERIC_CC@

 CPP = @CPP@

+CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@

 CSTDIO_H = @CSTDIO_H@

 CTIME_CC = @CTIME_CC@

 CTIME_H = @CTIME_H@

--- libstdc++33-v3/src/Makefile.in.jj	2004-01-20 06:36:07.000000000 -0500

+++ libstdc++33-v3/src/Makefile.in	2004-10-14 12:28:01.000000000 -0400

@@ -82,6 +82,7 @@ CMESSAGES_H = @CMESSAGES_H@

 CMONEY_CC = @CMONEY_CC@

 CNUMERIC_CC = @CNUMERIC_CC@

 CPP = @CPP@

+CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@

 CSTDIO_H = @CSTDIO_H@

 CTIME_CC = @CTIME_CC@

 CTIME_H = @CTIME_H@

--- libstdc++33-v3/config/os/bsd/freebsd/os_defines.h.jj	2003-05-15 18:08:04.000000000 -0400

+++ libstdc++33-v3/config/os/bsd/freebsd/os_defines.h	2004-10-14 12:28:01.000000000 -0400

@@ -41,4 +41,6 @@

 #define _GLIBCPP_USE_C99_FLOAT_TRANSCENDENTALS_CHECK 1

 #define _GLIBCPP_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC defined _XOPEN_SOURCE

+#define __glibcpp_long_double_bits __glibcpp_double_bits

+

 #endif

--- libstdc++33-v3/config/os/aix/os_defines.h.jj	2002-09-26 01:25:10.000000000 -0400

+++ libstdc++33-v3/config/os/aix/os_defines.h	2004-10-14 12:28:01.000000000 -0400

@@ -55,4 +55,13 @@

 #undef _G_USING_THUNKS

 #define _G_USING_THUNKS 0

+#if !defined(_AIX51) || !defined(__64BIT__)

+#define __glibcpp_wchar_t_bits 16

+#define __glibcpp_wchar_t_is_signed false

+#endif

+

+#ifdef __64BIT__

+#define __glibcpp_long_bits 64

+#endif

+

 #endif

--- libstdc++33-v3/config/os/gnu-linux/os_defines.h.jj	2002-09-26 01:25:10.000000000 -0400

+++ libstdc++33-v3/config/os/gnu-linux/os_defines.h	2004-10-14 12:52:11.000000000 -0400

@@ -65,4 +65,95 @@ typedef __loff_t __off64_t;

 #define __NO_STRING_INLINES

 #endif

+#if (defined(__hppa__) && defined(__LP64__)) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__))

+#define __glibcpp_long_bits 64

+#endif

+

+#if defined(__hppa__) || (defined(__sparc__) && !defined(__arch64__))

+#define __glibcpp_long_double_bits 64

+#endif

+

+/* RHEL3 hack.  */

+#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(__IBMCPP__) \

+    && (defined(__i386__) || defined(__x86_64__) || defined(__ia64__) \

+	|| defined(__s390__) || defined(__s390x__) || defined(__powerpc__) \

+	|| defined(__powerpc64__))

+#define __glibcpp_float_has_quiet_NaN true

+#define __glibcpp_float_has_signaling_NaN true

+#define __glibcpp_float_has_denorm denorm_present

+#define __glibcpp_float_has_infinity true

+#define __glibcpp_float_round_style round_to_nearest

+#define __glibcpp_float_is_iec559 true

+#define __glibcpp_double_has_quiet_NaN true

+#define __glibcpp_double_has_signaling_NaN true

+#define __glibcpp_double_has_denorm denorm_present

+#define __glibcpp_double_has_infinity true

+#define __glibcpp_double_round_style round_to_nearest

+#define __glibcpp_double_is_iec559 true

+#define __glibcpp_long_double_has_quiet_NaN true

+#define __glibcpp_long_double_has_signaling_NaN true

+#define __glibcpp_long_double_has_denorm denorm_present

+#define __glibcpp_long_double_has_infinity true

+#define __glibcpp_long_double_round_style round_to_nearest

+#define __glibcpp_long_double_is_iec559 true

+

+#define __glibcpp_f32_round_error 0.5F

+#define __glibcpp_f64_round_error 0.5

+#define __glibcpp_f80_round_error 0.5L

+#define __glibcpp_f96_round_error 0.5L

+#define __glibcpp_f128_round_error 0.5L

+

+#define __glibcpp_float_infinity 1.0e+40F

+#define __glibcpp_double_infinity 1.0e+320

+#define __glibcpp_long_double_infinity 1.0e+5000L

+

+#define __glibcpp_float_denorm_min 1.40129846e-45F

+#define __glibcpp_double_denorm_min 4.9406564584124654e-324

+

+#define __glibcpp_float_quiet_NaN \

+  (__extension__ ((union { unsigned int __l; float __d; })		\

+		  { __l: 0x7fc00000 }).__d)

+#define __glibcpp_double_quiet_NaN \

+  (__extension__ ((union { unsigned long long __l; double __d; })	\

+		  { __l: 0x7ff8000000000000ULL }).__d)

+

+#define __glibcpp_float_signaling_NaN \

+  (__extension__ ({ union { unsigned int __l; float __d; } __u;		\

+		    __u.__l = 0x7fa00000;				\

+		    __asm ("" : : "r" (&__u) : "memory"); __u.__d; }))

+#define __glibcpp_double_signaling_NaN \

+  (__extension__ ({ union { unsigned long long __l; double __d; } __u;	\

+		    __u.__l = 0x7ff4000000000000ULL;			\

+		    __asm ("" : : "r" (&__u) : "memory"); __u.__d; }))

+

+#if __glibcpp_long_double_bits == 80

+

+#define __glibcpp_long_double_denorm_min 3.64519953188247460253e-4951L

+#define __glibcpp_long_double_quiet_NaN \

+  (__extension__ ({ union { unsigned long long __l[2];			\

+			    long double __d; } __u;			\

+		    __u.__l[0] = 0xcULL << 60; __u.__l[1] = 0x7fff;	\

+		    __u.__d; }))

+#define __glibcpp_long_double_signaling_NaN \

+  (__extension__ ({ union { unsigned long long __l[2];			\

+			    long double __d; } __u;			\

+		    __u.__l[0] = 0xaULL << 60; __u.__l[1] = 0x7fff;	\

+		    __asm ("" : : "r" (&__u) : "memory"); __u.__d; }))

+

+#else

+

+#define __glibcpp_long_double_denorm_min 4.9406564584124654e-324L

+#define __glibcpp_long_double_quiet_NaN \

+  (__extension__ ((union { unsigned long long __l; long double __d; })	\

+		  { __l: 0x7ff8000000000000ULL }).__d)

+#define __glibcpp_long_double_signaling_NaN \

+  (__extension__ ({ union { unsigned long long __l;			\

+			    long double __d; } __u;			\

+		     __u.__l = 0x7ff4000000000000ULL;			\

+		     __asm ("" : : "r" (&__u) : "memory"); __u.__d; }))

+

+#endif

+

+#endif

+

 #endif

--- libstdc++33-v3/config/os/hpux/os_defines.h.jj	2003-09-04 08:39:34.000000000 -0400

+++ libstdc++33-v3/config/os/hpux/os_defines.h	2004-10-14 12:28:01.000000000 -0400

@@ -37,6 +37,8 @@

 #define __off64_t off64_t

 #define __ssize_t ssize_t

+#define __glibcpp_wchar_t_is_signed false

+

 // Use macro form of ctype functions to ensure __SB_masks is defined.

 #define _SB_CTYPE_MACROS 1

--- libstdc++33-v3/config/os/irix/irix5.2/os_defines.h.jj	2002-09-26 01:25:11.000000000 -0400

+++ libstdc++33-v3/config/os/irix/irix5.2/os_defines.h	2004-10-14 12:28:01.000000000 -0400

@@ -51,5 +51,11 @@

 // GCC does not use thunks on IRIX. 

 #define _G_USING_THUNKS 0

+#define __glibcpp_long_double_bits 64

+

+#if __LONG_MAX__ > 2147483647

+#define __glibcpp_long_bits 64

+#endif

+

 #endif

--- libstdc++33-v3/config/os/irix/irix6.5/os_defines.h.jj	2002-09-26 01:25:11.000000000 -0400

+++ libstdc++33-v3/config/os/irix/irix6.5/os_defines.h	2004-10-14 12:28:01.000000000 -0400

@@ -51,5 +51,12 @@

 // GCC does not use thunks on IRIX. 

 #define _G_USING_THUNKS 0

+#define __glibcpp_long_double_bits 64

+

+#if __LONG_MAX__ > 2147483647

+#define __glibcpp_wchar_t_bits 64

+#define __glibcpp_long_bits 64

+#endif

+

 #endif

--- libstdc++33-v3/config/os/solaris/solaris2.7/os_defines.h.jj	2002-09-26 01:25:11.000000000 -0400

+++ libstdc++33-v3/config/os/solaris/solaris2.7/os_defines.h	2004-10-14 12:28:01.000000000 -0400

@@ -39,5 +39,9 @@

 #define __off64_t   off64_t

 #define __ssize_t   ssize_t

+#if defined(__sparcv9) || defined(__arch64__)

+#define __glibcpp_long_bits 64

+#endif

+

 #endif

--- libstdc++33-v3/config/cpu/alpha/cpu_limits.h.jj	2004-10-14 12:28:01.000000000 -0400

+++ libstdc++33-v3/config/cpu/alpha/cpu_limits.h	2004-10-14 12:28:01.000000000 -0400

@@ -0,0 +1,38 @@

+// 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.

+

+#ifndef _GLIBCPP_CPU_LIMITS

+#define _GLIBCPP_CPU_LIMITS 1

+

+#define __glibcpp_long_bits 64

+

+#define __glibcpp_long_double_bits 64

+

+#endif

+

+

+

--- libstdc++33-v3/config/cpu/s390/cpu_limits.h.jj	2004-10-14 12:28:01.000000000 -0400

+++ libstdc++33-v3/config/cpu/s390/cpu_limits.h	2004-10-14 12:28:01.000000000 -0400

@@ -0,0 +1,33 @@

+// 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.

+

+#ifndef _GLIBCPP_CPU_LIMITS

+#define _GLIBCPP_CPU_LIMITS 1

+

+#define __glibcpp_long_double_bits 64

+

+#endif

--- libstdc++33-v3/config/cpu/cris/cpu_limits.h.jj	2004-10-14 12:28:01.000000000 -0400

+++ libstdc++33-v3/config/cpu/cris/cpu_limits.h	2004-10-14 12:28:01.000000000 -0400

@@ -0,0 +1,33 @@

+// 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.

+

+#ifndef _GLIBCPP_CPU_LIMITS

+#define _GLIBCPP_CPU_LIMITS 1

+

+#define __glibcpp_long_double_bits 64

+

+#endif

--- libstdc++33-v3/config/cpu/powerpc/cpu_limits.h.jj	2004-10-14 12:28:01.000000000 -0400

+++ libstdc++33-v3/config/cpu/powerpc/cpu_limits.h	2004-10-14 12:28:01.000000000 -0400

@@ -0,0 +1,42 @@

+// 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.

+

+#ifndef _GLIBCPP_CPU_LIMITS

+#define _GLIBCPP_CPU_LIMITS 1

+

+#ifdef __powerpc64__

+#define __glibcpp_long_bits 64

+#endif

+

+#ifndef __LONG_DOUBLE_128__

+#define __glibcpp_long_double_bits 64

+#endif

+

+#endif

+

+

+

--- libstdc++33-v3/config/cpu/i386/cpu_limits.h.jj	2004-10-14 12:28:01.000000000 -0400

+++ libstdc++33-v3/config/cpu/i386/cpu_limits.h	2004-10-14 12:28:01.000000000 -0400

@@ -0,0 +1,33 @@

+// 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.

+

+#ifndef _GLIBCPP_CPU_LIMITS

+#define _GLIBCPP_CPU_LIMITS 1

+

+#define __glibcpp_long_double_bits 80

+

+#endif

--- libstdc++33-v3/config/cpu/m68k/cpu_limits.h.jj	2004-10-14 12:28:01.000000000 -0400

+++ libstdc++33-v3/config/cpu/m68k/cpu_limits.h	2004-10-14 12:28:01.000000000 -0400

@@ -0,0 +1,35 @@

+// 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.

+

+#ifndef _GLIBCPP_CPU_LIMITS

+#define _GLIBCPP_CPU_LIMITS 1

+

+#define __glibcpp_long_double_bits 96

+

+#endif

+

+

--- libstdc++33-v3/config/cpu/ia64/cpu_limits.h.jj	2004-10-14 12:28:01.000000000 -0400

+++ libstdc++33-v3/config/cpu/ia64/cpu_limits.h	2004-10-14 12:28:01.000000000 -0400

@@ -0,0 +1,36 @@

+// 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.

+

+#ifndef _GLIBCPP_CPU_LIMITS

+#define _GLIBCPP_CPU_LIMITS 1

+

+#define __glibcpp_long_bits 64

+

+// While sizeof(long double) == 16, the format is the same as the x86.

+#define __glibcpp_long_double_bits 80

+

+#endif

--- libstdc++33-v3/config/cpu/generic/cpu_limits.h.jj	2004-10-14 12:28:01.000000000 -0400

+++ libstdc++33-v3/config/cpu/generic/cpu_limits.h	2004-10-14 12:28:01.000000000 -0400

@@ -0,0 +1,41 @@

+// 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.

+

+#ifndef _GLIBCPP_CPU_LIMITS

+#define _GLIBCPP_CPU_LIMITS 1

+

+// Nothing is defined in the generic file.  In that way, we fall back

+// on the defaults in std_limits.h.

+

+// If you need to override these defaults, you can either use a

+// CPU-specific version (in which case you must modify

+// configure.target) or you must add the overrides to your

+// os_defines.h.  In general, if all systems for your CPU use the

+// same values, it is best to use a cpu-specific configuration file.

+

+#endif

+

--- libstdc++33-v3/config/cpu/generic/limits.h.jj	2004-10-14 12:28:01.000000000 -0400

+++ libstdc++33-v3/config/cpu/generic/limits.h	2004-10-14 12:28:01.000000000 -0400

@@ -0,0 +1,40 @@

+// 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.

+

+#ifndef _GLIBCPP_CPU_LIMITS

+#define _GLIBCPP_CPU_LIMITS 1

+

+// Nothing is defined in the generic file.  In that way, we fall back

+// on the defaults in std_limits.h.

+

+// If you need to override these defaults, you can either use a

+// CPU-specific version (in which case you must modify

+// configure.target) or you must add the overrides to your

+// os_defines.h.  In general, if all systems for your CPU use the

+// same values, it is best to use a cpu-specific configuration file.

+

+#endif

--- libstdc++33-v3/config/cpu/x86-64/cpu_limits.h.jj	2004-10-14 12:53:35.000000000 -0400

+++ libstdc++33-v3/config/cpu/x86-64/cpu_limits.h	2004-10-14 12:53:42.000000000 -0400

@@ -0,0 +1,37 @@

+// 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.

+

+#ifndef _GLIBCPP_CPU_LIMITS

+#define _GLIBCPP_CPU_LIMITS 1

+

+#ifdef __x86_64__

+#define __glibcpp_long_bits 64

+#endif

+

+#define __glibcpp_long_double_bits 80

+

+#endif

--- libstdc++33-v3/libio/Makefile.in.jj	2003-03-17 14:07:38.000000000 -0500

+++ libstdc++33-v3/libio/Makefile.in	2004-10-14 12:28:01.000000000 -0400

@@ -83,6 +83,7 @@ CMESSAGES_H = @CMESSAGES_H@

 CMONEY_CC = @CMONEY_CC@

 CNUMERIC_CC = @CNUMERIC_CC@

 CPP = @CPP@

+CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@

 CSTDIO_H = @CSTDIO_H@

 CTIME_CC = @CTIME_CC@

 CTIME_H = @CTIME_H@

--- libstdc++33-v3/include/std/std_limits.h.jj	2002-12-19 06:44:30.000000000 -0500

+++ libstdc++33-v3/include/std/std_limits.h	2004-10-14 12:51:05.000000000 -0400

@@ -45,6 +45,1898 @@

 #pragma GCC system_header

+#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ <= 2)

+

+#include <bits/cpu_limits.h>

+#include <bits/c++config.h>

+

+//

+// The numeric_limits<> traits document implementation-defined aspects

+// of fundamental arithmetic data types (integers and floating points).

+// From Standard C++ point of view, there are 13 such types:

+//   * integers

+//         bool						        (1)

+//         char, signed char, unsigned char			(3)

+//         short, unsigned short				(2)

+//         int, unsigned					(2)

+//         long, unsigned long					(2)

+//

+//   * floating points

+//         float						(1)

+//         double						(1)

+//         long double						(1)

+//

+// GNU C++ undertstands (where supported by the host C-library) 

+//   * integer

+//         long long, unsigned long long			(2)

+//

+// which brings us to 15 fundamental arithmetic data types in GNU C++.

+//

+// 

+// Since a numeric_limits<> is a bit tricky to get right, we rely on

+// an interface composed of macros which should be defined in config/os

+// or config/cpu when they differ from the generic (read arbitrary)

+// definitions given here.

+//

+

+// These values can be overridden in the target configuration file.

+// The default values are appropriate for many 32-bit targets.

+

+#ifndef __glibcpp_char_bits

+#define __glibcpp_char_bits 8

+#endif

+#ifdef __CHAR_UNSIGNED__

+#define __glibcpp_plain_char_is_signed false

+#else

+#define __glibcpp_plain_char_is_signed true

+#endif

+#ifndef __glibcpp_short_bits

+#define __glibcpp_short_bits 16

+#endif

+#ifndef __glibcpp_int_bits

+#define __glibcpp_int_bits 32

+#endif

+#ifndef __glibcpp_long_bits

+#define __glibcpp_long_bits 32

+#endif

+#ifndef __glibcpp_wchar_t_bits

+#define __glibcpp_wchar_t_bits 32