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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@57524 138bc75d-0d04-0410-961f-82ee72b054a4

20 files changed, 4 insertions, 510 deletions

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 21d31e3631a..00000000000
--- 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 d5d9fe72610..00000000000
--- 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 f0ff04dedaa..00000000000
--- 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 0438f7c6e9f..00000000000
--- 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 8fa5a82145f..00000000000
--- 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 be304e2d805..00000000000
--- 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 735f7d5bb21..00000000000
--- 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 07e4e03a12b..00000000000
--- 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 e40ce97413a..00000000000
--- 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 42cffa91441..00000000000
--- 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 f0ff04dedaa..00000000000
--- 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 7de187e2080..00000000000
--- 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 6a658a1a53f..6e4dbda3256 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 cfc917f5873..b898c1ce252 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 4405660f0e4..21ea29693a6 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 0b28bb215d4..5deef5f9edb 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 32055ec6d67..1d7f96848ee 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 e8f1dcc82d2..838b747e2ab 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 d74b15c9a9a..00000000000
--- 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 2f21fd4e89a..cf53fa46908 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