Makefile.am (LIBSUPCXX_INCLUDES): Adjust.
2000-10-10 Benjamin Kosnik <bkoz@purist.soma.redhat.com> * Makefile.am (LIBSUPCXX_INCLUDES): Adjust. * libsupc++/include: Remove * libsupc++/include/*: Move to ... * libsupc++: Here. * libsupc++/Makefile.am (glibcppinstall_HEADERS): Install headers. (glibcppinstalldir): New. * src/Makefile.am (c_base_headers): New. (c_shadow_headers): New (c_headers): New. (myinstallheaders): Correct install issues. * src/Makefile.in: Regenerate. * Makefile.am (CSHADOW_INCLUDES): Simplify. * Makefile.in: Regenerate. * acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Add c_include_dir. * aclocal.m4: Regenerate. * mkcheck.in (SRC_DIR): Use it. * include/bits/std_stdexcept.h: And here. * include/bits/std_ios.h: Change std_exception.h to exception. * src/locale.cc: And here. * src/locale-inst.cc: And here. * include/bits/valarray_array.h: And here. * include/bits/stl_alloc.h: And here. * include/bits/stl_algobase.h: And here. * include/bits/pthread_allocimpl.h: And here. * include/bits/stl_construct.h: Change to std_new.h to new. * include/bits/locale_facets.h: Change std_typeinfo.h to typeinfo. * src/Makefile.am (INCLUDES): Add LIBSUPCXX_INCLUDES. (headers): Remove duplicated headers. (std_headers): And here. * src/Makefile.in: Regenerate. * libsupc++/Makefile.am (LIBSUPCXX_INCLUDES): Remove. * libsupc++/Makefile.in: Regenerate. * Makefile.am (LIBSUPCXX_INCLUDES): Add here. (AM_MAKEFLAGS): And here. * Makefile.in: Regenerate. * include/bits/std_typeinfo.h: Remove. * include/bits/std_new.h: Remove * include/bits/std_exception.h: Remove. * std/new: Remove. * std/typeinfo: Remove. * std/exception: Remove. * libio/_G_config.h (__need_ptrdiff_t): Add. * libsupc++/include/new: Change stddef.h to cstddef. * libsupc++/tinfo.h: Change limits.h to climits. * libsupc++/pure.cc: Comment out _GNU_LIBRARY_ bits, as this renders the file uncompilable. Add copyright. * include/c_std/bits/std_cstddef.h: Don't bring wchar_t into std namespace, as it is a fundamental type. From-SVN: r36833
This commit is contained in:
Benjamin Kosnik
parent
6305f20ac3
commit
a6863e2538
|
|
@ -1,3 +1,63 @@
|
|||
2000-10-10 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
|
||||
|
||||
* Makefile.am (LIBSUPCXX_INCLUDES): Adjust.
|
||||
* libsupc++/include: Remove
|
||||
* libsupc++/include/*: Move to ...
|
||||
* libsupc++: Here.
|
||||
* libsupc++/Makefile.am (glibcppinstall_HEADERS): Install headers.
|
||||
(glibcppinstalldir): New.
|
||||
|
||||
* src/Makefile.am (c_base_headers): New.
|
||||
(c_shadow_headers): New
|
||||
(c_headers): New.
|
||||
(myinstallheaders): Correct install issues.
|
||||
* src/Makefile.in: Regenerate.
|
||||
|
||||
* Makefile.am (CSHADOW_INCLUDES): Simplify.
|
||||
* Makefile.in: Regenerate.
|
||||
* acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Add c_include_dir.
|
||||
* aclocal.m4: Regenerate.
|
||||
* mkcheck.in (SRC_DIR): Use it.
|
||||
|
||||
* include/bits/std_stdexcept.h: And here.
|
||||
* include/bits/std_ios.h: Change std_exception.h to exception.
|
||||
* src/locale.cc: And here.
|
||||
* src/locale-inst.cc: And here.
|
||||
|
||||
* include/bits/valarray_array.h: And here.
|
||||
* include/bits/stl_alloc.h: And here.
|
||||
* include/bits/stl_algobase.h: And here.
|
||||
* include/bits/pthread_allocimpl.h: And here.
|
||||
* include/bits/stl_construct.h: Change to std_new.h to new.
|
||||
|
||||
* include/bits/locale_facets.h: Change std_typeinfo.h to typeinfo.
|
||||
|
||||
* src/Makefile.am (INCLUDES): Add LIBSUPCXX_INCLUDES.
|
||||
(headers): Remove duplicated headers.
|
||||
(std_headers): And here.
|
||||
* src/Makefile.in: Regenerate.
|
||||
* libsupc++/Makefile.am (LIBSUPCXX_INCLUDES): Remove.
|
||||
* libsupc++/Makefile.in: Regenerate.
|
||||
* Makefile.am (LIBSUPCXX_INCLUDES): Add here.
|
||||
(AM_MAKEFLAGS): And here.
|
||||
* Makefile.in: Regenerate.
|
||||
* include/bits/std_typeinfo.h: Remove.
|
||||
* include/bits/std_new.h: Remove
|
||||
* include/bits/std_exception.h: Remove.
|
||||
* std/new: Remove.
|
||||
* std/typeinfo: Remove.
|
||||
* std/exception: Remove.
|
||||
|
||||
* libio/_G_config.h (__need_ptrdiff_t): Add.
|
||||
|
||||
* libsupc++/include/new: Change stddef.h to cstddef.
|
||||
* libsupc++/tinfo.h: Change limits.h to climits.
|
||||
* libsupc++/pure.cc: Comment out _GNU_LIBRARY_ bits, as this
|
||||
renders the file uncompilable. Add copyright.
|
||||
|
||||
* include/c_std/bits/std_cstddef.h: Don't bring wchar_t into std
|
||||
namespace, as it is a fundamental type.
|
||||
|
||||
2000-10-09 Richard Henderson <rth@cygnus.com>
|
||||
|
||||
* libsupc++/pure.cc: New file.
|
||||
|
|
|
|||
|
|
@ -53,7 +53,12 @@ CONFIG_CXXFLAGS = \
|
|||
|
||||
|
||||
# Root level of the include sources.
|
||||
GLIBCPP_INCLUDES = $(top_srcdir)/include
|
||||
GLIBCPP_INCLUDE_DIR = $(top_srcdir)/include
|
||||
|
||||
# Can either use include/c or include/c_std to grab "C" headers. This
|
||||
# variable is set to the include directory currently in use.
|
||||
C_INCLUDE_DIR = $(GLIBCPP_INCLUDE_DIR)/@c_include_dir@
|
||||
|
||||
|
||||
# Passed down for cross compilers, canadian crosses.
|
||||
TOPLEVEL_INCLUDES = -I$(includedir)
|
||||
|
|
@ -67,15 +72,12 @@ else
|
|||
LIBIO_INCLUDES = -I$(top_srcdir)/libio
|
||||
endif
|
||||
|
||||
# XXX may need to add this in later to enabled shadow header includes
|
||||
LIBSUPCXX_INCLUDES = -I$(top_srcdir)/libsupc++
|
||||
|
||||
# XXX May need to add this in later to enabled shadow header includes
|
||||
# -I$(top_builddir)/cshadow
|
||||
if GLIBCPP_USE_CSHADOW
|
||||
CSHADOW_INCLUDES = \
|
||||
-I$(GLIBCPP_INCLUDES)/std -I$(GLIBCPP_INCLUDES)/c_std
|
||||
else
|
||||
CSHADOW_INCLUDES = \
|
||||
-I$(GLIBCPP_INCLUDES)/std -I$(GLIBCPP_INCLUDES)/c
|
||||
endif
|
||||
-I$(GLIBCPP_INCLUDE_DIR)/std -I$(C_INCLUDE_DIR)
|
||||
|
||||
|
||||
# Use $(blddir) instead of $(top_builddir) for arguments to "mkcheck"
|
||||
|
|
@ -176,9 +178,10 @@ AM_MAKEFLAGS = \
|
|||
"OPTIMIZE_CXXFLAGS=$(OPTIMIZE_CXXFLAGS)" \
|
||||
"WARN_CXXFLAGS=$(WARN_CXXFLAGS)" \
|
||||
"CONFIG_CXXFLAGS=$(CONFIG_CXXFLAGS)" \
|
||||
"GLIBCPP_INCLUDES=$(GLIBCPP_INCLUDES)" \
|
||||
"GLIBCPP_INCLUDE_DIR=$(GLIBCPP_INCLUDE_DIR)" \
|
||||
"C_INCLUDE_DIR=$(C_INCLUDE_DIR)" \
|
||||
"TOPLEVEL_INCLUDES=$(TOPLEVEL_INCLUDES)" \
|
||||
"LIBMATH_INCLUDES=$(LIBMATH_INCLUDES)" \
|
||||
"LIBIO_INCLUDES=$(LIBIO_INCLUDES)" \
|
||||
"CSHADOW_INCLUDES=$(CSHADOW_INCLUDES)"
|
||||
|
||||
"CSHADOW_INCLUDES=$(CSHADOW_INCLUDES)" \
|
||||
"LIBSUPCXX_INCLUDES=$(LIBSUPCXX_INCLUDES)"
|
||||
|
|
|
|||
|
|
@ -97,6 +97,7 @@ USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
|
|||
VERSION = @VERSION@
|
||||
WERROR = @WERROR@
|
||||
WFMT_FLAGS = @WFMT_FLAGS@
|
||||
c_include_dir = @c_include_dir@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
ifGNUmake = @ifGNUmake@
|
||||
libinst_wstring_la = @libinst_wstring_la@
|
||||
|
|
@ -129,7 +130,11 @@ CONFIG_CXXFLAGS = @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOWFLAGS@ @DEBUG_FLA
|
|||
|
||||
|
||||
# Root level of the include sources.
|
||||
GLIBCPP_INCLUDES = $(top_srcdir)/include
|
||||
GLIBCPP_INCLUDE_DIR = $(top_srcdir)/include
|
||||
|
||||
# Can either use include/c or include/c_std to grab "C" headers. This
|
||||
# variable is set to the include directory currently in use.
|
||||
C_INCLUDE_DIR = $(GLIBCPP_INCLUDE_DIR)/@c_include_dir@
|
||||
|
||||
# Passed down for cross compilers, canadian crosses.
|
||||
TOPLEVEL_INCLUDES = -I$(includedir)
|
||||
|
|
@ -137,8 +142,13 @@ TOPLEVEL_INCLUDES = -I$(includedir)
|
|||
LIBMATH_INCLUDES = -I$(top_srcdir)/libmath
|
||||
@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_INCLUDES = -I$(top_builddir)/libio -I$(top_srcdir)/libio
|
||||
@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_INCLUDES = -I$(top_srcdir)/libio
|
||||
@GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_INCLUDES = -I$(GLIBCPP_INCLUDES)/std -I$(GLIBCPP_INCLUDES)/c_std
|
||||
@GLIBCPP_USE_CSHADOW_FALSE@CSHADOW_INCLUDES = -I$(GLIBCPP_INCLUDES)/std -I$(GLIBCPP_INCLUDES)/c
|
||||
|
||||
LIBSUPCXX_INCLUDES = -I$(top_srcdir)/libsupc++
|
||||
|
||||
# XXX May need to add this in later to enabled shadow header includes
|
||||
# -I$(top_builddir)/cshadow
|
||||
CSHADOW_INCLUDES = -I$(GLIBCPP_INCLUDE_DIR)/std -I$(C_INCLUDE_DIR)
|
||||
|
||||
|
||||
# Multilib support.
|
||||
MAKEOVERRIDES =
|
||||
|
|
@ -154,7 +164,7 @@ MULTICLEAN = true
|
|||
# Work around what appears to be a GNU make bug handling MAKEFLAGS
|
||||
# values defined in terms of make variables, as is the case for CC and
|
||||
# friends when we are called from the top level Makefile.
|
||||
AM_MAKEFLAGS = "AR_FLAGS=$(AR_FLAGS)" "CC_FOR_BUILD=$(CC_FOR_BUILD)" "CC_FOR_TARGET=$(CC_FOR_TARGET)" "CFLAGS=$(CFLAGS)" "CXXFLAGS=$(CXXFLAGS)" "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" "INSTALL=$(INSTALL)" "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" "LDFLAGS=$(LDFLAGS)" "LIBCFLAGS=$(LIBCFLAGS)" "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" "MAKE=$(MAKE)" "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" "PICFLAG=$(PICFLAG)" "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" "SHELL=$(SHELL)" "EXPECT=$(EXPECT)" "RUNTEST=$(RUNTEST)" "RUNTESTFLAGS=$(RUNTESTFLAGS)" "exec_prefix=$(exec_prefix)" "infodir=$(infodir)" "libdir=$(libdir)" "includedir=$(includedir)" "prefix=$(prefix)" "tooldir=$(tooldir)" "AR=$(AR)" "AS=$(AS)" "CC=$(CC)" "CXX=$(CXX)" "LD=$(LD)" "LIBCFLAGS=$(LIBCFLAGS)" "PICFLAG=$(PICFLAG)" "RANLIB=$(RANLIB)" "NM=$(NM)" "NM_FOR_BUILD=$(NM_FOR_BUILD)" "NM_FOR_TARGET=$(NM_FOR_TARGET)" "DESTDIR=$(DESTDIR)" "WERROR=$(WERROR)" "OPTIMIZE_CXXFLAGS=$(OPTIMIZE_CXXFLAGS)" "WARN_CXXFLAGS=$(WARN_CXXFLAGS)" "CONFIG_CXXFLAGS=$(CONFIG_CXXFLAGS)" "GLIBCPP_INCLUDES=$(GLIBCPP_INCLUDES)" "TOPLEVEL_INCLUDES=$(TOPLEVEL_INCLUDES)" "LIBMATH_INCLUDES=$(LIBMATH_INCLUDES)" "LIBIO_INCLUDES=$(LIBIO_INCLUDES)" "CSHADOW_INCLUDES=$(CSHADOW_INCLUDES)"
|
||||
AM_MAKEFLAGS = "AR_FLAGS=$(AR_FLAGS)" "CC_FOR_BUILD=$(CC_FOR_BUILD)" "CC_FOR_TARGET=$(CC_FOR_TARGET)" "CFLAGS=$(CFLAGS)" "CXXFLAGS=$(CXXFLAGS)" "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" "INSTALL=$(INSTALL)" "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" "LDFLAGS=$(LDFLAGS)" "LIBCFLAGS=$(LIBCFLAGS)" "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" "MAKE=$(MAKE)" "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" "PICFLAG=$(PICFLAG)" "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" "SHELL=$(SHELL)" "EXPECT=$(EXPECT)" "RUNTEST=$(RUNTEST)" "RUNTESTFLAGS=$(RUNTESTFLAGS)" "exec_prefix=$(exec_prefix)" "infodir=$(infodir)" "libdir=$(libdir)" "includedir=$(includedir)" "prefix=$(prefix)" "tooldir=$(tooldir)" "AR=$(AR)" "AS=$(AS)" "CC=$(CC)" "CXX=$(CXX)" "LD=$(LD)" "LIBCFLAGS=$(LIBCFLAGS)" "PICFLAG=$(PICFLAG)" "RANLIB=$(RANLIB)" "NM=$(NM)" "NM_FOR_BUILD=$(NM_FOR_BUILD)" "NM_FOR_TARGET=$(NM_FOR_TARGET)" "DESTDIR=$(DESTDIR)" "WERROR=$(WERROR)" "OPTIMIZE_CXXFLAGS=$(OPTIMIZE_CXXFLAGS)" "WARN_CXXFLAGS=$(WARN_CXXFLAGS)" "CONFIG_CXXFLAGS=$(CONFIG_CXXFLAGS)" "GLIBCPP_INCLUDE_DIR=$(GLIBCPP_INCLUDE_DIR)" "C_INCLUDE_DIR=$(C_INCLUDE_DIR)" "TOPLEVEL_INCLUDES=$(TOPLEVEL_INCLUDES)" "LIBMATH_INCLUDES=$(LIBMATH_INCLUDES)" "LIBIO_INCLUDES=$(LIBIO_INCLUDES)" "CSHADOW_INCLUDES=$(CSHADOW_INCLUDES)" "LIBSUPCXX_INCLUDES=$(LIBSUPCXX_INCLUDES)"
|
||||
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
|
||||
|
|
|
|||
|
|
@ -1478,13 +1478,16 @@ changequote([, ])
|
|||
yes)
|
||||
CSHADOWFLAGS="-fno-builtin"
|
||||
AC_DEFINE(_GLIBCPP_USE_SHADOW_HEADERS)
|
||||
c_include_dir=c_std
|
||||
;;
|
||||
no)
|
||||
CSHADOWFLAGS=""
|
||||
c_include_dir=c
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_SUBST(CSHADOWFLAGS)
|
||||
AC_SUBST(c_include_dir)
|
||||
AM_CONDITIONAL(GLIBCPP_USE_CSHADOW, test "$enable_cshadow_headers" = yes)
|
||||
])
|
||||
|
||||
|
|
|
|||
|
|
@ -1490,13 +1490,16 @@ changequote([, ])
|
|||
yes)
|
||||
CSHADOWFLAGS="-fno-builtin"
|
||||
AC_DEFINE(_GLIBCPP_USE_SHADOW_HEADERS)
|
||||
c_include_dir=c_std
|
||||
;;
|
||||
no)
|
||||
CSHADOWFLAGS=""
|
||||
c_include_dir=c
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_SUBST(CSHADOWFLAGS)
|
||||
AC_SUBST(c_include_dir)
|
||||
AM_CONDITIONAL(GLIBCPP_USE_CSHADOW, test "$enable_cshadow_headers" = yes)
|
||||
])
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -37,7 +37,7 @@
|
|||
#define _CPP_BITS_LOCFACETS_H 1
|
||||
|
||||
#include <bits/std_ctime.h> // For struct tm
|
||||
#include <bits/std_typeinfo.h> // For bad_cast, which shouldn't be here.
|
||||
#include <typeinfo> // For bad_cast, which shouldn't be here.
|
||||
#include <bits/std_ios.h> // For ios_base
|
||||
#include <bits/std_cwctype.h> // For wctype_t
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#endif
|
||||
|
||||
#ifndef __STL_NO_BAD_ALLOC
|
||||
# include <bits/std_new.h>
|
||||
# include <new>
|
||||
#endif
|
||||
|
||||
__STL_BEGIN_NAMESPACE
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#define _CPP_IOS 1
|
||||
|
||||
#include <bits/std_iosfwd.h>
|
||||
#include <bits/std_exception.h> // For ios_base::failure
|
||||
#include <exception> // For ios_base::failure
|
||||
#include <bits/char_traits.h> // For char_traits, streamoff, streamsize, fpos
|
||||
#include <bits/stl_string_fwd.h>// For string.
|
||||
#include <bits/std_cstdio.h> // For SEEK_SET, SEEK_CUR, SEEK_END
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
#ifndef _CPP_STDEXCEPT
|
||||
#define _CPP_STDEXCEPT 1
|
||||
|
||||
#include <bits/std_exception.h>
|
||||
#include <exception>
|
||||
|
||||
#if defined(__STL_USE_EXCEPTIONS) || \
|
||||
!(defined(_MIPS_SIM) && defined(_ABIO32) && _MIPS_SIM == _ABIO32)
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
#include <bits/std_climits.h>
|
||||
#include <bits/std_cstdlib.h>
|
||||
#include <bits/std_cstddef.h>
|
||||
#include <bits/std_new.h>
|
||||
#include <new>
|
||||
|
||||
#ifdef __STL_USE_NEW_IOSTREAMS
|
||||
#include <iosfwd>
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
# include <bits/std_cstdlib.h>
|
||||
# define __THROW_BAD_ALLOC fprintf(stderr, "out of memory\n"); exit(1)
|
||||
# else /* Standard conforming out-of-memory handling */
|
||||
# include <bits/std_new.h>
|
||||
# include <new>
|
||||
# define __THROW_BAD_ALLOC throw std::bad_alloc()
|
||||
# endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
#ifndef _CPP_BITS_STL_CONSTRUCT_H
|
||||
#define _CPP_BITS_STL_CONSTRUCT_H 1
|
||||
|
||||
#include <bits/std_new.h>
|
||||
#include <new>
|
||||
|
||||
__STL_BEGIN_NAMESPACE
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
#include <bits/cpp_type_traits.h>
|
||||
#include <bits/std_cstdlib.h>
|
||||
#include <bits/std_cstring.h>
|
||||
#include <bits/std_new.h>
|
||||
#include <new>
|
||||
|
||||
namespace std
|
||||
{
|
||||
|
|
|
|||
|
|
@ -47,12 +47,8 @@ namespace _C_legacy {
|
|||
# define _IN_C_LEGACY_
|
||||
# pragma GCC system_header
|
||||
|
||||
// XXX
|
||||
// glibc 2.1.x time.h is on crack
|
||||
# define __need_wchar_t
|
||||
# define __need_ptrdiff_t
|
||||
# define __need_size_t
|
||||
|
||||
//# define __need_ptrdiff_t
|
||||
//# define __need_size_t
|
||||
# include_next <stddef.h>
|
||||
}
|
||||
} // namespace _C_legacy
|
||||
|
|
@ -64,7 +60,6 @@ namespace _C_legacy {
|
|||
namespace std {
|
||||
using _C_legacy::ptrdiff_t;
|
||||
using _C_legacy::size_t;
|
||||
using _C_legacy::wchar_t;
|
||||
} // namespace std
|
||||
|
||||
# undef _IN_C_LEGACY_
|
||||
|
|
@ -73,7 +68,11 @@ namespace std {
|
|||
// some names and types with the std:: C++ version.
|
||||
using std::ptrdiff_t;
|
||||
using std::size_t;
|
||||
using std::wchar_t;
|
||||
|
||||
// 3.9.1 Fundamental Types
|
||||
// p 5
|
||||
// wchar_t is a fundamental type
|
||||
// using std::wchar_t;
|
||||
|
||||
# ifdef _STDDEF_NEED_C_LEGACY_
|
||||
// dive back into the "swamp"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2000-10-10 Benjamin Kosnik <bkoz@gnu.org>
|
||||
|
||||
* _G_config.h (__need_ptrdiff_t): Add.
|
||||
|
||||
2000-10-08 Benjamin Kosnik <bkoz@gnu.org>
|
||||
|
||||
* Makefile.am (INCLUDES): Simplify.
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ noinst_LTLIBRARIES = libio.la
|
|||
|
||||
INCLUDES = \
|
||||
-nostdinc++ \
|
||||
-I$(top_builddir) -I$(GLIBCPP_INCLUDES) \
|
||||
-I$(top_builddir) -I$(GLIBCPP_INCLUDE_DIR) \
|
||||
$(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
|
||||
|
||||
libio_headers = \
|
||||
|
|
|
|||
|
|
@ -97,6 +97,7 @@ USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
|
|||
VERSION = @VERSION@
|
||||
WERROR = @WERROR@
|
||||
WFMT_FLAGS = @WFMT_FLAGS@
|
||||
c_include_dir = @c_include_dir@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
ifGNUmake = @ifGNUmake@
|
||||
libinst_wstring_la = @libinst_wstring_la@
|
||||
|
|
@ -105,7 +106,7 @@ AUTOMAKE_OPTIONS = 1.3 cygnus
|
|||
|
||||
noinst_LTLIBRARIES = libio.la
|
||||
|
||||
INCLUDES = -nostdinc++ -I$(top_builddir) -I$(GLIBCPP_INCLUDES) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
|
||||
INCLUDES = -nostdinc++ -I$(top_builddir) -I$(GLIBCPP_INCLUDE_DIR) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
|
||||
|
||||
|
||||
libio_headers = libio.h libioP.h iolibio.h
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
#define __need_wchar_t
|
||||
#define __need_wint_t
|
||||
#define __need_NULL
|
||||
#define __need_ptrdiff_t
|
||||
#ifdef __cplusplus
|
||||
# include <cstddef>
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ libmath_la_SOURCES = \
|
|||
|
||||
LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
INCLUDES = -I$(GLIBCPP_INCLUDES) $(TOPLEVEL_INCLUDES)
|
||||
INCLUDES = -I$(GLIBCPP_INCLUDE_DIR) $(TOPLEVEL_INCLUDES)
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -97,6 +97,7 @@ USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
|
|||
VERSION = @VERSION@
|
||||
WERROR = @WERROR@
|
||||
WFMT_FLAGS = @WFMT_FLAGS@
|
||||
c_include_dir = @c_include_dir@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
ifGNUmake = @ifGNUmake@
|
||||
libinst_wstring_la = @libinst_wstring_la@
|
||||
|
|
@ -121,7 +122,7 @@ libmath_la_SOURCES = signbit.c signbitf.c cabs.c cabsf.c
|
|||
|
||||
LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
INCLUDES = -I$(GLIBCPP_INCLUDES) $(TOPLEVEL_INCLUDES)
|
||||
INCLUDES = -I$(GLIBCPP_INCLUDE_DIR) $(TOPLEVEL_INCLUDES)
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
|
||||
CONFIG_HEADER = ../config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
|
|
|
|||
|
|
@ -42,19 +42,13 @@ toolexeclib_LTLIBRARIES = libsupc++.la
|
|||
noinst_LTLIBRARIES = libsupc++convenience.la
|
||||
|
||||
|
||||
LIBSUPCXX_INCLUDES = -I$(top_srcdir)/libsupc++/include
|
||||
|
||||
INCLUDES = \
|
||||
-I$(top_srcdir)/../gcc -I$(top_srcdir)/../include \
|
||||
$(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDES) \
|
||||
$(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) \
|
||||
$(CONFIG_INCLUDES) -I$(top_builddir)
|
||||
|
||||
headers = \
|
||||
include/cxxabi.h \
|
||||
include/exception \
|
||||
include/new \
|
||||
include/new.h \
|
||||
include/typeinfo
|
||||
cxxabi.h exception new new.h typeinfo
|
||||
|
||||
sources = \
|
||||
del_op.cc \
|
||||
|
|
@ -75,6 +69,10 @@ sources = \
|
|||
libsupc___la_SOURCES = $(sources)
|
||||
libsupc__convenience_la_SOURCES = $(sources)
|
||||
|
||||
# This insanely simple bit of install magic courtesy of Mr. Tromey.
|
||||
glibcppinstalldir= $(prefix)/include/g++-v3
|
||||
glibcppinstall_HEADERS = $(headers)
|
||||
|
||||
# Flags to force separate libtool library to be static only.
|
||||
LIBTOOL = @LIBTOOL@ --tag disable-shared
|
||||
LIBSUPCXX_CXXFLAGS = -prefer-pic
|
||||
|
|
|
|||
|
|
@ -96,6 +96,7 @@ USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
|
|||
VERSION = @VERSION@
|
||||
WERROR = @WERROR@
|
||||
WFMT_FLAGS = @WFMT_FLAGS@
|
||||
c_include_dir = @c_include_dir@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
ifGNUmake = @ifGNUmake@
|
||||
libinst_wstring_la = @libinst_wstring_la@
|
||||
|
|
@ -113,12 +114,10 @@ toolexeclib_LTLIBRARIES = libsupc++.la
|
|||
# 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
|
||||
noinst_LTLIBRARIES = libsupc++convenience.la
|
||||
|
||||
LIBSUPCXX_INCLUDES = -I$(top_srcdir)/libsupc++/include
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/../gcc -I$(top_srcdir)/../include $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDES) $(CONFIG_INCLUDES) -I$(top_builddir)
|
||||
INCLUDES = -I$(top_srcdir)/../gcc -I$(top_srcdir)/../include $(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) $(CONFIG_INCLUDES) -I$(top_builddir)
|
||||
|
||||
|
||||
headers = include/cxxabi.h include/exception include/new include/new.h include/typeinfo
|
||||
headers = cxxabi.h exception new new.h typeinfo
|
||||
|
||||
|
||||
sources = del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc exception.cc new_handler.cc new_op.cc new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc vec.cc
|
||||
|
|
@ -127,6 +126,10 @@ sources = del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc exception.cc new_
|
|||
libsupc___la_SOURCES = $(sources)
|
||||
libsupc__convenience_la_SOURCES = $(sources)
|
||||
|
||||
# This insanely simple bit of install magic courtesy of Mr. Tromey.
|
||||
glibcppinstalldir = $(prefix)/include/g++-v3
|
||||
glibcppinstall_HEADERS = $(headers)
|
||||
|
||||
# Flags to force separate libtool library to be static only.
|
||||
LIBTOOL = @LIBTOOL@ --tag disable-shared
|
||||
LIBSUPCXX_CXXFLAGS = -prefer-pic
|
||||
|
|
@ -177,6 +180,8 @@ exception.lo new_handler.lo new_op.lo new_opnt.lo new_opv.lo \
|
|||
new_opvnt.lo pure.lo tinfo.lo tinfo2.lo vec.lo
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CXXLD = $(CXX)
|
||||
HEADERS = $(glibcppinstall_HEADERS)
|
||||
|
||||
DIST_COMMON = Makefile.am Makefile.in configure configure.in
|
||||
|
||||
|
||||
|
|
@ -288,6 +293,21 @@ libsupc++.la: $(libsupc___la_OBJECTS) $(libsupc___la_DEPENDENCIES)
|
|||
.cc.lo:
|
||||
$(LTCXXCOMPILE) -c $<
|
||||
|
||||
install-glibcppinstallHEADERS: $(glibcppinstall_HEADERS)
|
||||
@$(NORMAL_INSTALL)
|
||||
$(mkinstalldirs) $(DESTDIR)$(glibcppinstalldir)
|
||||
@list='$(glibcppinstall_HEADERS)'; for p in $$list; do \
|
||||
if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
|
||||
echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$p"; \
|
||||
$(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$p; \
|
||||
done
|
||||
|
||||
uninstall-glibcppinstallHEADERS:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
list='$(glibcppinstall_HEADERS)'; for p in $$list; do \
|
||||
rm -f $(DESTDIR)$(glibcppinstalldir)/$$p; \
|
||||
done
|
||||
|
||||
tags: TAGS
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP)
|
||||
|
|
@ -345,20 +365,22 @@ install-info: install-info-am
|
|||
install-exec-am: install-toolexeclibLTLIBRARIES
|
||||
install-exec: install-exec-am
|
||||
|
||||
install-data-am:
|
||||
install-data-am: install-glibcppinstallHEADERS
|
||||
install-data: install-data-am
|
||||
|
||||
install-am: all-am
|
||||
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
|
||||
install: install-am
|
||||
uninstall-am: uninstall-toolexeclibLTLIBRARIES
|
||||
uninstall-am: uninstall-toolexeclibLTLIBRARIES \
|
||||
uninstall-glibcppinstallHEADERS
|
||||
uninstall: uninstall-am
|
||||
all-am: Makefile $(LTLIBRARIES)
|
||||
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
|
||||
all-redirect: all-am
|
||||
install-strip:
|
||||
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
|
||||
installdirs:
|
||||
$(mkinstalldirs) $(DESTDIR)$(toolexeclibdir)
|
||||
$(mkinstalldirs) $(DESTDIR)$(toolexeclibdir) \
|
||||
$(DESTDIR)$(glibcppinstalldir)
|
||||
|
||||
|
||||
mostlyclean-generic:
|
||||
|
|
@ -408,12 +430,13 @@ clean-toolexeclibLTLIBRARIES maintainer-clean-toolexeclibLTLIBRARIES \
|
|||
uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \
|
||||
mostlyclean-compile distclean-compile clean-compile \
|
||||
maintainer-clean-compile mostlyclean-libtool distclean-libtool \
|
||||
clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
|
||||
distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
|
||||
dvi-am dvi check check-am installcheck-am installcheck install-info-am \
|
||||
install-info install-exec-am install-exec install-data-am install-data \
|
||||
install-am install uninstall-am uninstall all-redirect all-am all \
|
||||
installdirs mostlyclean-generic distclean-generic clean-generic \
|
||||
clean-libtool maintainer-clean-libtool uninstall-glibcppinstallHEADERS \
|
||||
install-glibcppinstallHEADERS tags mostlyclean-tags distclean-tags \
|
||||
clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
|
||||
check-am installcheck-am installcheck install-info-am install-info \
|
||||
install-exec-am install-exec install-data-am install-data install-am \
|
||||
install uninstall-am uninstall all-redirect all-am all installdirs \
|
||||
mostlyclean-generic distclean-generic clean-generic \
|
||||
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,45 @@
|
|||
// -*- C++ -*-
|
||||
// Copyright (C) 2000 Free Software Foundation
|
||||
//
|
||||
// This file is part of GNU CC.
|
||||
//
|
||||
// GNU CC 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.
|
||||
//
|
||||
// GNU CC 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 GNU CC; 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.
|
||||
|
||||
#include <bits/c++config.h>
|
||||
|
||||
#ifdef _GLIBCPP_HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#define writestr(str) write(2, str, sizeof(str) - 1)
|
||||
#ifdef __GNU_LIBRARY__
|
||||
# include <unistd.h>
|
||||
# define writestr(str) write(2, str, sizeof(str) - 1)
|
||||
# ifdef __GNU_LIBRARY__
|
||||
/* Avoid forcing the library's meaning of `write' on the user program
|
||||
by using the "internal" name (for use within the library). */
|
||||
#define write(fd, buf, n) __write((fd), (buf), (n))
|
||||
#endif
|
||||
/*# define write(fd, buf, n) __write((fd), (buf), (n))*/
|
||||
# endif
|
||||
#else
|
||||
#include <stdio.h>
|
||||
#define writestr(str) fputs(str, stderr)
|
||||
# include <stdio.h>
|
||||
# define writestr(str) fputs(str, stderr)
|
||||
#endif
|
||||
|
||||
extern "C" {
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ public:
|
|||
|
||||
// type_info for a general class.
|
||||
|
||||
#include <limits.h>
|
||||
#include <climits>
|
||||
|
||||
#if INT_MAX == 2147483647
|
||||
typedef int myint32;
|
||||
|
|
|
|||
|
|
@ -56,7 +56,8 @@ fi
|
|||
# INC_PATH == include path to new headers for use on gcc command-line
|
||||
if [ $WHICH != "1" ]; then
|
||||
INC_PATH="@CSHADOWFLAGS@ -I$BUILD_DIR -I$BUILD_DIR/libio \
|
||||
-I$SRC_DIR/include/std -I$SRC_DIR/include -I$SRC_DIR/libio \
|
||||
-I$SRC_DIR/include/std -I$SRC_DIR/include/@c_include_dir@ \
|
||||
-I$SRC_DIR/include -I$SRC_DIR/libsupc++/include -I$SRC_DIR/libio \
|
||||
-I$SRC_DIR/testsuite"
|
||||
elif [ $WHICH -eq 1 ]; then
|
||||
INC_PATH="-I$SRC_DIR/testsuite"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
||||
## USA.
|
||||
|
||||
## $Id: Makefile.am,v 1.36 2000/10/07 18:54:08 bkoz Exp $
|
||||
## $Id: Makefile.am,v 1.37 2000/10/09 08:55:06 bkoz Exp $
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.3 gnits
|
||||
MAINT_CHARSET = latin1
|
||||
|
|
@ -41,13 +41,12 @@ EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
|
|||
|
||||
|
||||
INCLUDES = \
|
||||
-D_GNU_SOURCE -D_ISOC99_SOURCE -nostdinc++ $(CSHADOW_INCLUDES) \
|
||||
-I$(top_builddir) -I$(GLIBCPP_INCLUDES) \
|
||||
$(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) \
|
||||
-D_GNU_SOURCE -D_ISOC99_SOURCE -nostdinc++ \
|
||||
$(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) \
|
||||
$(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) -I$(top_builddir) \
|
||||
$(TOPLEVEL_INCLUDES)
|
||||
|
||||
headers = \
|
||||
bits/std_cctype.h \
|
||||
base_headers = \
|
||||
bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h \
|
||||
bits/basic_string.h bits/std_string.h bits/string.tcc \
|
||||
bits/generic_shadow.h bits/std_utility.h \
|
||||
|
|
@ -55,14 +54,7 @@ headers = \
|
|||
bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h \
|
||||
bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h \
|
||||
bits/gslice.h bits/gslice_array.h bits/indirect_array.h \
|
||||
bits/std_cassert.h bits/std_cwctype.h \
|
||||
bits/std_cerrno.h bits/std_cfloat.h bits/std_climits.h \
|
||||
bits/std_clocale.h bits/std_cmath.h \
|
||||
bits/std_csetjmp.h bits/std_csignal.h bits/std_cstdarg.h \
|
||||
bits/std_cstddef.h bits/std_cstdio.h bits/std_cstdlib.h \
|
||||
bits/std_cstring.h bits/std_ctime.h bits/std_cwchar.h \
|
||||
bits/std_typeinfo.h bits/std_new.h \
|
||||
bits/std_exception.h bits/exception_support.h \
|
||||
bits/exception_support.h \
|
||||
bits/std_fstream.h bits/std_iomanip.h \
|
||||
bits/ios_base.h bits/fpos.h bits/basic_ios.h bits/basic_ios.tcc \
|
||||
bits/std_ios.h bits/std_iosfwd.h bits/std_iostream.h \
|
||||
|
|
@ -102,34 +94,38 @@ headers = \
|
|||
ext/stl_bvector.h bits/stl_config.h bits/stl_construct.h \
|
||||
ext/stl_hashtable.h ext/stl_hash_fun.h \
|
||||
ext/hash_map ext/hash_set ext/rope ext/slist \
|
||||
ext/tree ext/bvector \
|
||||
shadow/assert.h shadow/ctype.h shadow/errno.h shadow/float.h \
|
||||
shadow/fcntl.h shadow/libio.h shadow/iolibio.h shadow/libioP.h \
|
||||
shadow/limits.h shadow/locale.h shadow/math.h shadow/setjmp.h \
|
||||
shadow/signal.h shadow/stdarg.h shadow/stddef.h shadow/stdio.h \
|
||||
shadow/stdlib.h shadow/string.h shadow/time.h \
|
||||
shadow/pthread.h shadow/iconv.h shadow/wchar.h shadow/wctype.h \
|
||||
shadow/bits/std_cassert.h shadow/bits/std_cctype.h \
|
||||
shadow/bits/std_cerrno.h shadow/bits/std_cfloat.h \
|
||||
shadow/bits/std_climits.h shadow/bits/std_clocale.h \
|
||||
shadow/bits/std_cmath.h shadow/bits/std_csetjmp.h \
|
||||
shadow/bits/std_csignal.h shadow/bits/std_cstdarg.h \
|
||||
shadow/bits/std_cstddef.h shadow/bits/std_cstdio.h \
|
||||
shadow/bits/std_cstdlib.h shadow/bits/std_cstring.h \
|
||||
shadow/bits/std_ctime.h shadow/bits/std_cwchar.h \
|
||||
shadow/bits/std_cwctype.h \
|
||||
shadow/bits/wrap_libio.h shadow/bits/wrap_iolibio.h \
|
||||
shadow/bits/wrap_libioP.h shadow/bits/wrap_iconv.h \
|
||||
shadow/bits/wrap_fcntl.h shadow/bits/wrap_pthread.h \
|
||||
shadow/sys/cdefs.h
|
||||
ext/tree ext/bvector
|
||||
|
||||
c_base_headers = \
|
||||
bits/std_cassert.h bits/std_cctype.h bits/std_cerrno.h \
|
||||
bits/std_cfloat.h bits/std_climits.h bits/std_clocale.h \
|
||||
bits/std_cmath.h bits/std_csetjmp.h bits/std_csignal.h \
|
||||
bits/std_cstdarg.h bits/std_cstddef.h bits/std_cstdio.h \
|
||||
bits/std_cstdlib.h bits/std_cstring.h bits/std_ctime.h \
|
||||
bits/std_cwchar.h bits/std_cwctype.h
|
||||
|
||||
c_shadow_headers = \
|
||||
assert.h ctype.h errno.h float.h limits.h locale.h math.h setjmp.h \
|
||||
signal.h stdarg.h stddef.h stdio.h stdlib.h string.h time.h wchar.h \
|
||||
wctype.h fcntl.h libio.h iolibio.h libioP.h pthread.h iconv.h \
|
||||
bits/wrap_libio.h bits/wrap_iolibio.h bits/wrap_libioP.h \
|
||||
bits/wrap_iconv.h bits/wrap_fcntl.h bits/wrap_pthread.h \
|
||||
sys/cdefs.h
|
||||
|
||||
if GLIBCPP_USE_CSHADOW
|
||||
c_headers = $(c_base_headers) $(c_shadow_headers)
|
||||
else
|
||||
c_headers = $(c_base_headers)
|
||||
endif
|
||||
|
||||
std_headers = \
|
||||
algorithm bitset cassert cctype cerrno cfloat climits clocale ciso646 \
|
||||
cmath complex csetjmp csignal cstdarg cstddef cstdio cstdlib \
|
||||
cstring ctime cwchar cwctype deque exception fstream functional \
|
||||
algorithm bitset complex deque fstream functional \
|
||||
iomanip ios iosfwd iostream istream iterator limits list locale \
|
||||
map memory new numeric ostream queue set sstream stack stdexcept \
|
||||
streambuf string strstream typeinfo utility valarray vector
|
||||
map memory numeric ostream queue set sstream stack stdexcept \
|
||||
streambuf string strstream utility valarray vector \
|
||||
cassert cctype cerrno cfloat climits clocale ciso646 \
|
||||
cmath csetjmp csignal cstdarg cstddef cstdio cstdlib \
|
||||
cstring ctime cwchar cwctype
|
||||
|
||||
if GLIBCPP_NEED_LIBIO
|
||||
libio_headers = \
|
||||
|
|
@ -141,10 +137,13 @@ endif
|
|||
build_headers = \
|
||||
$(top_builddir)/bits/std_limits.h $(top_builddir)/bits/c++config.h \
|
||||
$(top_builddir)/bits/c++io.h $(top_builddir)/bits/c++threads.h \
|
||||
$(top_builddir)/bits/atomicity.h $(top_builddir)/bits/ctype_base.h \
|
||||
$(top_builddir)/bits/atomicity.h $(top_builddir)/bits/os_defines.h \
|
||||
$(top_builddir)/bits/ctype_base.h \
|
||||
$(top_builddir)/bits/ctype_noninline.h \
|
||||
$(top_builddir)/bits/ctype_inline.h
|
||||
|
||||
headers = $(base_headers) $(c_headers)
|
||||
|
||||
sources = \
|
||||
limitsMEMBERS.cc \
|
||||
cmath.cc \
|
||||
|
|
@ -158,8 +157,8 @@ wstring_sources = \
|
|||
wstring-inst.cc
|
||||
|
||||
VPATH += $(top_srcdir) $(top_srcdir)/src
|
||||
VPATH += $(GLIBCPP_INCLUDES) $(top_srcdir)/std
|
||||
|
||||
VPATH += $(GLIBCPP_INCLUDE_DIR)
|
||||
VPATH += $(GLIBCPP_INCLUDE_DIR)/std $(C_INCLUDE_DIR)
|
||||
|
||||
# Actual sources for the distro, but don't build these.
|
||||
#EXTRA_sources = string-inst.cc
|
||||
|
|
@ -208,8 +207,8 @@ install: myinstallheaders
|
|||
myinstallheaders: $(headers:%=$(myincludep)%)
|
||||
if test -z "$(MULTISUBDIR)"; then \
|
||||
for i in $(std_headers); do \
|
||||
echo "$(INSTALL_DATA) $(GLIBCPP_INCLUDES)/std/$$i $(myincludep)"; \
|
||||
$(INSTALL_DATA) $(GLIBCPP_INCLUDES)/std/$$i $(myincludep); \
|
||||
echo "$(INSTALL_DATA) $(GLIBCPP_INCLUDE_DIR)/std/$$i $(myincludep)";\
|
||||
$(INSTALL_DATA) $(GLIBCPP_INCLUDE_DIR)/std/$$i $(myincludep); \
|
||||
done; \
|
||||
for i in $(build_headers); do \
|
||||
echo "$(INSTALL_DATA) $$i $(myincludep)bits/"; \
|
||||
|
|
|
|||
|
|
@ -96,6 +96,7 @@ USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
|
|||
VERSION = @VERSION@
|
||||
WERROR = @WERROR@
|
||||
WFMT_FLAGS = @WFMT_FLAGS@
|
||||
c_include_dir = @c_include_dir@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
ifGNUmake = @ifGNUmake@
|
||||
libinst_wstring_la = @libinst_wstring_la@
|
||||
|
|
@ -109,26 +110,36 @@ MAINT_CHARSET = latin1
|
|||
toolexeclib_LTLIBRARIES = libstdc++.la
|
||||
EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
|
||||
|
||||
INCLUDES = -D_GNU_SOURCE -D_ISOC99_SOURCE -nostdinc++ $(CSHADOW_INCLUDES) -I$(top_builddir) -I$(GLIBCPP_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) $(TOPLEVEL_INCLUDES)
|
||||
INCLUDES = -D_GNU_SOURCE -D_ISOC99_SOURCE -nostdinc++ $(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) -I$(top_builddir) $(TOPLEVEL_INCLUDES)
|
||||
|
||||
|
||||
headers = bits/std_cctype.h bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h bits/basic_string.h bits/std_string.h bits/string.tcc bits/generic_shadow.h bits/std_utility.h bits/std_complex.h bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h bits/gslice.h bits/gslice_array.h bits/indirect_array.h bits/std_cassert.h bits/std_cwctype.h bits/std_cerrno.h bits/std_cfloat.h bits/std_climits.h bits/std_clocale.h bits/std_cmath.h bits/std_csetjmp.h bits/std_csignal.h bits/std_cstdarg.h bits/std_cstddef.h bits/std_cstdio.h bits/std_cstdlib.h bits/std_cstring.h bits/std_ctime.h bits/std_cwchar.h bits/std_typeinfo.h bits/std_new.h bits/std_exception.h bits/exception_support.h bits/std_fstream.h bits/std_iomanip.h bits/ios_base.h bits/fpos.h bits/basic_ios.h bits/basic_ios.tcc bits/std_ios.h bits/std_iosfwd.h bits/std_iostream.h bits/std_istream.h bits/istream.tcc bits/std_locale.h bits/fstream.tcc bits/ostream.tcc bits/sbuf_iter.h bits/sstream.tcc bits/std_ostream.h bits/std_sstream.h bits/std_streambuf.h bits/streambuf.tcc bits/basic_file.h bits/locale_facets.h bits/locale_facets.tcc bits/localefwd.h bits/stl_pthread_alloc.h bits/pthread_allocimpl.h bits/stl_threads.h bits/stl_iterator_base.h backward/algo.h backward/algobase.h backward/alloc.h backward/bvector.h backward/defalloc.h backward/deque.h backward/function.h backward/hash_map.h backward/hash_set.h backward/hashtable.h backward/heap.h backward/iterator.h backward/list.h backward/map.h backward/multimap.h backward/new.h backward/multiset.h backward/pair.h backward/iostream.h backward/rope.h backward/set.h backward/slist.h backward/stack.h backward/tempbuf.h backward/tree.h backward/vector.h backward/fstream.h bits/std_bitset.h bits/std_deque.h bits/std_functional.h bits/std_iterator.h bits/std_list.h bits/std_map.h bits/std_memory.h bits/std_numeric.h bits/std_queue.h bits/std_set.h bits/std_stack.h bits/std_stdexcept.h bits/std_vector.h bits/stl_algo.h bits/stl_algobase.h bits/stl_alloc.h bits/stl_deque.h bits/stl_function.h bits/stl_heap.h bits/stl_iterator.h bits/stl_list.h bits/stl_map.h bits/stl_multimap.h bits/stl_multiset.h bits/stl_numeric.h bits/stl_pair.h bits/stl_queue.h bits/stl_raw_storage_iter.h bits/stl_relops.h bits/stl_set.h bits/stl_stack.h bits/stl_string_fwd.h bits/stl_tempbuf.h bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h bits/type_traits.h bits/stl_range_errors.h bits/std_algorithm.h bits/concept_checks.h bits/container_concepts.h bits/sequence_concepts.h bits/std_strstream.h ext/ropeimpl.h ext/stl_rope.h ext/stl_bvector.h bits/stl_config.h bits/stl_construct.h ext/stl_hashtable.h ext/stl_hash_fun.h ext/hash_map ext/hash_set ext/rope ext/slist ext/tree ext/bvector shadow/assert.h shadow/ctype.h shadow/errno.h shadow/float.h shadow/fcntl.h shadow/libio.h shadow/iolibio.h shadow/libioP.h shadow/limits.h shadow/locale.h shadow/math.h shadow/setjmp.h shadow/signal.h shadow/stdarg.h shadow/stddef.h shadow/stdio.h shadow/stdlib.h shadow/string.h shadow/time.h shadow/pthread.h shadow/iconv.h shadow/wchar.h shadow/wctype.h shadow/bits/std_cassert.h shadow/bits/std_cctype.h shadow/bits/std_cerrno.h shadow/bits/std_cfloat.h shadow/bits/std_climits.h shadow/bits/std_clocale.h shadow/bits/std_cmath.h shadow/bits/std_csetjmp.h shadow/bits/std_csignal.h shadow/bits/std_cstdarg.h shadow/bits/std_cstddef.h shadow/bits/std_cstdio.h shadow/bits/std_cstdlib.h shadow/bits/std_cstring.h shadow/bits/std_ctime.h shadow/bits/std_cwchar.h shadow/bits/std_cwctype.h shadow/bits/wrap_libio.h shadow/bits/wrap_iolibio.h shadow/bits/wrap_libioP.h shadow/bits/wrap_iconv.h shadow/bits/wrap_fcntl.h shadow/bits/wrap_pthread.h shadow/sys/cdefs.h
|
||||
base_headers = bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h bits/basic_string.h bits/std_string.h bits/string.tcc bits/generic_shadow.h bits/std_utility.h bits/std_complex.h bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h bits/gslice.h bits/gslice_array.h bits/indirect_array.h bits/exception_support.h bits/std_fstream.h bits/std_iomanip.h bits/ios_base.h bits/fpos.h bits/basic_ios.h bits/basic_ios.tcc bits/std_ios.h bits/std_iosfwd.h bits/std_iostream.h bits/std_istream.h bits/istream.tcc bits/std_locale.h bits/fstream.tcc bits/ostream.tcc bits/sbuf_iter.h bits/sstream.tcc bits/std_ostream.h bits/std_sstream.h bits/std_streambuf.h bits/streambuf.tcc bits/basic_file.h bits/locale_facets.h bits/locale_facets.tcc bits/localefwd.h bits/stl_pthread_alloc.h bits/pthread_allocimpl.h bits/stl_threads.h bits/stl_iterator_base.h backward/algo.h backward/algobase.h backward/alloc.h backward/bvector.h backward/defalloc.h backward/deque.h backward/function.h backward/hash_map.h backward/hash_set.h backward/hashtable.h backward/heap.h backward/iterator.h backward/list.h backward/map.h backward/multimap.h backward/new.h backward/multiset.h backward/pair.h backward/iostream.h backward/rope.h backward/set.h backward/slist.h backward/stack.h backward/tempbuf.h backward/tree.h backward/vector.h backward/fstream.h bits/std_bitset.h bits/std_deque.h bits/std_functional.h bits/std_iterator.h bits/std_list.h bits/std_map.h bits/std_memory.h bits/std_numeric.h bits/std_queue.h bits/std_set.h bits/std_stack.h bits/std_stdexcept.h bits/std_vector.h bits/stl_algo.h bits/stl_algobase.h bits/stl_alloc.h bits/stl_deque.h bits/stl_function.h bits/stl_heap.h bits/stl_iterator.h bits/stl_list.h bits/stl_map.h bits/stl_multimap.h bits/stl_multiset.h bits/stl_numeric.h bits/stl_pair.h bits/stl_queue.h bits/stl_raw_storage_iter.h bits/stl_relops.h bits/stl_set.h bits/stl_stack.h bits/stl_string_fwd.h bits/stl_tempbuf.h bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h bits/type_traits.h bits/stl_range_errors.h bits/std_algorithm.h bits/concept_checks.h bits/container_concepts.h bits/sequence_concepts.h bits/std_strstream.h ext/ropeimpl.h ext/stl_rope.h ext/stl_bvector.h bits/stl_config.h bits/stl_construct.h ext/stl_hashtable.h ext/stl_hash_fun.h ext/hash_map ext/hash_set ext/rope ext/slist ext/tree ext/bvector
|
||||
|
||||
|
||||
std_headers = algorithm bitset cassert cctype cerrno cfloat climits clocale ciso646 cmath complex csetjmp csignal cstdarg cstddef cstdio cstdlib cstring ctime cwchar cwctype deque exception fstream functional iomanip ios iosfwd iostream istream iterator limits list locale map memory new numeric ostream queue set sstream stack stdexcept streambuf string strstream typeinfo utility valarray vector
|
||||
c_base_headers = bits/std_cassert.h bits/std_cctype.h bits/std_cerrno.h bits/std_cfloat.h bits/std_climits.h bits/std_clocale.h bits/std_cmath.h bits/std_csetjmp.h bits/std_csignal.h bits/std_cstdarg.h bits/std_cstddef.h bits/std_cstdio.h bits/std_cstdlib.h bits/std_cstring.h bits/std_ctime.h bits/std_cwchar.h bits/std_cwctype.h
|
||||
|
||||
|
||||
c_shadow_headers = assert.h ctype.h errno.h float.h limits.h locale.h math.h setjmp.h signal.h stdarg.h stddef.h stdio.h stdlib.h string.h time.h wchar.h wctype.h fcntl.h libio.h iolibio.h libioP.h pthread.h iconv.h bits/wrap_libio.h bits/wrap_iolibio.h bits/wrap_libioP.h bits/wrap_iconv.h bits/wrap_fcntl.h bits/wrap_pthread.h sys/cdefs.h
|
||||
|
||||
@GLIBCPP_USE_CSHADOW_TRUE@c_headers = $(c_base_headers) $(c_shadow_headers)
|
||||
@GLIBCPP_USE_CSHADOW_FALSE@c_headers = $(c_base_headers)
|
||||
|
||||
std_headers = algorithm bitset complex deque fstream functional iomanip ios iosfwd iostream istream iterator limits list locale map memory numeric ostream queue set sstream stack stdexcept streambuf string strstream utility valarray vector cassert cctype cerrno cfloat climits clocale ciso646 cmath csetjmp csignal cstdarg cstddef cstdio cstdlib cstring ctime cwchar cwctype
|
||||
|
||||
@GLIBCPP_NEED_LIBIO_TRUE@libio_headers = $(top_srcdir)/libio/_G_config.h $(top_srcdir)/libio/libio.h
|
||||
@GLIBCPP_NEED_LIBIO_FALSE@libio_headers =
|
||||
|
||||
build_headers = $(top_builddir)/bits/std_limits.h $(top_builddir)/bits/c++config.h $(top_builddir)/bits/c++io.h $(top_builddir)/bits/c++threads.h $(top_builddir)/bits/atomicity.h $(top_builddir)/bits/ctype_base.h $(top_builddir)/bits/ctype_noninline.h $(top_builddir)/bits/ctype_inline.h
|
||||
build_headers = $(top_builddir)/bits/std_limits.h $(top_builddir)/bits/c++config.h $(top_builddir)/bits/c++io.h $(top_builddir)/bits/c++threads.h $(top_builddir)/bits/atomicity.h $(top_builddir)/bits/os_defines.h $(top_builddir)/bits/ctype_base.h $(top_builddir)/bits/ctype_noninline.h $(top_builddir)/bits/ctype_inline.h
|
||||
|
||||
|
||||
headers = $(base_headers) $(c_headers)
|
||||
|
||||
sources = limitsMEMBERS.cc cmath.cc complex.cc complexf.cc complexl.cc complex_io.cc stdexcept.cc c++io.cc ios.cc stdstreams.cc strstream.cc locale.cc localename.cc codecvt.cc locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc
|
||||
|
||||
|
||||
wstring_sources = wstring-inst.cc
|
||||
|
||||
VPATH = $(top_srcdir) $(top_srcdir)/src $(GLIBCPP_INCLUDES) $(top_srcdir)/std
|
||||
VPATH = $(top_srcdir) $(top_srcdir)/src $(GLIBCPP_INCLUDE_DIR) $(GLIBCPP_INCLUDE_DIR)/std $(C_INCLUDE_DIR)
|
||||
|
||||
# Actual sources for the distro, but don't build these.
|
||||
#EXTRA_sources = string-inst.cc
|
||||
|
|
@ -439,8 +450,8 @@ install: myinstallheaders
|
|||
myinstallheaders: $(headers:%=$(myincludep)%)
|
||||
if test -z "$(MULTISUBDIR)"; then \
|
||||
for i in $(std_headers); do \
|
||||
echo "$(INSTALL_DATA) $(GLIBCPP_INCLUDES)/std/$$i $(myincludep)"; \
|
||||
$(INSTALL_DATA) $(GLIBCPP_INCLUDES)/std/$$i $(myincludep); \
|
||||
echo "$(INSTALL_DATA) $(GLIBCPP_INCLUDE_DIR)/std/$$i $(myincludep)";\
|
||||
$(INSTALL_DATA) $(GLIBCPP_INCLUDE_DIR)/std/$$i $(myincludep); \
|
||||
done; \
|
||||
for i in $(build_headers); do \
|
||||
echo "$(INSTALL_DATA) $$i $(myincludep)bits/"; \
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#include <bits/std_cstring.h>
|
||||
#include <bits/std_cassert.h>
|
||||
#include <bits/std_limits.h>
|
||||
#include <bits/std_exception.h>
|
||||
#include <exception>
|
||||
#include <bits/std_stdexcept.h>
|
||||
#include <bits/std_locale.h>
|
||||
#include <bits/locale_facets.tcc>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
#include <bits/std_cassert.h>
|
||||
#include <bits/std_cctype.h>
|
||||
#include <bits/std_limits.h>
|
||||
#include <bits/std_exception.h>
|
||||
#include <exception>
|
||||
#include <bits/std_stdexcept.h>
|
||||
#include <bits/std_locale.h>
|
||||
#include <bits/std_istream.h>
|
||||
|
|
|
|||
Loading…
Reference in New Issue