Commit f295ecef by Benjamin Kosnik Committed by Benjamin Kosnik

limits.h: Move to...


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.

From-SVN: r46445
parent 91dc81f9
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.
2001-10-20 Brendan Kehoe <brendan@zen.org> 2001-10-20 Brendan Kehoe <brendan@zen.org>
* bits/type_traits.h (_Bool): Removed this type. * bits/type_traits.h (_Bool): Removed this type.
......
...@@ -76,6 +76,7 @@ CCODECVT_H = @CCODECVT_H@ ...@@ -76,6 +76,7 @@ CCODECVT_H = @CCODECVT_H@
CLOCALE_H = @CLOCALE_H@ CLOCALE_H = @CLOCALE_H@
CMESSAGES_H = @CMESSAGES_H@ CMESSAGES_H = @CMESSAGES_H@
CPP = @CPP@ CPP = @CPP@
CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@
CSHADOW_FLAGS = @CSHADOW_FLAGS@ CSHADOW_FLAGS = @CSHADOW_FLAGS@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CXX = @CXX@ CXX = @CXX@
...@@ -106,7 +107,6 @@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ ...@@ -106,7 +107,6 @@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIMITS_INC_SRCDIR = @LIMITS_INC_SRCDIR@
LN_S = @LN_S@ LN_S = @LN_S@
MAINT = @MAINT@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
......
// 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
// 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
...@@ -28,9 +28,6 @@ ...@@ -28,9 +28,6 @@
#ifndef _GLIBCPP_CPU_LIMITS #ifndef _GLIBCPP_CPU_LIMITS
#define _GLIBCPP_CPU_LIMITS 1 #define _GLIBCPP_CPU_LIMITS 1
// Some operating systems set this
#ifndef __glibcpp_long_double_bits
#define __glibcpp_long_double_bits 80 #define __glibcpp_long_double_bits 80
#endif
#endif #endif
// 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
// 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
...@@ -28,6 +28,11 @@ ...@@ -28,6 +28,11 @@
#ifndef _GLIBCPP_CPU_LIMITS #ifndef _GLIBCPP_CPU_LIMITS
#define _GLIBCPP_CPU_LIMITS 1 #define _GLIBCPP_CPU_LIMITS 1
#define __glibcpp_long_bits 64
#define __glibcpp_long_double_bits 64 #define __glibcpp_long_double_bits 64
#endif #endif
...@@ -28,9 +28,6 @@ ...@@ -28,9 +28,6 @@
#ifndef _GLIBCPP_CPU_LIMITS #ifndef _GLIBCPP_CPU_LIMITS
#define _GLIBCPP_CPU_LIMITS 1 #define _GLIBCPP_CPU_LIMITS 1
// Some operating systems set this
#ifndef __glibcpp_long_double_bits
#define __glibcpp_long_double_bits 80 #define __glibcpp_long_double_bits 80
#endif
#endif #endif
...@@ -30,20 +30,20 @@ ...@@ -30,20 +30,20 @@
#ifndef _GLIBCPP_OS_DEFINES #ifndef _GLIBCPP_OS_DEFINES
#define _GLIBCPP_OS_DEFINES #define _GLIBCPP_OS_DEFINES
/* System-specific #define, typedefs, corrections, etc, go here. This // System-specific #define, typedefs, corrections, etc, go here. This
file will come before all others. */ // file will come before all others.
#undef _XOPEN_SOURCE #undef _XOPEN_SOURCE
#define _XOPEN_SOURCE 500 #define _XOPEN_SOURCE 500
#undef _XOPEN_SOURCE_EXTENDED #undef _XOPEN_SOURCE_EXTENDED
#define _XOPEN_SOURCE_EXTENDED 1 #define _XOPEN_SOURCE_EXTENDED 1
/* off64_t */ // off64_t
#ifndef _LARGE_FILE_API #ifndef _LARGE_FILE_API
#define _LARGE_FILE_API #define _LARGE_FILE_API
#endif #endif
/* atomic types */ // atomic types
#ifndef _ALL_SOURCE #ifndef _ALL_SOURCE
#define _ALL_SOURCE #define _ALL_SOURCE
#endif #endif
...@@ -55,10 +55,9 @@ ...@@ -55,10 +55,9 @@
#undef _G_USING_THUNKS #undef _G_USING_THUNKS
#define _G_USING_THUNKS 0 #define _G_USING_THUNKS 0
#define __glibcpp_long_double_bits 64
#if !defined(_AIX51) || !defined(__64BIT__) #if !defined(_AIX51) || !defined(__64BIT__)
#define __glibcpp_wchar_t_bits 16 #define __glibcpp_wchar_t_bits 16
#define __glibcpp_wchar_t_is_signed false
#endif #endif
#ifdef __64BIT__ #ifdef __64BIT__
......
...@@ -29,16 +29,13 @@ ...@@ -29,16 +29,13 @@
#ifndef _GLIBCPP_OS_DEFINES #ifndef _GLIBCPP_OS_DEFINES
# define _GLIBCPP_OS_DEFINES #define _GLIBCPP_OS_DEFINES 1
// System-specific #define, typedefs, corrections, etc, go here. This
/* System-specific #define, typedefs, corrections, etc, go here. This // file will come before all others.
file will come before all others. */
#define __glibcpp_long_double_bits __glibcpp_double_bits #define __glibcpp_long_double_bits __glibcpp_double_bits
#define _GLIBCPP_AVOID_FSEEK 1 #define _GLIBCPP_AVOID_FSEEK 1
#endif #endif
...@@ -27,21 +27,12 @@ ...@@ -27,21 +27,12 @@
// invalidate any other reasons why the executable file might be covered by // invalidate any other reasons why the executable file might be covered by
// the GNU General Public License. // the GNU General Public License.
#ifndef _GLIBCPP_OS_DEFINES #ifndef _GLIBCPP_OS_DEFINES
# define _GLIBCPP_OS_DEFINES #define _GLIBCPP_OS_DEFINES 1
/* Settings for NetBSD. */
/* __off_t is a typedef declared in stdio.h. */ // System-specific #define, typedefs, corrections, etc, go here. This
/* #define __off_t off_t */ // file will come before all others.
/* We don't have off64_t */
/* #define __off64_t off64_t */
#define __ssize_t ssize_t #define __ssize_t ssize_t
#endif #endif
...@@ -29,11 +29,10 @@ ...@@ -29,11 +29,10 @@
#ifndef _GLIBCPP_OS_DEFINES #ifndef _GLIBCPP_OS_DEFINES
#define _GLIBCPP_OS_DEFINES #define _GLIBCPP_OS_DEFINES 1
// System-specific #define, typedefs, corrections, etc, go here. This
/* System-specific #define, typedefs, corrections, etc, go here. This // file will come before all others.
file will come before all others. */
#define __off_t off_t #define __off_t off_t
#define __off64_t off64_t #define __off64_t off64_t
...@@ -42,3 +41,5 @@ ...@@ -42,3 +41,5 @@
// FIXME: should there be '#undef POSIX_SOURCE'? // FIXME: should there be '#undef POSIX_SOURCE'?
#endif #endif
...@@ -29,13 +29,9 @@ ...@@ -29,13 +29,9 @@
#ifndef _GLIBCPP_OS_DEFINES #ifndef _GLIBCPP_OS_DEFINES
# define _GLIBCPP_OS_DEFINES #define _GLIBCPP_OS_DEFINES 1
// System-specific #define, typedefs, corrections, etc, go here. This // System-specific #define, typedefs, corrections, etc, go here. This
// file will come before all others. // file will come before all others.
#ifdef __alpha__
#define __glibcpp_long_bits 64
#endif
#endif #endif
...@@ -27,10 +27,12 @@ ...@@ -27,10 +27,12 @@
// invalidate any other reasons why the executable file might be covered by // invalidate any other reasons why the executable file might be covered by
// the GNU General Public License. // the GNU General Public License.
#ifndef _GLIBCPP_OS_DEFINES #ifndef _GLIBCPP_OS_DEFINES
#define _GLIBCPP_OS_DEFINES 1 #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. // This keeps isanum, et al from being propagated as macros.
#define __NO_CTYPE 1 #define __NO_CTYPE 1
...@@ -63,21 +65,12 @@ typedef __loff_t __off64_t; ...@@ -63,21 +65,12 @@ typedef __loff_t __off64_t;
# define __NO_STRING_INLINES # define __NO_STRING_INLINES
# endif # endif
#if defined (__powerpc__) || defined (__s390__) #if defined(__sparc__) && defined(__arch64__)
#define __glibcpp_wchar_t_is_signed true
#endif
#if defined (__alpha__) || defined (__powerpc64__) || (defined (__sparc__) && defined(__arch64__)) || defined (__s390x__)
#define __glibcpp_long_bits 64 #define __glibcpp_long_bits 64
#endif #endif
#if defined (__alpha__) || (defined (__powerpc__) && !defined (__LONG_DOUBLE_128__)) || defined (__s390__) #ifdef __powerpc64__
#define __glibcpp_long_double_bits 64 #define __glibcpp_long_bits 64
#endif
#if defined (__mc68000__)
#define __glibcpp_long_double_bits 96
#endif #endif
#endif #endif
...@@ -27,13 +27,11 @@ ...@@ -27,13 +27,11 @@
// invalidate any other reasons why the executable file might be covered by // invalidate any other reasons why the executable file might be covered by
// the GNU General Public License. // the GNU General Public License.
#ifndef _GLIBCPP_OS_DEFINES #ifndef _GLIBCPP_OS_DEFINES
# define _GLIBCPP_OS_DEFINES #define _GLIBCPP_OS_DEFINES
/* System-specific #define, typedefs, corrections, etc, go here. This // System-specific #define, typedefs, corrections, etc, go here. This
file will come before all others. */ // file will come before all others.
#define __off_t off_t #define __off_t off_t
#define __off64_t off64_t #define __off64_t off64_t
...@@ -46,4 +44,3 @@ ...@@ -46,4 +44,3 @@
#endif #endif
#endif #endif
...@@ -27,32 +27,28 @@ ...@@ -27,32 +27,28 @@
// invalidate any other reasons why the executable file might be covered by // invalidate any other reasons why the executable file might be covered by
// the GNU General Public License. // the GNU General Public License.
#ifndef _GLIBCPP_OS_DEFINES #ifndef _GLIBCPP_OS_DEFINES
#define _GLIBCPP_OS_DEFINES #define _GLIBCPP_OS_DEFINES 1
/* System-specific #define, typedefs, corrections, etc, go here. This // System-specific #define, typedefs, corrections, etc, go here. This
file will come before all others. */ // file will come before all others.
/* We need large file support. There are two ways to turn it on: // We need large file support. There are two ways to turn it on: by
by defining either _LARGEFILE64_SOURCE or _SGI_SOURCE. However, // defining either _LARGEFILE64_SOURCE or _SGI_SOURCE. However, it
it does not actually work to define only the former, as then // does not actually work to define only the former, as then
<sys/stat.h> is invalid: `st_blocks' is defined to be a macro, // <sys/stat.h> is invalid: `st_blocks' is defined to be a macro, but
but then used as a field name. So, we have to turn on // then used as a field name. So, we have to turn on _SGI_SOURCE.
_SGI_SOURCE. That only works if _POSIX_SOURCE is turned off, // That only works if _POSIX_SOURCE is turned off, so we have to
so we have to explicitly turn it off. (Some of the libio C files // explicitly turn it off. (Some of the libio C files explicitly try
explicitly try to turn it on.) _SGI_SOURCE is actually turned on // to turn it on.) _SGI_SOURCE is actually turned on implicitly via
implicitly via the command-line. */ // the command-line.
#undef _POSIX_SOURCE #undef _POSIX_SOURCE
#define __off_t off_t #define __off_t off_t
#define __off64_t off64_t #define __off64_t off64_t
#define __ssize_t ssize_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 _G_USING_THUNKS 0
#endif #endif
...@@ -27,29 +27,28 @@ ...@@ -27,29 +27,28 @@
// invalidate any other reasons why the executable file might be covered by // invalidate any other reasons why the executable file might be covered by
// the GNU General Public License. // the GNU General Public License.
#ifndef _GLIBCPP_OS_DEFINES #ifndef _GLIBCPP_OS_DEFINES
#define _GLIBCPP_OS_DEFINES #define _GLIBCPP_OS_DEFINES 1
/* System-specific #define, typedefs, corrections, etc, go here. This // System-specific #define, typedefs, corrections, etc, go here. This
file will come before all others. */ // file will come before all others.
/* We need large file support. There are two ways to turn it on: // We need large file support. There are two ways to turn it on: by
by defining either _LARGEFILE64_SOURCE or _SGI_SOURCE. However, // defining either _LARGEFILE64_SOURCE or _SGI_SOURCE. However, it
it does not actually work to define only the former, as then // does not actually work to define only the former, as then
<sys/stat.h> is invalid: `st_blocks' is defined to be a macro, // <sys/stat.h> is invalid: `st_blocks' is defined to be a macro, but
but then used as a field name. So, we have to turn on // then used as a field name. So, we have to turn on _SGI_SOURCE.
_SGI_SOURCE. That only works if _POSIX_SOURCE is turned off, // That only works if _POSIX_SOURCE is turned off, so we have to
so we have to explicitly turn it off. (Some of the libio C files // explicitly turn it off. (Some of the libio C files explicitly try
explicitly try to turn it on.) _SGI_SOURCE is actually turned on // to turn it on.) _SGI_SOURCE is actually turned on implicitly via
implicitly via the command-line. */ // the command-line.
#undef _POSIX_SOURCE #undef _POSIX_SOURCE
#define __off_t off_t #define __off_t off_t
#define __off64_t off64_t #define __off64_t off64_t
#define __ssize_t ssize_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 _G_USING_THUNKS 0
#define __glibcpp_long_double_bits 64 #define __glibcpp_long_double_bits 64
......
...@@ -27,15 +27,10 @@ ...@@ -27,15 +27,10 @@
// invalidate any other reasons why the executable file might be covered by // invalidate any other reasons why the executable file might be covered by
// the GNU General Public License. // the GNU General Public License.
#ifndef _GLIBCPP_OS_DEFINES #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.
#endif #endif
...@@ -27,12 +27,11 @@ ...@@ -27,12 +27,11 @@
// invalidate any other reasons why the executable file might be covered by // invalidate any other reasons why the executable file might be covered by
// the GNU General Public License. // the GNU General Public License.
#ifndef _GLIBCPP_OS_DEFINES #ifndef _GLIBCPP_OS_DEFINES
# define _GLIBCPP_OS_DEFINES #define _GLIBCPP_OS_DEFINES 1
/* System-specific #define, typedefs, corrections, etc, go here. This // System-specific #define, typedefs, corrections, etc, go here. This
file will come before all others. */ // file will come before all others.
#define _GLIBCPP_AVOID_FSEEK 1 #define _GLIBCPP_AVOID_FSEEK 1
......
...@@ -27,12 +27,11 @@ ...@@ -27,12 +27,11 @@
// invalidate any other reasons why the executable file might be covered by // invalidate any other reasons why the executable file might be covered by
// the GNU General Public License. // the GNU General Public License.
#ifndef _GLIBCPP_OS_DEFINES #ifndef _GLIBCPP_OS_DEFINES
# define _GLIBCPP_OS_DEFINES #define _GLIBCPP_OS_DEFINES 1
/* System-specific #define, typedefs, corrections, etc, go here. This // System-specific #define, typedefs, corrections, etc, go here. This
file will come before all others. */ // file will come before all others.
#define _GLIBCPP_AVOID_FSEEK 1 #define _GLIBCPP_AVOID_FSEEK 1
......
...@@ -27,12 +27,11 @@ ...@@ -27,12 +27,11 @@
// invalidate any other reasons why the executable file might be covered by // invalidate any other reasons why the executable file might be covered by
// the GNU General Public License. // the GNU General Public License.
#ifndef _GLIBCPP_OS_DEFINES #ifndef _GLIBCPP_OS_DEFINES
# define _GLIBCPP_OS_DEFINES #define _GLIBCPP_OS_DEFINES 1
/* System-specific #define, typedefs, corrections, etc, go here. This // System-specific #define, typedefs, corrections, etc, go here. This
file will come before all others. */ // file will come before all others.
#define _GLIBCPP_AVOID_FSEEK 1 #define _GLIBCPP_AVOID_FSEEK 1
......
...@@ -16883,8 +16883,8 @@ fi ...@@ -16883,8 +16883,8 @@ fi
#line 16884 "configure" #line 16884 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <setjmp.h> #include <setjmp.h>
int main() { int main() {
sigjmp_buf env; while (! sigsetjmp (env, 1)) siglongjmp (env, 1); sigjmp_buf env; while (! sigsetjmp (env, 1)) siglongjmp (env, 1);
; return 0; } ; return 0; }
...@@ -16895,6 +16895,7 @@ if { (eval echo configure:16893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; ...@@ -16895,6 +16895,7 @@ if { (eval echo configure:16893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5;
#define HAVE_SIGSETJMP 1 #define HAVE_SIGSETJMP 1
EOF EOF
else else
echo "configure: failed program was:" >&5 echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
...@@ -16905,17 +16906,17 @@ rm -f conftest* ...@@ -16905,17 +16906,17 @@ rm -f conftest*
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:16909: checking for $ac_hdr" >&5 echo "configure:16910: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 16914 "configure" #line 16915 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:16919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:16920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -16944,12 +16945,12 @@ done ...@@ -16944,12 +16945,12 @@ done
for ac_func in getpagesize for ac_func in getpagesize
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:16948: checking for $ac_func" >&5 echo "configure:16949: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 16953 "configure" #line 16954 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -16972,7 +16973,7 @@ $ac_func(); ...@@ -16972,7 +16973,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:16976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:16977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -16997,7 +16998,7 @@ fi ...@@ -16997,7 +16998,7 @@ fi
done done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
echo "configure:17001: checking for working mmap" >&5 echo "configure:17002: checking for working mmap" >&5
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -17005,7 +17006,7 @@ else ...@@ -17005,7 +17006,7 @@ else
ac_cv_func_mmap_fixed_mapped=no ac_cv_func_mmap_fixed_mapped=no
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 17009 "configure" #line 17010 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test. /* Thanks to Mike Haertel and Jim Avera for this test.
...@@ -17158,7 +17159,7 @@ main() ...@@ -17158,7 +17159,7 @@ main()
} }
EOF EOF
if { (eval echo configure:17162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:17163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_mmap_fixed_mapped=yes
else else
...@@ -17189,17 +17190,17 @@ fi ...@@ -17189,17 +17190,17 @@ fi
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:17193: checking for $ac_hdr" >&5 echo "configure:17194: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 17198 "configure" #line 17199 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:17203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:17204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -17232,7 +17233,7 @@ done ...@@ -17232,7 +17233,7 @@ done
# Can't do these in a loop, else the resulting syntax is wrong. # Can't do these in a loop, else the resulting syntax is wrong.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 17236 "configure" #line 17237 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/resource.h> #include <sys/resource.h>
#include <unistd.h> #include <unistd.h>
...@@ -17241,7 +17242,7 @@ int main() { ...@@ -17241,7 +17242,7 @@ int main() {
int f = RLIMIT_DATA ; int f = RLIMIT_DATA ;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:17245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:17246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
glibcpp_mresult=1 glibcpp_mresult=1
else else
...@@ -17258,7 +17259,7 @@ EOF ...@@ -17258,7 +17259,7 @@ EOF
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 17262 "configure" #line 17263 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/resource.h> #include <sys/resource.h>
#include <unistd.h> #include <unistd.h>
...@@ -17267,7 +17268,7 @@ int main() { ...@@ -17267,7 +17268,7 @@ int main() {
int f = RLIMIT_RSS ; int f = RLIMIT_RSS ;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:17271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:17272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
glibcpp_mresult=1 glibcpp_mresult=1
else else
...@@ -17284,7 +17285,7 @@ EOF ...@@ -17284,7 +17285,7 @@ EOF
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 17288 "configure" #line 17289 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/resource.h> #include <sys/resource.h>
#include <unistd.h> #include <unistd.h>
...@@ -17293,7 +17294,7 @@ int main() { ...@@ -17293,7 +17294,7 @@ int main() {
int f = RLIMIT_VMEM ; int f = RLIMIT_VMEM ;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:17297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:17298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
glibcpp_mresult=1 glibcpp_mresult=1
else else
...@@ -17310,7 +17311,7 @@ EOF ...@@ -17310,7 +17311,7 @@ EOF
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 17314 "configure" #line 17315 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/resource.h> #include <sys/resource.h>
#include <unistd.h> #include <unistd.h>
...@@ -17319,7 +17320,7 @@ int main() { ...@@ -17319,7 +17320,7 @@ int main() {
int f = RLIMIT_AS ; int f = RLIMIT_AS ;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:17323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:17324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
glibcpp_mresult=1 glibcpp_mresult=1
else else
...@@ -17341,7 +17342,7 @@ EOF ...@@ -17341,7 +17342,7 @@ EOF
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 17345 "configure" #line 17346 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/resource.h> #include <sys/resource.h>
#include <unistd.h> #include <unistd.h>
...@@ -17350,7 +17351,7 @@ int main() { ...@@ -17350,7 +17351,7 @@ int main() {
struct rlimit r; setrlimit(0, &r); struct rlimit r; setrlimit(0, &r);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:17354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:17355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_setrlimit=yes ac_setrlimit=yes
else else
...@@ -17366,7 +17367,7 @@ fi ...@@ -17366,7 +17367,7 @@ fi
fi fi
echo $ac_n "checking for testsuite memory limit support""... $ac_c" 1>&6 echo $ac_n "checking for testsuite memory limit support""... $ac_c" 1>&6
echo "configure:17370: checking for testsuite memory limit support" >&5 echo "configure:17371: checking for testsuite memory limit support" >&5
if test $setrlimit_have_headers = yes && test $ac_setrlimit = yes; then if test $setrlimit_have_headers = yes && test $ac_setrlimit = yes; then
ac_mem_limits=yes ac_mem_limits=yes
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
...@@ -17385,7 +17386,7 @@ fi ...@@ -17385,7 +17386,7 @@ fi
# Propagate the target-specific source directories through the build chain. # Propagate the target-specific source directories through the build chain.
OS_INC_SRCDIR=$os_include_dir/bits OS_INC_SRCDIR=$os_include_dir/bits
ATOMICITY_INC_SRCDIR=$ATOMICITYH/bits ATOMICITY_INC_SRCDIR=$ATOMICITYH/bits
LIMITS_INC_SRCDIR=$LIMITSH/bits CPU_LIMITS_INC_SRCDIR=$CPULIMITSH/bits
...@@ -17468,13 +17469,13 @@ glibcpp_toolexeclibdir=no ...@@ -17468,13 +17469,13 @@ glibcpp_toolexeclibdir=no
glibcpp_prefixdir=${prefix} glibcpp_prefixdir=${prefix}
echo $ac_n "checking for interface version number""... $ac_c" 1>&6 echo $ac_n "checking for interface version number""... $ac_c" 1>&6
echo "configure:17472: checking for interface version number" >&5 echo "configure:17473: checking for interface version number" >&5
libstdcxx_interface=$INTERFACE libstdcxx_interface=$INTERFACE
echo "$ac_t""$libstdcxx_interface" 1>&6 echo "$ac_t""$libstdcxx_interface" 1>&6
# Process the option --with-gxx-include-dir=<path to include-files directory> # 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 $ac_n "checking for --with-gxx-include-dir""... $ac_c" 1>&6
echo "configure:17478: checking for --with-gxx-include-dir" >&5 echo "configure:17479: checking for --with-gxx-include-dir" >&5
# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given. # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
if test "${with_gxx_include_dir+set}" = set; then if test "${with_gxx_include_dir+set}" = set; then
withval="$with_gxx_include_dir" withval="$with_gxx_include_dir"
...@@ -17498,7 +17499,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6 ...@@ -17498,7 +17499,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6
# Process the option "--enable-version-specific-runtime-libs" # Process the option "--enable-version-specific-runtime-libs"
echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6 echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6
echo "configure:17502: checking for --enable-version-specific-runtime-libs" >&5 echo "configure:17503: checking for --enable-version-specific-runtime-libs" >&5
# Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given. # 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 if test "${enable_version_specific_runtime_libs+set}" = set; then
enableval="$enable_version_specific_runtime_libs" enableval="$enable_version_specific_runtime_libs"
...@@ -17545,7 +17546,7 @@ if test x"$glibcpp_toolexecdir" = x"no"; then ...@@ -17545,7 +17546,7 @@ if test x"$glibcpp_toolexecdir" = x"no"; then
fi fi
echo $ac_n "checking for install location""... $ac_c" 1>&6 echo $ac_n "checking for install location""... $ac_c" 1>&6
echo "configure:17549: checking for install location" >&5 echo "configure:17550: checking for install location" >&5
echo "$ac_t""$gxx_include_dir" 1>&6 echo "$ac_t""$gxx_include_dir" 1>&6
...@@ -17822,7 +17823,7 @@ s%@USE_COMPLEX_LONG_DOUBLE@%$USE_COMPLEX_LONG_DOUBLE%g ...@@ -17822,7 +17823,7 @@ s%@USE_COMPLEX_LONG_DOUBLE@%$USE_COMPLEX_LONG_DOUBLE%g
s%@WERROR@%$WERROR%g s%@WERROR@%$WERROR%g
s%@OS_INC_SRCDIR@%$OS_INC_SRCDIR%g s%@OS_INC_SRCDIR@%$OS_INC_SRCDIR%g
s%@ATOMICITY_INC_SRCDIR@%$ATOMICITY_INC_SRCDIR%g s%@ATOMICITY_INC_SRCDIR@%$ATOMICITY_INC_SRCDIR%g
s%@LIMITS_INC_SRCDIR@%$LIMITS_INC_SRCDIR%g s%@CPU_LIMITS_INC_SRCDIR@%$CPU_LIMITS_INC_SRCDIR%g
s%@GLIBCPP_IS_CROSS_COMPILING@%$GLIBCPP_IS_CROSS_COMPILING%g s%@GLIBCPP_IS_CROSS_COMPILING@%$GLIBCPP_IS_CROSS_COMPILING%g
s%@CANADIAN_TRUE@%$CANADIAN_TRUE%g s%@CANADIAN_TRUE@%$CANADIAN_TRUE%g
s%@CANADIAN_FALSE@%$CANADIAN_FALSE%g s%@CANADIAN_FALSE@%$CANADIAN_FALSE%g
......
...@@ -225,9 +225,10 @@ else ...@@ -225,9 +225,10 @@ else
AC_LC_MESSAGES AC_LC_MESSAGES
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <setjmp.h> #include <setjmp.h>
], [sigjmp_buf env; while (! sigsetjmp (env, 1)) siglongjmp (env, 1);], ], [sigjmp_buf env; while (! sigsetjmp (env, 1)) siglongjmp (env, 1);],
[AC_DEFINE(HAVE_SIGSETJMP, 1, [Define if sigsetjmp is available. ])]) [AC_DEFINE(HAVE_SIGSETJMP, 1, [Define if sigsetjmp is available. ])
])
AC_FUNC_MMAP AC_FUNC_MMAP
...@@ -239,10 +240,10 @@ fi ...@@ -239,10 +240,10 @@ fi
# Propagate the target-specific source directories through the build chain. # Propagate the target-specific source directories through the build chain.
OS_INC_SRCDIR=$os_include_dir/bits OS_INC_SRCDIR=$os_include_dir/bits
ATOMICITY_INC_SRCDIR=$ATOMICITYH/bits ATOMICITY_INC_SRCDIR=$ATOMICITYH/bits
LIMITS_INC_SRCDIR=$LIMITSH/bits CPU_LIMITS_INC_SRCDIR=$CPULIMITSH/bits
AC_SUBST(OS_INC_SRCDIR) AC_SUBST(OS_INC_SRCDIR)
AC_SUBST(ATOMICITY_INC_SRCDIR) AC_SUBST(ATOMICITY_INC_SRCDIR)
AC_SUBST(LIMITS_INC_SRCDIR) AC_SUBST(CPU_LIMITS_INC_SRCDIR)
# Set up cross-compile flags # Set up cross-compile flags
AC_SUBST(GLIBCPP_IS_CROSS_COMPILING) AC_SUBST(GLIBCPP_IS_CROSS_COMPILING)
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
# target The configuration target # target The configuration target
# target_cpu The configuration target CPU # target_cpu The configuration target CPU
# target_os The configuration target OS # target_os The configuration target OS
# target_optspace --enable-target-optspace ("yes", "no", "")
# It possibly modifies the following shell variables: # It possibly modifies the following shell variables:
# cpu_include_dir CPU-specific include directory, relative to srcdir # cpu_include_dir CPU-specific include directory, relative to srcdir
...@@ -22,7 +21,6 @@ ...@@ -22,7 +21,6 @@
# Set any CPU dependent compiler flags. # Set any CPU dependent compiler flags.
# THIS TABLE IS SORTED. KEEP IT THAT WAY. # THIS TABLE IS SORTED. KEEP IT THAT WAY.
case "${target_cpu}" in case "${target_cpu}" in
alpha*) alpha*)
cpu_include_dir="config/cpu/alpha" cpu_include_dir="config/cpu/alpha"
...@@ -68,7 +66,6 @@ esac ...@@ -68,7 +66,6 @@ esac
# Set any OS dependent compiler flags. # Set any OS dependent compiler flags.
# THIS TABLE IS SORTED. KEEP IT THAT WAY. # THIS TABLE IS SORTED. KEEP IT THAT WAY.
case "${target_os}" in case "${target_os}" in
aix4.[3456789]* | aix[56789]*) aix4.[3456789]* | aix[56789]*)
os_include_dir="config/os/aix" os_include_dir="config/os/aix"
...@@ -115,7 +112,6 @@ esac ...@@ -115,7 +112,6 @@ esac
# Set any flags dependant on the full target triplet. # Set any flags dependant on the full target triplet.
# THIS TABLE IS SORTED. KEEP IT THAT WAY. # THIS TABLE IS SORTED. KEEP IT THAT WAY.
case "${target}" in case "${target}" in
*-*-aix[456789]*) *-*-aix[456789]*)
# We set os_include_dir to config/os/aix only on AIX 4.3 and # We set os_include_dir to config/os/aix only on AIX 4.3 and
...@@ -135,24 +131,32 @@ case "${target}" in ...@@ -135,24 +131,32 @@ case "${target}" in
;; ;;
esac esac
# Set LIMITSH to the directory where the configuration-dependent # Set CPULIMITSH to the directory where the configuration-dependent
# limits.h can be found. # cpu_limits.h can be found.
# THIS TABLE IS SORTED. KEEP IT THAT WAY. # THIS TABLE IS SORTED. KEEP IT THAT WAY.
case "${target}" in case "${target}" in
alpha-*-*)
CPULIMITSH=config/cpu/alpha
;;
cris-*-*) cris-*-*)
LIMITSH=config/cpu/cris CPULIMITSH=config/cpu/cris
;; ;;
i?86-*-*) i?86-*-*)
LIMITSH=config/cpu/i386 CPULIMITSH=config/cpu/i386
;;
m68k-*-* | m680[246]0-*-*)
CPULIMITSH=config/cpu/m68k
;; ;;
powerpc-*-*) powerpc-*-*)
LIMITSH=config/cpu/powerpc CPULIMITSH=config/cpu/powerpc
;;
s390-*-* | s390x-*-*)
CPULIMITSH=config/cpu/s390
;; ;;
x86_64-*-*) x86_64-*-*)
LIMITSH=config/cpu/x86-64 CPULIMITSH=config/cpu/x86-64
;; ;;
*) *)
LIMITSH=config/cpu/generic CPULIMITSH=config/cpu/generic
;; ;;
esac esac
...@@ -263,7 +263,7 @@ target_headers = \ ...@@ -263,7 +263,7 @@ target_headers = \
${target_srcdir}/ctype_noninline.h \ ${target_srcdir}/ctype_noninline.h \
${target_srcdir}/os_defines.h \ ${target_srcdir}/os_defines.h \
${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \ ${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
${glibcpp_srcdir}/@LIMITS_INC_SRCDIR@/limits.h ${glibcpp_srcdir}/@CPU_LIMITS_INC_SRCDIR@/cpu_limits.h
thread_builddir = ./${target_alias}/bits thread_builddir = ./${target_alias}/bits
thread_headers = \ thread_headers = \
......
...@@ -76,6 +76,7 @@ CCODECVT_H = @CCODECVT_H@ ...@@ -76,6 +76,7 @@ CCODECVT_H = @CCODECVT_H@
CLOCALE_H = @CLOCALE_H@ CLOCALE_H = @CLOCALE_H@
CMESSAGES_H = @CMESSAGES_H@ CMESSAGES_H = @CMESSAGES_H@
CPP = @CPP@ CPP = @CPP@
CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@
CSHADOW_FLAGS = @CSHADOW_FLAGS@ CSHADOW_FLAGS = @CSHADOW_FLAGS@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
...@@ -105,7 +106,6 @@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ ...@@ -105,7 +106,6 @@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIMITS_INC_SRCDIR = @LIMITS_INC_SRCDIR@
LN_S = @LN_S@ LN_S = @LN_S@
MAINT = @MAINT@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
...@@ -393,7 +393,7 @@ target_headers = \ ...@@ -393,7 +393,7 @@ target_headers = \
${target_srcdir}/ctype_noninline.h \ ${target_srcdir}/ctype_noninline.h \
${target_srcdir}/os_defines.h \ ${target_srcdir}/os_defines.h \
${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \ ${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
${glibcpp_srcdir}/@LIMITS_INC_SRCDIR@/limits.h ${glibcpp_srcdir}/@CPU_LIMITS_INC_SRCDIR@/cpu_limits.h
thread_builddir = ./${target_alias}/bits thread_builddir = ./${target_alias}/bits
......
...@@ -32,8 +32,6 @@ ...@@ -32,8 +32,6 @@
// Pick up any OS-specific definitions. // Pick up any OS-specific definitions.
#include <bits/os_defines.h> #include <bits/os_defines.h>
// And any CPU-specific definitions.
#include <bits/limits.h>
// The current version of the C++ library in compressed ISO date format. // The current version of the C++ library in compressed ISO date format.
#define __GLIBCPP__ 20011023 #define __GLIBCPP__ 20011023
...@@ -51,10 +49,6 @@ ...@@ -51,10 +49,6 @@
// by the compiler, but instead instantiated into the library binary. // by the compiler, but instead instantiated into the library binary.
#define _GLIBCPP_FULLY_COMPLIANT_HEADERS 1 #define _GLIBCPP_FULLY_COMPLIANT_HEADERS 1
// Define this to permit user-level control of the expansion of string
// buffers (via a fn pointer), see basic_string.* for more.
//#define _GLIBCPP_ALLOC_CONTROL
// To enable older, ARM-style iostreams and other anachronisms use this. // To enable older, ARM-style iostreams and other anachronisms use this.
//#define _GLIBCPP_DEPRECATED 1 //#define _GLIBCPP_DEPRECATED 1
...@@ -64,6 +58,10 @@ ...@@ -64,6 +58,10 @@
// Enable concept checking code from the boost libraries. // Enable concept checking code from the boost libraries.
//#define _GLIBCPP_CONCEPT_CHECKS 1 //#define _GLIBCPP_CONCEPT_CHECKS 1
// Define this to permit user-level control of the expansion of string
// buffers (via a fn pointer), see basic_string.* for more.
//#define _GLIBCPP_ALLOC_CONTROL
// Map gthr.h abstraction to that required for STL. Do not key off of // Map gthr.h abstraction to that required for STL. Do not key off of
// __GTHREADS at this point since we haven't seen the correct symbol // __GTHREADS at this point since we haven't seen the correct symbol
// yet, instead setup so that include/bits/stl_threads.h will know to // yet, instead setup so that include/bits/stl_threads.h will know to
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#pragma GCC system_header #pragma GCC system_header
#include <bits/cpu_limits.h>
#include <bits/c++config.h> #include <bits/c++config.h>
// //
...@@ -95,7 +96,7 @@ ...@@ -95,7 +96,7 @@
#define __glibcpp_wchar_t_bits 32 #define __glibcpp_wchar_t_bits 32
#endif #endif
#ifndef __glibcpp_wchar_t_is_signed #ifndef __glibcpp_wchar_t_is_signed
#define __glibcpp_wchar_t_is_signed __glibcpp_plain_char_is_signed #define __glibcpp_wchar_t_is_signed false
#endif #endif
#ifdef _GLIBCPP_USE_LONG_LONG #ifdef _GLIBCPP_USE_LONG_LONG
#ifndef __glibcpp_long_long_bits #ifndef __glibcpp_long_long_bits
...@@ -1139,7 +1140,7 @@ namespace std ...@@ -1139,7 +1140,7 @@ namespace std
template<> template<>
struct numeric_limits<signed char> struct numeric_limits<signed char>
{ {
static const bool is_specialized = true; static const bool is_specialized = true;
...@@ -1960,8 +1961,8 @@ namespace std ...@@ -1960,8 +1961,8 @@ namespace std
static const bool traps = __glibcpp_long_double_traps; static const bool traps = __glibcpp_long_double_traps;
static const bool tinyness_before = __glibcpp_long_double_tinyness_before; static const bool tinyness_before = __glibcpp_long_double_tinyness_before;
static const float_round_style round_style = static const float_round_style round_style =
__glibcpp_long_double_round_style; __glibcpp_long_double_round_style;
}; };
#undef __glibcpp_long_double_min #undef __glibcpp_long_double_min
......
...@@ -76,6 +76,7 @@ CCODECVT_H = @CCODECVT_H@ ...@@ -76,6 +76,7 @@ CCODECVT_H = @CCODECVT_H@
CLOCALE_H = @CLOCALE_H@ CLOCALE_H = @CLOCALE_H@
CMESSAGES_H = @CMESSAGES_H@ CMESSAGES_H = @CMESSAGES_H@
CPP = @CPP@ CPP = @CPP@
CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@
CSHADOW_FLAGS = @CSHADOW_FLAGS@ CSHADOW_FLAGS = @CSHADOW_FLAGS@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CXX = @CXX@ CXX = @CXX@
...@@ -104,7 +105,6 @@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ ...@@ -104,7 +105,6 @@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIMITS_INC_SRCDIR = @LIMITS_INC_SRCDIR@
LN_S = @LN_S@ LN_S = @LN_S@
MAINT = @MAINT@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
......
...@@ -76,6 +76,7 @@ CCODECVT_H = @CCODECVT_H@ ...@@ -76,6 +76,7 @@ CCODECVT_H = @CCODECVT_H@
CLOCALE_H = @CLOCALE_H@ CLOCALE_H = @CLOCALE_H@
CMESSAGES_H = @CMESSAGES_H@ CMESSAGES_H = @CMESSAGES_H@
CPP = @CPP@ CPP = @CPP@
CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@
CSHADOW_FLAGS = @CSHADOW_FLAGS@ CSHADOW_FLAGS = @CSHADOW_FLAGS@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CXX = @CXX@ CXX = @CXX@
...@@ -106,7 +107,6 @@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ ...@@ -106,7 +107,6 @@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIMITS_INC_SRCDIR = @LIMITS_INC_SRCDIR@
LN_S = @LN_S@ LN_S = @LN_S@
MAINT = @MAINT@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
......
...@@ -76,6 +76,7 @@ CCODECVT_H = @CCODECVT_H@ ...@@ -76,6 +76,7 @@ CCODECVT_H = @CCODECVT_H@
CLOCALE_H = @CLOCALE_H@ CLOCALE_H = @CLOCALE_H@
CMESSAGES_H = @CMESSAGES_H@ CMESSAGES_H = @CMESSAGES_H@
CPP = @CPP@ CPP = @CPP@
CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@
CSHADOW_FLAGS = @CSHADOW_FLAGS@ CSHADOW_FLAGS = @CSHADOW_FLAGS@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
...@@ -103,7 +104,6 @@ LIBMATHOBJS = @LIBMATHOBJS@ ...@@ -103,7 +104,6 @@ LIBMATHOBJS = @LIBMATHOBJS@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIMITS_INC_SRCDIR = @LIMITS_INC_SRCDIR@
LN_S = @LN_S@ LN_S = @LN_S@
MAINT = @MAINT@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
......
...@@ -76,6 +76,7 @@ CCODECVT_H = @CCODECVT_H@ ...@@ -76,6 +76,7 @@ CCODECVT_H = @CCODECVT_H@
CLOCALE_H = @CLOCALE_H@ CLOCALE_H = @CLOCALE_H@
CMESSAGES_H = @CMESSAGES_H@ CMESSAGES_H = @CMESSAGES_H@
CPP = @CPP@ CPP = @CPP@
CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@
CSHADOW_FLAGS = @CSHADOW_FLAGS@ CSHADOW_FLAGS = @CSHADOW_FLAGS@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CXX = @CXX@ CXX = @CXX@
...@@ -106,7 +107,6 @@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ ...@@ -106,7 +107,6 @@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIMITS_INC_SRCDIR = @LIMITS_INC_SRCDIR@
LN_S = @LN_S@ LN_S = @LN_S@
MAINT = @MAINT@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
......
...@@ -75,6 +75,7 @@ CCODECVT_H = @CCODECVT_H@ ...@@ -75,6 +75,7 @@ CCODECVT_H = @CCODECVT_H@
CLOCALE_H = @CLOCALE_H@ CLOCALE_H = @CLOCALE_H@
CMESSAGES_H = @CMESSAGES_H@ CMESSAGES_H = @CMESSAGES_H@
CPP = @CPP@ CPP = @CPP@
CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@
CSHADOW_FLAGS = @CSHADOW_FLAGS@ CSHADOW_FLAGS = @CSHADOW_FLAGS@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
...@@ -100,7 +101,6 @@ LIBICONV = @LIBICONV@ ...@@ -100,7 +101,6 @@ LIBICONV = @LIBICONV@
LIBMATHOBJS = @LIBMATHOBJS@ LIBMATHOBJS = @LIBMATHOBJS@
LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIMITS_INC_SRCDIR = @LIMITS_INC_SRCDIR@
LN_S = @LN_S@ LN_S = @LN_S@
MAINT = @MAINT@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
// //
#include <bits/std_limits.h> #include <bits/std_limits.h>
namespace std namespace std
{ {
// bool // bool
...@@ -425,5 +426,3 @@ namespace std ...@@ -425,5 +426,3 @@ namespace std
const bool numeric_limits<long double>::tinyness_before; const bool numeric_limits<long double>::tinyness_before;
const float_round_style numeric_limits<long double>::round_style; const float_round_style numeric_limits<long double>::round_style;
} // namespace std } // namespace std
...@@ -76,6 +76,7 @@ CCODECVT_H = @CCODECVT_H@ ...@@ -76,6 +76,7 @@ CCODECVT_H = @CCODECVT_H@
CLOCALE_H = @CLOCALE_H@ CLOCALE_H = @CLOCALE_H@
CMESSAGES_H = @CMESSAGES_H@ CMESSAGES_H = @CMESSAGES_H@
CPP = @CPP@ CPP = @CPP@
CPU_LIMITS_INC_SRCDIR = @CPU_LIMITS_INC_SRCDIR@
CSHADOW_FLAGS = @CSHADOW_FLAGS@ CSHADOW_FLAGS = @CSHADOW_FLAGS@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CXX = @CXX@ CXX = @CXX@
...@@ -106,7 +107,6 @@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ ...@@ -106,7 +107,6 @@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIMITS_INC_SRCDIR = @LIMITS_INC_SRCDIR@
LN_S = @LN_S@ LN_S = @LN_S@
MAINT = @MAINT@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment