2001-10-22 Benjamin Kosnik <bkoz@redhat.com>

	* config/cpu/i386/bits/limits.h: Move to...
	* config/cpu/i386/bits/cpu_limits.h: ...here.
	* config/cpu/cris/bits/cpu_limits.h: Same.
	* config/cpu/powerpc/bits/cpu_limits.h: Same.
	* config/cpu/x86-64/bits/cpu_limits.h: Same.
	* config/cpu/alpha/bits/cpu_limits.h: New.
	* config/cpu/m68k/bits/cpu_limits.h: New.
	* config/cpu/s390/bits/cpu_limits.h: New.
	* config/os/aix/bits/os_defines.h: Tweaks.
	* config/os/bsd/freebsd/bits/os_defines.h: Same.
	* config/os/bsd/netbsd/bits/os_defines.h: Same.
	* config/os/djgpp/bits/os_defines.h: Same.
	* config/os/generic/bits/os_defines.h: Same.
	* config/os/gnu-linux/bits/os_defines.h: Same.
	* config/os/hpux/bits/os_defines.h: Same.
	* config/os/irix/irix5.2/bits/os_defines.h: Same.
	* config/os/irix/irix6.5/bits/os_defines.h: Same.
	* config/os/newlib/bits/os_defines.h: Same.
	* config/os/solaris/solaris2.5/bits/os_defines.h: Same.
	* config/os/solaris/solaris2.6/bits/os_defines.h: Same.
	* config/os/solaris/solaris2.7/bits/os_defines.h: Same.

	* include/bits/c++config: Remove include.
	* include/bits/limits_generic.h: Remove.
	* include/bits/std_limits.h: Include cpu_limits.h.
	* include/Makefile.am: Fixup.
	* src/limits.cc: Tweak.
	* src/limits_generic.cc: Remove.
	* src/gen-num-limits.cc: Remove.
	* mknumeric_limits: Remove.


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

21 files changed, 225 insertions, 113 deletions

diff --git a/libstdc++-v3/config/cpu/powerpc/bits/limits.h b/libstdc++-v3/config/cpu/alpha/bits/cpu_limits.h
index f0ff04dedaa..21d31e3631a 100644
--- a/libstdc++-v3/config/cpu/powerpc/bits/limits.h
+++ b/libstdc++-v3/config/cpu/alpha/bits/cpu_limits.h
@@ -28,6 +28,11 @@
 #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/cris/bits/limits.h b/libstdc++-v3/config/cpu/cris/bits/cpu_limits.h
index f0ff04dedaa..f0ff04dedaa 100644
--- a/libstdc++-v3/config/cpu/cris/bits/limits.h
+++ b/libstdc++-v3/config/cpu/cris/bits/cpu_limits.h
diff --git a/libstdc++-v3/config/cpu/generic/bits/cpu_limits.h b/libstdc++-v3/config/cpu/generic/bits/cpu_limits.h
new file mode 100644
index 00000000000..0438f7c6e9f
--- /dev/null
+++ b/libstdc++-v3/config/cpu/generic/bits/cpu_limits.h
@@ -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
+
diff --git a/libstdc++-v3/config/cpu/i386/bits/limits.h b/libstdc++-v3/config/cpu/i386/bits/cpu_limits.h
index 31b6eab5d22..be304e2d805 100644
--- a/libstdc++-v3/config/cpu/i386/bits/limits.h
+++ b/libstdc++-v3/config/cpu/i386/bits/cpu_limits.h
@@ -28,9 +28,6 @@
 #ifndef _GLIBCPP_CPU_LIMITS
 #define _GLIBCPP_CPU_LIMITS 1
 
-// Some operating systems set this
-#ifndef __glibcpp_long_double_bits
 #define __glibcpp_long_double_bits 80
-#endif
 
 #endif
diff --git a/libstdc++-v3/config/cpu/m68k/bits/cpu_limits.h b/libstdc++-v3/config/cpu/m68k/bits/cpu_limits.h
new file mode 100644
index 00000000000..07e4e03a12b
--- /dev/null
+++ b/libstdc++-v3/config/cpu/m68k/bits/cpu_limits.h
@@ -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
+
+
diff --git a/libstdc++-v3/config/cpu/powerpc/bits/cpu_limits.h b/libstdc++-v3/config/cpu/powerpc/bits/cpu_limits.h
new file mode 100644
index 00000000000..87d7883bb02
--- /dev/null
+++ b/libstdc++-v3/config/cpu/powerpc/bits/cpu_limits.h
@@ -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
+
+#ifndef __LONG_DOUBLE_128__
+#define __glibcpp_long_double_bits 64
+#endif
+
+#endif
+
+
+
diff --git a/libstdc++-v3/config/cpu/s390/bits/cpu_limits.h b/libstdc++-v3/config/cpu/s390/bits/cpu_limits.h
new file mode 100644
index 00000000000..21d31e3631a
--- /dev/null
+++ b/libstdc++-v3/config/cpu/s390/bits/cpu_limits.h
@@ -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
+
+
+
diff --git a/libstdc++-v3/config/cpu/x86-64/bits/limits.h b/libstdc++-v3/config/cpu/x86-64/bits/cpu_limits.h
index 31b6eab5d22..be304e2d805 100644
--- a/libstdc++-v3/config/cpu/x86-64/bits/limits.h
+++ b/libstdc++-v3/config/cpu/x86-64/bits/cpu_limits.h
@@ -28,9 +28,6 @@
 #ifndef _GLIBCPP_CPU_LIMITS
 #define _GLIBCPP_CPU_LIMITS 1
 
-// Some operating systems set this
-#ifndef __glibcpp_long_double_bits
 #define __glibcpp_long_double_bits 80
-#endif
 
 #endif
diff --git a/libstdc++-v3/config/os/aix/bits/os_defines.h b/libstdc++-v3/config/os/aix/bits/os_defines.h
index 101a0b26f86..188ced19af3 100644
--- a/libstdc++-v3/config/os/aix/bits/os_defines.h
+++ b/libstdc++-v3/config/os/aix/bits/os_defines.h
@@ -30,20 +30,20 @@
 #ifndef _GLIBCPP_OS_DEFINES
 #define _GLIBCPP_OS_DEFINES
 
-/* System-specific #define, typedefs, corrections, etc, go here.  This
-   file will come before all others. */
+// System-specific #define, typedefs, corrections, etc, go here.  This
+// file will come before all others.
 
 #undef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 500
 #undef _XOPEN_SOURCE_EXTENDED
 #define _XOPEN_SOURCE_EXTENDED 1
 
-/* off64_t */
+// off64_t
 #ifndef _LARGE_FILE_API
 #define _LARGE_FILE_API
 #endif
 
-/* atomic types */
+// atomic types
 #ifndef _ALL_SOURCE
 #define _ALL_SOURCE
 #endif
@@ -55,10 +55,9 @@
 #undef _G_USING_THUNKS
 #define _G_USING_THUNKS 0
 
-#define __glibcpp_long_double_bits 64
-
 #if !defined(_AIX51) || !defined(__64BIT__)
 #define __glibcpp_wchar_t_bits 16
+#define __glibcpp_wchar_t_is_signed false
 #endif
 
 #ifdef __64BIT__
diff --git a/libstdc++-v3/config/os/bsd/freebsd/bits/os_defines.h b/libstdc++-v3/config/os/bsd/freebsd/bits/os_defines.h
index 3c31f3a1051..9e6bbaf453d 100644
--- a/libstdc++-v3/config/os/bsd/freebsd/bits/os_defines.h
+++ b/libstdc++-v3/config/os/bsd/freebsd/bits/os_defines.h
@@ -29,16 +29,13 @@
 
 
 #ifndef _GLIBCPP_OS_DEFINES
-#  define _GLIBCPP_OS_DEFINES
+#define _GLIBCPP_OS_DEFINES 1
 
-
-/* System-specific #define, typedefs, corrections, etc, go here.  This
-   file will come before all others. */
+// System-specific #define, typedefs, corrections, etc, go here.  This
+// file will come before all others.
 
 #define __glibcpp_long_double_bits __glibcpp_double_bits
 
 #define _GLIBCPP_AVOID_FSEEK 1
 
 #endif
-
-
diff --git a/libstdc++-v3/config/os/bsd/netbsd/bits/os_defines.h b/libstdc++-v3/config/os/bsd/netbsd/bits/os_defines.h
index 6115e97714b..03f760fdcad 100644
--- a/libstdc++-v3/config/os/bsd/netbsd/bits/os_defines.h
+++ b/libstdc++-v3/config/os/bsd/netbsd/bits/os_defines.h
@@ -27,21 +27,12 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-
 #ifndef _GLIBCPP_OS_DEFINES
-#  define _GLIBCPP_OS_DEFINES
-
-
-/* Settings for NetBSD.  */
+#define _GLIBCPP_OS_DEFINES 1
 
-/* __off_t is a typedef declared in stdio.h.  */
-/* #define __off_t off_t */
-
-/* We don't have off64_t */
-/* #define __off64_t off64_t */
+// System-specific #define, typedefs, corrections, etc, go here.  This
+// file will come before all others.
 
 #define __ssize_t ssize_t
 
 #endif
-
-
diff --git a/libstdc++-v3/config/os/djgpp/bits/os_defines.h b/libstdc++-v3/config/os/djgpp/bits/os_defines.h
index f979b1eb60d..ce0bf243b0e 100644
--- a/libstdc++-v3/config/os/djgpp/bits/os_defines.h
+++ b/libstdc++-v3/config/os/djgpp/bits/os_defines.h
@@ -29,11 +29,10 @@
 
 
 #ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES
+#define _GLIBCPP_OS_DEFINES 1
 
-
-/* System-specific #define, typedefs, corrections, etc, go here.  This
-   file will come before all others. */
+// System-specific #define, typedefs, corrections, etc, go here.  This
+// file will come before all others.
 
 #define __off_t off_t
 #define __off64_t off64_t
@@ -42,3 +41,5 @@
 // FIXME: should there be '#undef POSIX_SOURCE'?
 
 #endif
+
+
diff --git a/libstdc++-v3/config/os/generic/bits/os_defines.h b/libstdc++-v3/config/os/generic/bits/os_defines.h
index b3984f39a1c..143c07e6803 100644
--- a/libstdc++-v3/config/os/generic/bits/os_defines.h
+++ b/libstdc++-v3/config/os/generic/bits/os_defines.h
@@ -29,13 +29,9 @@
 
 
 #ifndef _GLIBCPP_OS_DEFINES
-#  define _GLIBCPP_OS_DEFINES
+#define _GLIBCPP_OS_DEFINES 1
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
 
-#ifdef __alpha__
-#define __glibcpp_long_bits 64
-#endif
-
 #endif
diff --git a/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h b/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h
index 2b4375e81eb..f5612ed060b 100644
--- a/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h
+++ b/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h
@@ -27,10 +27,12 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-
 #ifndef _GLIBCPP_OS_DEFINES
 #define _GLIBCPP_OS_DEFINES 1
 
+// System-specific #define, typedefs, corrections, etc, go here.  This
+// file will come before all others.
+
 // This keeps isanum, et al from being propagated as macros.
 #define __NO_CTYPE 1
 
@@ -63,21 +65,12 @@ typedef __loff_t __off64_t;
 #  define __NO_STRING_INLINES
 # endif
 
-#if defined (__powerpc__) || defined (__s390__)
-#define __glibcpp_wchar_t_is_signed true
-#endif
-
-#if defined (__alpha__) || defined (__powerpc64__) || (defined (__sparc__) && defined(__arch64__)) || defined (__s390x__)
+#if defined(__sparc__) && defined(__arch64__)
 #define __glibcpp_long_bits 64
 #endif
 
-#if defined (__alpha__) || (defined (__powerpc__) && !defined (__LONG_DOUBLE_128__)) || defined (__s390__)
-#define __glibcpp_long_double_bits 64
-#endif
-
-#if defined (__mc68000__)
-#define __glibcpp_long_double_bits 96
+#ifdef __powerpc64__
+#define __glibcpp_long_bits 64
 #endif
 
 #endif
-
diff --git a/libstdc++-v3/config/os/hpux/bits/os_defines.h b/libstdc++-v3/config/os/hpux/bits/os_defines.h
index 45f000f96b5..d7045d0a16e 100644
--- a/libstdc++-v3/config/os/hpux/bits/os_defines.h
+++ b/libstdc++-v3/config/os/hpux/bits/os_defines.h
@@ -27,13 +27,11 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-
 #ifndef _GLIBCPP_OS_DEFINES
-#  define _GLIBCPP_OS_DEFINES
-
+#define _GLIBCPP_OS_DEFINES
 
-/* System-specific #define, typedefs, corrections, etc, go here.  This
-   file will come before all others. */
+// System-specific #define, typedefs, corrections, etc, go here.  This
+// file will come before all others.
 
 #define __off_t off_t
 #define __off64_t off64_t
@@ -46,4 +44,3 @@
 #endif
 
 #endif
-
diff --git a/libstdc++-v3/config/os/irix/irix5.2/bits/os_defines.h b/libstdc++-v3/config/os/irix/irix5.2/bits/os_defines.h
index b4e2a1f3637..50db680b08f 100644
--- a/libstdc++-v3/config/os/irix/irix5.2/bits/os_defines.h
+++ b/libstdc++-v3/config/os/irix/irix5.2/bits/os_defines.h
@@ -27,32 +27,28 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-
 #ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES
-
-/* System-specific #define, typedefs, corrections, etc, go here.  This
-   file will come before all others. */
-
-/* We need large file support.  There are two ways to turn it on:
-   by defining either _LARGEFILE64_SOURCE or _SGI_SOURCE.  However,
-   it does not actually work to define only the former, as then
-   <sys/stat.h> is invalid: `st_blocks' is defined to be a macro,
-   but then used as a field name.  So, we have to turn on 
-   _SGI_SOURCE.  That only works if _POSIX_SOURCE is turned off,
-   so we have to explicitly turn it off.  (Some of the libio C files
-   explicitly try to turn it on.)  _SGI_SOURCE is actually turned on 
-   implicitly via the command-line.  */
+#define _GLIBCPP_OS_DEFINES 1
+
+// System-specific #define, typedefs, corrections, etc, go here.  This
+// file will come before all others.
+
+// We need large file support.  There are two ways to turn it on: by
+// defining either _LARGEFILE64_SOURCE or _SGI_SOURCE.  However, it
+// does not actually work to define only the former, as then
+// <sys/stat.h> is invalid: `st_blocks' is defined to be a macro, but
+// then used as a field name.  So, we have to turn on _SGI_SOURCE.
+// That only works if _POSIX_SOURCE is turned off, so we have to
+// explicitly turn it off.  (Some of the libio C files explicitly try
+// to turn it on.)  _SGI_SOURCE is actually turned on implicitly via
+// the command-line.
 #undef _POSIX_SOURCE
 
 #define __off_t off_t
 #define __off64_t off64_t
 #define __ssize_t ssize_t
 
-/* GCC does not use thunks on IRIX.  */
+// GCC does not use thunks on IRIX.
 #define _G_USING_THUNKS 0
 
 #endif
-
-
-
diff --git a/libstdc++-v3/config/os/irix/irix6.5/bits/os_defines.h b/libstdc++-v3/config/os/irix/irix6.5/bits/os_defines.h
index e5fa694a643..e8f1dcc82d2 100644
--- a/libstdc++-v3/config/os/irix/irix6.5/bits/os_defines.h
+++ b/libstdc++-v3/config/os/irix/irix6.5/bits/os_defines.h
@@ -27,29 +27,28 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-
 #ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES
-
-/* System-specific #define, typedefs, corrections, etc, go here.  This
-   file will come before all others. */
-
-/* We need large file support.  There are two ways to turn it on:
-   by defining either _LARGEFILE64_SOURCE or _SGI_SOURCE.  However,
-   it does not actually work to define only the former, as then
-   <sys/stat.h> is invalid: `st_blocks' is defined to be a macro,
-   but then used as a field name.  So, we have to turn on 
-   _SGI_SOURCE.  That only works if _POSIX_SOURCE is turned off,
-   so we have to explicitly turn it off.  (Some of the libio C files
-   explicitly try to turn it on.)  _SGI_SOURCE is actually turned on 
-   implicitly via the command-line.  */
+#define _GLIBCPP_OS_DEFINES 1
+
+// System-specific #define, typedefs, corrections, etc, go here.  This
+// file will come before all others.
+
+// We need large file support.  There are two ways to turn it on: by
+// defining either _LARGEFILE64_SOURCE or _SGI_SOURCE.  However, it
+// does not actually work to define only the former, as then
+// <sys/stat.h> is invalid: `st_blocks' is defined to be a macro, but
+// then used as a field name.  So, we have to turn on _SGI_SOURCE.
+// That only works if _POSIX_SOURCE is turned off, so we have to
+// explicitly turn it off.  (Some of the libio C files explicitly try
+// to turn it on.)  _SGI_SOURCE is actually turned on implicitly via
+// the command-line.
 #undef _POSIX_SOURCE
 
 #define __off_t off_t
 #define __off64_t off64_t
 #define __ssize_t ssize_t
 
-/* GCC does not use thunks on IRIX.  */
+// GCC does not use thunks on IRIX. 
 #define _G_USING_THUNKS 0
 
 #define __glibcpp_long_double_bits 64
diff --git a/libstdc++-v3/config/os/newlib/bits/os_defines.h b/libstdc++-v3/config/os/newlib/bits/os_defines.h
index ba40cee3975..12776611b88 100644
--- a/libstdc++-v3/config/os/newlib/bits/os_defines.h
+++ b/libstdc++-v3/config/os/newlib/bits/os_defines.h
@@ -27,15 +27,10 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-
 #ifndef _GLIBCPP_OS_DEFINES
-#  define _GLIBCPP_OS_DEFINES
-
-
-/* System-specific #define, typedefs, corrections, etc, go here.  This
-   file will come before all others. */
+#define _GLIBCPP_OS_DEFINES 1
 
+// System-specific #define, typedefs, corrections, etc, go here.  This
+// file will come before all others.
 
 #endif
-
-
diff --git a/libstdc++-v3/config/os/solaris/solaris2.5/bits/os_defines.h b/libstdc++-v3/config/os/solaris/solaris2.5/bits/os_defines.h
index 5a756b4210d..0edc784c9e1 100644
--- a/libstdc++-v3/config/os/solaris/solaris2.5/bits/os_defines.h
+++ b/libstdc++-v3/config/os/solaris/solaris2.5/bits/os_defines.h
@@ -27,12 +27,11 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-
 #ifndef _GLIBCPP_OS_DEFINES
-#  define _GLIBCPP_OS_DEFINES
+#define _GLIBCPP_OS_DEFINES 1
 
-/* System-specific #define, typedefs, corrections, etc, go here.  This
-   file will come before all others. */
+// System-specific #define, typedefs, corrections, etc, go here.  This
+// file will come before all others.
 
 #define _GLIBCPP_AVOID_FSEEK 1
 
diff --git a/libstdc++-v3/config/os/solaris/solaris2.6/bits/os_defines.h b/libstdc++-v3/config/os/solaris/solaris2.6/bits/os_defines.h
index 961e29d55d0..3acdf5c002a 100644
--- a/libstdc++-v3/config/os/solaris/solaris2.6/bits/os_defines.h
+++ b/libstdc++-v3/config/os/solaris/solaris2.6/bits/os_defines.h
@@ -27,12 +27,11 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-
 #ifndef _GLIBCPP_OS_DEFINES
-#  define _GLIBCPP_OS_DEFINES
+#define _GLIBCPP_OS_DEFINES 1
 
-/* System-specific #define, typedefs, corrections, etc, go here.  This
-   file will come before all others. */
+// System-specific #define, typedefs, corrections, etc, go here.  This
+// file will come before all others.
 
 #define _GLIBCPP_AVOID_FSEEK 1
 
diff --git a/libstdc++-v3/config/os/solaris/solaris2.7/bits/os_defines.h b/libstdc++-v3/config/os/solaris/solaris2.7/bits/os_defines.h
index 67dae7a7770..a0fd24309ff 100644
--- a/libstdc++-v3/config/os/solaris/solaris2.7/bits/os_defines.h
+++ b/libstdc++-v3/config/os/solaris/solaris2.7/bits/os_defines.h
@@ -27,12 +27,11 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-
 #ifndef _GLIBCPP_OS_DEFINES
-#  define _GLIBCPP_OS_DEFINES
+#define _GLIBCPP_OS_DEFINES 1
 
-/* System-specific #define, typedefs, corrections, etc, go here.  This
-   file will come before all others. */
+// System-specific #define, typedefs, corrections, etc, go here.  This
+// file will come before all others.
 
 #define _GLIBCPP_AVOID_FSEEK 1