Makefile.am (target_headers): Remove cpu_limits.h.

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.

	* include/std/std_limits.h: Remove cpu_limits.h include.

	* 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.

From-SVN: r57524

34 files changed, 57 insertions, 552 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fd08840..da24162 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,43 @@
+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.
+
+	* include/std/std_limits.h: Remove cpu_limits.h include.
+
+	* 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.
+	
 2002-09-25  Peter Schmid  <schmid@snake.iap.physik.tu-darmstadt.de>
 
 	* testsuite/18_support/numeric_limits.cc: Check the maximum and
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index 90b80b5..6d83bd1 100644
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -74,7 +74,6 @@ CCODECVT_H = @CCODECVT_H@
 CLOCALE_H = @CLOCALE_H@
 CMESSAGES_H = @CMESSAGES_H@
 CPP = @CPP@
-CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@
 CSTDIO_H = @CSTDIO_H@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
diff --git a/libstdc++-v3/config/cpu/alpha/cpu_limits.h b/libstdc++-v3/config/cpu/alpha/cpu_limits.h
deleted file mode 100644
index 21d31e3..0000000
--- a/libstdc++-v3/config/cpu/alpha/cpu_limits.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// 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
-
-
-
diff --git a/libstdc++-v3/config/cpu/arm/cpu_limits.h b/libstdc++-v3/config/cpu/arm/cpu_limits.h
deleted file mode 100644
index d5d9fe7..0000000
--- a/libstdc++-v3/config/cpu/arm/cpu_limits.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (C) 2002 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
diff --git a/libstdc++-v3/config/cpu/cris/cpu_limits.h b/libstdc++-v3/config/cpu/cris/cpu_limits.h
deleted file mode 100644
index f0ff04d..0000000
--- a/libstdc++-v3/config/cpu/cris/cpu_limits.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// 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
diff --git a/libstdc++-v3/config/cpu/generic/cpu_limits.h b/libstdc++-v3/config/cpu/generic/cpu_limits.h
deleted file mode 100644
index 0438f7c..0000000
--- a/libstdc++-v3/config/cpu/generic/cpu_limits.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// 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
-
diff --git a/libstdc++-v3/config/cpu/generic/limits.h b/libstdc++-v3/config/cpu/generic/limits.h
deleted file mode 100644
index 8fa5a82..0000000
--- a/libstdc++-v3/config/cpu/generic/limits.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// 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
diff --git a/libstdc++-v3/config/cpu/i386/cpu_limits.h b/libstdc++-v3/config/cpu/i386/cpu_limits.h
deleted file mode 100644
index be304e2..0000000
--- a/libstdc++-v3/config/cpu/i386/cpu_limits.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// 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
diff --git a/libstdc++-v3/config/cpu/ia64/cpu_limits.h b/libstdc++-v3/config/cpu/ia64/cpu_limits.h
deleted file mode 100644
index 735f7d5..0000000
--- a/libstdc++-v3/config/cpu/ia64/cpu_limits.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// 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
diff --git a/libstdc++-v3/config/cpu/m68k/cpu_limits.h b/libstdc++-v3/config/cpu/m68k/cpu_limits.h
deleted file mode 100644
index 07e4e03..0000000
--- a/libstdc++-v3/config/cpu/m68k/cpu_limits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// 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
-
-
diff --git a/libstdc++-v3/config/cpu/mmix/cpu_limits.h b/libstdc++-v3/config/cpu/mmix/cpu_limits.h
deleted file mode 100644
index e40ce97..0000000
--- a/libstdc++-v3/config/cpu/mmix/cpu_limits.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (C) 2002 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
diff --git a/libstdc++-v3/config/cpu/powerpc/cpu_limits.h b/libstdc++-v3/config/cpu/powerpc/cpu_limits.h
deleted file mode 100644
index 42cffa9..0000000
--- a/libstdc++-v3/config/cpu/powerpc/cpu_limits.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// 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
-
-
-
diff --git a/libstdc++-v3/config/cpu/s390/cpu_limits.h b/libstdc++-v3/config/cpu/s390/cpu_limits.h
deleted file mode 100644
index f0ff04d..0000000
--- a/libstdc++-v3/config/cpu/s390/cpu_limits.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// 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
diff --git a/libstdc++-v3/config/cpu/x86-64/cpu_limits.h b/libstdc++-v3/config/cpu/x86-64/cpu_limits.h
deleted file mode 100644
index 7de187e..0000000
--- a/libstdc++-v3/config/cpu/x86-64/cpu_limits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// 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 80
-
-#endif
diff --git a/libstdc++-v3/config/os/aix/os_defines.h b/libstdc++-v3/config/os/aix/os_defines.h
index 6a658a1..6e4dbda 100644
--- a/libstdc++-v3/config/os/aix/os_defines.h
+++ b/libstdc++-v3/config/os/aix/os_defines.h
@@ -1,6 +1,6 @@
 // Specific definitions for AIX  -*- C++ -*-
 
-// Copyright (C) 2000 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2002 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
@@ -55,13 +55,4 @@
 #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
diff --git a/libstdc++-v3/config/os/bsd/freebsd/os_defines.h b/libstdc++-v3/config/os/bsd/freebsd/os_defines.h
index cfc917f..b898c1c 100644
--- a/libstdc++-v3/config/os/bsd/freebsd/os_defines.h
+++ b/libstdc++-v3/config/os/bsd/freebsd/os_defines.h
@@ -1,6 +1,6 @@
 // Specific definitions for BSD  -*- C++ -*-
 
-// Copyright (C) 2000 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2002 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
@@ -34,6 +34,4 @@
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
 
-#define __glibcpp_long_double_bits __glibcpp_double_bits
-
 #endif
diff --git a/libstdc++-v3/config/os/gnu-linux/os_defines.h b/libstdc++-v3/config/os/gnu-linux/os_defines.h
index 4405660..21ea296 100644
--- a/libstdc++-v3/config/os/gnu-linux/os_defines.h
+++ b/libstdc++-v3/config/os/gnu-linux/os_defines.h
@@ -1,6 +1,6 @@
 // Specific definitions for GNU/Linux  -*- C++ -*-
 
-// Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2001, 2002 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
@@ -65,12 +65,4 @@ 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
-
 #endif
diff --git a/libstdc++-v3/config/os/hpux/os_defines.h b/libstdc++-v3/config/os/hpux/os_defines.h
index 0b28bb2..5deef5f 100644
--- a/libstdc++-v3/config/os/hpux/os_defines.h
+++ b/libstdc++-v3/config/os/hpux/os_defines.h
@@ -37,8 +37,6 @@
 #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
 
diff --git a/libstdc++-v3/config/os/irix/irix5.2/os_defines.h b/libstdc++-v3/config/os/irix/irix5.2/os_defines.h
index 32055ec..1d7f968 100644
--- a/libstdc++-v3/config/os/irix/irix5.2/os_defines.h
+++ b/libstdc++-v3/config/os/irix/irix5.2/os_defines.h
@@ -51,11 +51,5 @@
 // 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
 
diff --git a/libstdc++-v3/config/os/irix/irix6.5/os_defines.h b/libstdc++-v3/config/os/irix/irix6.5/os_defines.h
index e8f1dcc..838b747 100644
--- a/libstdc++-v3/config/os/irix/irix6.5/os_defines.h
+++ b/libstdc++-v3/config/os/irix/irix6.5/os_defines.h
@@ -1,6 +1,6 @@
 // Specific definitions for IRIX  -*- C++ -*-
 
-// Copyright (C) 2000 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2002 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
@@ -51,12 +51,5 @@
 // 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
 
diff --git a/libstdc++-v3/config/os/osf/osf5.0/cpu_limits.h b/libstdc++-v3/config/os/osf/osf5.0/cpu_limits.h
deleted file mode 100644
index d74b15c9..0000000
--- a/libstdc++-v3/config/os/osf/osf5.0/cpu_limits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// 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 128
-
-#endif
diff --git a/libstdc++-v3/config/os/solaris/solaris2.7/os_defines.h b/libstdc++-v3/config/os/solaris/solaris2.7/os_defines.h
index 2f21fd4..cf53fa4 100644
--- a/libstdc++-v3/config/os/solaris/solaris2.7/os_defines.h
+++ b/libstdc++-v3/config/os/solaris/solaris2.7/os_defines.h
@@ -39,9 +39,5 @@
 #define __off64_t   off64_t
 #define __ssize_t   ssize_t
 
-#if defined(__sparcv9) || defined(__arch64__)
-#define __glibcpp_long_bits 64
-#endif
-
 #endif
 
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index d4942b7..fd0c325 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -22233,12 +22233,10 @@ echo "$ac_t""$enable_symvers" 1>&6
 
 
 # Propagate the target-specific source directories through the build chain.
-# (Nothing currently uses cpu_include_dir directly; only ATOMICITYH and
-# CPULIMITSH [might] use it, and they only get used here.)
+# (Nothing currently uses cpu_include_dir directly; only ATOMICITYH 
+# uses it, and they only get used here.)
 OS_INC_SRCDIR=config/${os_include_dir}
 ATOMICITY_INC_SRCDIR=config/${ATOMICITYH}
-CPU_LIMITS_INC_SRCDIR=config/${CPULIMITSH}
-
 
 
 
@@ -22317,7 +22315,7 @@ glibcpp_prefixdir=${prefix}
 
 # Process the option --with-gxx-include-dir=<path to include-files directory>
 echo $ac_n "checking for --with-gxx-include-dir""... $ac_c" 1>&6
-echo "configure:22321: checking for --with-gxx-include-dir" >&5
+echo "configure:22319: checking for --with-gxx-include-dir" >&5
 # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
 if test "${with_gxx_include_dir+set}" = set; then
   withval="$with_gxx_include_dir"
@@ -22341,7 +22339,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6
 
 # Process the option "--enable-version-specific-runtime-libs"
 echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6
-echo "configure:22345: checking for --enable-version-specific-runtime-libs" >&5
+echo "configure:22343: checking for --enable-version-specific-runtime-libs" >&5
 # Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given.
 if test "${enable_version_specific_runtime_libs+set}" = set; then
   enableval="$enable_version_specific_runtime_libs"
@@ -22387,7 +22385,7 @@ if test x"$glibcpp_toolexecdir" = x"no"; then
 fi
 
 echo $ac_n "checking for install location""... $ac_c" 1>&6
-echo "configure:22391: checking for install location" >&5
+echo "configure:22389: checking for install location" >&5
 echo "$ac_t""$gxx_include_dir" 1>&6
 
 
@@ -22673,7 +22671,6 @@ s%@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@%$GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE%g
 s%@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@%$GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE%g
 s%@OS_INC_SRCDIR@%$OS_INC_SRCDIR%g
 s%@ATOMICITY_INC_SRCDIR@%$ATOMICITY_INC_SRCDIR%g
-s%@CPU_LIMITS_INC_SRCDIR@%$CPU_LIMITS_INC_SRCDIR%g
 s%@GLIBCPP_IS_CROSS_COMPILING@%$GLIBCPP_IS_CROSS_COMPILING%g
 s%@CANADIAN_TRUE@%$CANADIAN_TRUE%g
 s%@CANADIAN_FALSE@%$CANADIAN_FALSE%g
diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in
index 0b6a26e..f73a4c1 100644
--- a/libstdc++-v3/configure.in
+++ b/libstdc++-v3/configure.in
@@ -354,14 +354,12 @@ fi
 GLIBCPP_ENABLE_SYMVERS([yes])
 
 # Propagate the target-specific source directories through the build chain.
-# (Nothing currently uses cpu_include_dir directly; only ATOMICITYH and
-# CPULIMITSH [might] use it, and they only get used here.)
+# (Nothing currently uses cpu_include_dir directly; only ATOMICITYH 
+# uses it, and they only get used here.)
 OS_INC_SRCDIR=config/${os_include_dir}
 ATOMICITY_INC_SRCDIR=config/${ATOMICITYH}
-CPU_LIMITS_INC_SRCDIR=config/${CPULIMITSH}
 AC_SUBST(OS_INC_SRCDIR)
 AC_SUBST(ATOMICITY_INC_SRCDIR)
-AC_SUBST(CPU_LIMITS_INC_SRCDIR)
 
 # Set up cross-compile flags
 AC_SUBST(GLIBCPP_IS_CROSS_COMPILING)  dnl Unused so far.
diff --git a/libstdc++-v3/configure.target b/libstdc++-v3/configure.target
index ceafe51..95b533c 100644
--- a/libstdc++-v3/configure.target
+++ b/libstdc++-v3/configure.target
@@ -19,10 +19,6 @@
 #   cpu_include_dir        CPU-specific directory, defaults to cpu/generic
 #                              if cpu/target_cpu doesn't exist.  This is
 #                              used to set the next two:
-#   ATOMICITYH             location of atomicity.h,
-#                              defaults to cpu_include_dir
-#   CPULIMITSH             location of cpu_limits.h,
-#                              defaults to cpu_include_dir
 #
 #   os_include_dir         OS-specific directory, defaults to os/generic.
 #
@@ -34,6 +30,9 @@
 #   abi_baseline_triplet   directory name for ABI compat testing,
 #                              defaults to target (as per config.guess)
 #
+#   ATOMICITYH             location of atomicity.h,
+#                              defaults to cpu_include_dir
+#
 # It possibly modifies the following variables:
 #
 #   OPT_LDFLAGS            extra flags to pass when linking the library, of
@@ -78,7 +77,6 @@ case "${target_cpu}" in
   i486 | i586 | i686 | i786)
     # add athlons here maybe
     cpu_include_dir="cpu/i486"
-    CPULIMITSH="cpu/i386"
     ;;
   m68k | m680[246]0)
     cpu_include_dir="cpu/m68k"
@@ -106,7 +104,7 @@ case "${target_cpu}" in
 esac
 
 
-# Now look for the two files usually tied to a CPU model, and make default
+# Now look for the file(s) usually tied to a CPU model, and make default
 # choices for those if they haven't been explicitly set already.
 _cpu_incdir_fullpath=${glibcpp_srcdir}/config/${cpu_include_dir}
 if test x${ATOMICITYH+set} != xset; then
@@ -116,13 +114,6 @@ if test x${ATOMICITYH+set} != xset; then
     ATOMICITYH="cpu/generic"
   fi
 fi
-if test x${CPULIMITSH+set} != xset; then
-  if test -f ${_cpu_incdir_fullpath}/cpu_limits.h; then
-    CPULIMITSH=$cpu_include_dir
-  else
-    CPULIMITSH="cpu/generic"
-  fi
-fi
 unset _cpu_incdir_fullpath
 
 
@@ -161,7 +152,6 @@ case "${target_os}" in
     ;;
   hpux*)
     os_include_dir="os/hpux"
-    CPULIMITSH="os/hpux"
     ;;
   irix[1-6] | irix[1-5].* | irix6.[0-4]*)
     # This is known to work on at least IRIX 5.2 and 6.3.
@@ -203,9 +193,6 @@ esac
 # Set any OS-dependent and CPU-dependent bits.
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 case "${target}" in
-  alpha*-*-*osf5*)
-    CPULIMITSH="os/osf/osf5.0"
-    ;;
   mips*-*-linux*)
     ATOMICITYH="cpu/mips"
     ;;
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 8c3af03..da7646a 100644
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -311,8 +311,7 @@ target_headers = \
 	${target_srcdir}/ctype_inline.h \
 	${target_srcdir}/ctype_noninline.h \
 	${target_srcdir}/os_defines.h \
-	${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
-	${glibcpp_srcdir}/@CPU_LIMITS_INC_SRCDIR@/cpu_limits.h 
+	${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h 
 # These target_headers_extra files are all built with ad hoc naming rules.
 target_headers_extra = \
 	${target_builddir}/basic_file.h \
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index eaff2c0..5441e97 100644
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -74,7 +74,6 @@ CCODECVT_H = @CCODECVT_H@
 CLOCALE_H = @CLOCALE_H@
 CMESSAGES_H = @CMESSAGES_H@
 CPP = @CPP@
-CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@
 CSTDIO_H = @CSTDIO_H@
 CXXCPP = @CXXCPP@
 C_INCLUDE_DIR = @C_INCLUDE_DIR@
@@ -414,8 +413,7 @@ target_headers = \
 	${target_srcdir}/ctype_inline.h \
 	${target_srcdir}/ctype_noninline.h \
 	${target_srcdir}/os_defines.h \
-	${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
-	${glibcpp_srcdir}/@CPU_LIMITS_INC_SRCDIR@/cpu_limits.h 
+	${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h 
 
 # These target_headers_extra files are all built with ad hoc naming rules.
 target_headers_extra = \
diff --git a/libstdc++-v3/include/std/std_limits.h b/libstdc++-v3/include/std/std_limits.h
index 8912296..f8df6ba 100644
--- a/libstdc++-v3/include/std/std_limits.h
+++ b/libstdc++-v3/include/std/std_limits.h
@@ -45,7 +45,6 @@
 
 #pragma GCC system_header
 
-#include <bits/cpu_limits.h>
 #include <bits/c++config.h>
 
 //
diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in
index a5384b8..08c71d9 100644
--- a/libstdc++-v3/libio/Makefile.in
+++ b/libstdc++-v3/libio/Makefile.in
@@ -74,7 +74,6 @@ CCODECVT_H = @CCODECVT_H@
 CLOCALE_H = @CLOCALE_H@
 CMESSAGES_H = @CMESSAGES_H@
 CPP = @CPP@
-CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@
 CSTDIO_H = @CSTDIO_H@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in
index 7640e68..09f2df1 100644
--- a/libstdc++-v3/libmath/Makefile.in
+++ b/libstdc++-v3/libmath/Makefile.in
@@ -74,7 +74,6 @@ CCODECVT_H = @CCODECVT_H@
 CLOCALE_H = @CLOCALE_H@
 CMESSAGES_H = @CMESSAGES_H@
 CPP = @CPP@
-CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@
 CSTDIO_H = @CSTDIO_H@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in
index 5d0e5d2..144b509 100644
--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -73,7 +73,6 @@ CCODECVT_H = @CCODECVT_H@
 CLOCALE_H = @CLOCALE_H@
 CMESSAGES_H = @CMESSAGES_H@
 CPP = @CPP@
-CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@
 CSTDIO_H = @CSTDIO_H@
 CXXCPP = @CXXCPP@
 C_INCLUDE_DIR = @C_INCLUDE_DIR@
diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
index 32259dc..7ebb032 100644
--- a/libstdc++-v3/po/Makefile.in
+++ b/libstdc++-v3/po/Makefile.in
@@ -74,7 +74,6 @@ CCODECVT_H = @CCODECVT_H@
 CLOCALE_H = @CLOCALE_H@
 CMESSAGES_H = @CMESSAGES_H@
 CPP = @CPP@
-CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@
 CSTDIO_H = @CSTDIO_H@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 0e55017..0974449 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -73,7 +73,6 @@ CCODECVT_H = @CCODECVT_H@
 CLOCALE_H = @CLOCALE_H@
 CMESSAGES_H = @CMESSAGES_H@
 CPP = @CPP@
-CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@
 CSTDIO_H = @CSTDIO_H@
 CXXCPP = @CXXCPP@
 C_INCLUDE_DIR = @C_INCLUDE_DIR@
diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index 1c48f8b..5f19c91 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -74,7 +74,6 @@ CCODECVT_H = @CCODECVT_H@
 CLOCALE_H = @CLOCALE_H@
 CMESSAGES_H = @CMESSAGES_H@
 CPP = @CPP@
-CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@
 CSTDIO_H = @CSTDIO_H@
 CXXCPP = @CXXCPP@
 C_INCLUDE_DIR = @C_INCLUDE_DIR@