From: bkoz Date: Mon, 9 Oct 2000 08:55:06 +0000 (+0000) Subject: 2000-10-10 Benjamin Kosnik X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=812093f24b871092454b9c420dc467ee78fdfeb2;hp=4772ae87296649788e1446ad9a0ba8e79166afdb;p=pf3gnuchains%2Fgcc-fork.git 2000-10-10 Benjamin Kosnik * docs/configopts.html: Edit. * libio/Makefile.am (INCLUDES): Remove duplicates, simplify. * libio/Makefile.in: Regenerate. * libmath/Makefile.am (INCLUDES): Remove duplicates, simplify. * libmath/Makefile.in: Regenerate. * libsupc++/Makefile.am (INCLUDES): Remove duplicate. * libsupc++/Makefile.in: Regenerate. * Makefile.am (AM_MAKEFLAGS): Add GLIBCPP_INCLUDES, TOPLEVEL_INCLUDES, LIBMATH_INCLUDES, LIBIO_INCLUDES, CSHADOW_INCLUDES up here. * Makefile.in: Regenerate. * src/Makefile.am (CSHADOW_INCLUDES): Add include/c_std, include/c for shadow headers. (myinstallheaders): Change glibcpp_includedir to GLIBCPP_INCLUDES. Move GLIBCPP_INCLUDES, TOPLEVEL_INCLUDES, LIBMATH_INCLUDES, LIBIO_INCLUDES, CSHADOW_INCLUDES up Makefile hierarchy. * src/Makefile.in: Regenerate. * include/c: New directory. * include/c/bits/(std_cassert.h, std_cctype.h, std_cerrno.h, std_cfloat.h, std_climits.h, std_clocale.h, std_cmath.h, std_csetjmp.h, std_csignal.h, std_cstdarg.h, std_cstddef.h, std_cstdio.h, std_cstdlib.h, std_cstring.h, std_ctime.h, std_cwchar.h, std_cwctype.h): Add, moving from... * include/bits: ...here. * include/c_std: New directory. * include/c_std/bits/*: Populate from... * shadow: ...here. Remove directory. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36805 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 104aa2c9667..0a77130d853 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,36 @@ +2000-10-10 Benjamin Kosnik + + * docs/configopts.html: Edit. + + * libio/Makefile.am (INCLUDES): Remove duplicates, simplify. + * libio/Makefile.in: Regenerate. + * libmath/Makefile.am (INCLUDES): Remove duplicates, simplify. + * libmath/Makefile.in: Regenerate. + * libsupc++/Makefile.am (INCLUDES): Remove duplicate. + * libsupc++/Makefile.in: Regenerate. + + * Makefile.am (AM_MAKEFLAGS): Add GLIBCPP_INCLUDES, + TOPLEVEL_INCLUDES, LIBMATH_INCLUDES, LIBIO_INCLUDES, + CSHADOW_INCLUDES up here. + * Makefile.in: Regenerate. + * src/Makefile.am (CSHADOW_INCLUDES): Add include/c_std, include/c + for shadow headers. + (myinstallheaders): Change glibcpp_includedir to GLIBCPP_INCLUDES. + Move GLIBCPP_INCLUDES, TOPLEVEL_INCLUDES, LIBMATH_INCLUDES, + LIBIO_INCLUDES, CSHADOW_INCLUDES up Makefile hierarchy. + * src/Makefile.in: Regenerate. + + * include/c: New directory. + * include/c/bits/(std_cassert.h, std_cctype.h, std_cerrno.h, + std_cfloat.h, std_climits.h, std_clocale.h, std_cmath.h, + std_csetjmp.h, std_csignal.h, std_cstdarg.h, std_cstddef.h, + std_cstdio.h, std_cstdlib.h, std_cstring.h, std_ctime.h, + std_cwchar.h, std_cwctype.h): Add, moving from... + * include/bits: ...here. + * include/c_std: New directory. + * include/c_std/bits/*: Populate from... + * shadow: ...here. Remove directory. + 2000-10-08 Benjamin Kosnik * libsupc++/Makefile.am (INCLUDES): Add toplevel include directory. diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am index a4362ace6e6..7803b79f4c2 100644 --- a/libstdc++-v3/Makefile.am +++ b/libstdc++-v3/Makefile.am @@ -52,6 +52,32 @@ CONFIG_CXXFLAGS = \ @SECTION_FLAGS@ @CSHADOWFLAGS@ @DEBUG_FLAGS@ +# Root level of the include sources. +GLIBCPP_INCLUDES = $(top_srcdir)/include + +# Passed down for cross compilers, canadian crosses. +TOPLEVEL_INCLUDES = -I$(includedir) + +LIBMATH_INCLUDES = -I$(top_srcdir)/libmath + +if GLIBCPP_NEED_LIBIO +LIBIO_INCLUDES = \ + -I$(top_builddir)/libio -I$(top_srcdir)/libio +else +LIBIO_INCLUDES = -I$(top_srcdir)/libio +endif + +# 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 + + # Use $(blddir) instead of $(top_builddir) for arguments to "mkcheck" # because then the paths will be full pathnames, not relative # pathnames. (-Wl,--rpath seems to like this better.) @@ -149,10 +175,10 @@ AM_MAKEFLAGS = \ "WERROR=$(WERROR)" \ "OPTIMIZE_CXXFLAGS=$(OPTIMIZE_CXXFLAGS)" \ "WARN_CXXFLAGS=$(WARN_CXXFLAGS)" \ - "CONFIG_CXXFLAGS=$(CONFIG_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)" diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 3637d39c11d..93e69f5ddda 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -128,6 +128,18 @@ WARN_CXXFLAGS = -Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) @WFMT CONFIG_CXXFLAGS = @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOWFLAGS@ @DEBUG_FLAGS@ +# Root level of the include sources. +GLIBCPP_INCLUDES = $(top_srcdir)/include + +# Passed down for cross compilers, canadian crosses. +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 + # Multilib support. MAKEOVERRIDES = @@ -142,7 +154,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)" +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)" ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs diff --git a/libstdc++-v3/docs/configopts.html b/libstdc++-v3/docs/configopts.html index b25b3248c17..ccceac0e04d 100644 --- a/libstdc++-v3/docs/configopts.html +++ b/libstdc++-v3/docs/configopts.html @@ -9,7 +9,7 @@ libstdc++-v3 configure options - + @@ -91,8 +91,9 @@ options

--enable-cshadow-headers -

This turns on the code to construct shadowed C headers. Very - experimental as of this writing. +

This turns on the code to construct shadowed C headers, and to + use c headers in the std:: namespace. Very experimental as of + this writing.

--enable-threads @@ -171,7 +172,7 @@ options

-$Id: configopts.html,v 1.7 2000/08/09 07:33:39 bkoz Exp $ +$Id: configopts.html,v 1.8 2000/08/28 18:41:24 pme Exp $

diff --git a/libstdc++-v3/libio/ChangeLog b/libstdc++-v3/libio/ChangeLog index 97b5733cc73..9b98a21bcee 100644 --- a/libstdc++-v3/libio/ChangeLog +++ b/libstdc++-v3/libio/ChangeLog @@ -1,3 +1,9 @@ +2000-10-08 Benjamin Kosnik + + * Makefile.am (INCLUDES): Simplify. + * libioP.h (JUMP1): If compiling c++, use std headers. + * _G_config.h: Same. + 2000-10-07 Benjamin Kosnik * Makefile.am (CONFIG_INCLUDES): Remove. diff --git a/libstdc++-v3/libio/Makefile.am b/libstdc++-v3/libio/Makefile.am index 3f2960e63ce..977b721facb 100644 --- a/libstdc++-v3/libio/Makefile.am +++ b/libstdc++-v3/libio/Makefile.am @@ -25,22 +25,10 @@ AUTOMAKE_OPTIONS = 1.3 cygnus noinst_LTLIBRARIES = libio.la -# Root level of the include sources. -glibcpp_includedir = $(top_srcdir)/include - -# Passed down for cross compilers, canadian crosses. -TOPLEVEL_INCLUDES = -I$(includedir) - -if GLIBCPP_NEED_LIBIO -LIBIO_INCLUDES = \ - -I$(top_builddir)/libio -I$(top_srcdir)/libio -else -LIBIO_INCLUDES = -endif INCLUDES = \ -nostdinc++ \ - -I$(top_builddir) -I$(glibcpp_includedir) \ + -I$(top_builddir) -I$(GLIBCPP_INCLUDES) \ $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES) libio_headers = \ diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in index 501def3ffd5..6e3ad72bfe2 100644 --- a/libstdc++-v3/libio/Makefile.in +++ b/libstdc++-v3/libio/Makefile.in @@ -105,15 +105,7 @@ AUTOMAKE_OPTIONS = 1.3 cygnus noinst_LTLIBRARIES = libio.la -# Root level of the include sources. -glibcpp_includedir = $(top_srcdir)/include - -# Passed down for cross compilers, canadian crosses. -TOPLEVEL_INCLUDES = -I$(includedir) -@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_INCLUDES = -I$(top_builddir)/libio -I$(top_srcdir)/libio -@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_INCLUDES = - -INCLUDES = -nostdinc++ -I$(top_builddir) -I$(glibcpp_includedir) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES) +INCLUDES = -nostdinc++ -I$(top_builddir) -I$(GLIBCPP_INCLUDES) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES) libio_headers = libio.h libioP.h iolibio.h diff --git a/libstdc++-v3/libio/_G_config.h b/libstdc++-v3/libio/_G_config.h index a0415f6482c..6e5ab157c98 100644 --- a/libstdc++-v3/libio/_G_config.h +++ b/libstdc++-v3/libio/_G_config.h @@ -16,7 +16,11 @@ #define __need_wchar_t #define __need_wint_t #define __need_NULL -#include +#ifdef __cplusplus +# include +#else +# include +#endif #ifndef _WINT_T @@ -72,19 +76,6 @@ typedef __off64_t _G_fpos64_t; #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T # include typedef iconv_t _G_iconv_t; -# if 0 -/* XXX Commented out because outside glibc we have to use iconv() - and not gconv(). */ -typedef union -{ - struct __gconv_info __cd; - struct - { - struct __gconv_info __cd; - struct __gconv_step_data __data; - } __combined; -} _G_iconv_t; -# endif #endif typedef int _G_int16_t __attribute__ ((__mode__ (__HI__))); @@ -137,3 +128,4 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__))); #endif #endif /* _G_config.h */ + diff --git a/libstdc++-v3/libmath/Makefile.am b/libstdc++-v3/libmath/Makefile.am index 0421f967b0b..46933d4e9f9 100644 --- a/libstdc++-v3/libmath/Makefile.am +++ b/libstdc++-v3/libmath/Makefile.am @@ -50,8 +50,7 @@ libmath_la_SOURCES = \ LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -TOPLEVEL_INCLUDES = -I$(includedir) -INCLUDES = -I../include $(TOPLEVEL_INCLUDES) +INCLUDES = -I$(GLIBCPP_INCLUDES) $(TOPLEVEL_INCLUDES) diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in index 1bcf7199a53..eaa56c8ed5f 100644 --- a/libstdc++-v3/libmath/Makefile.in +++ b/libstdc++-v3/libmath/Makefile.in @@ -121,8 +121,7 @@ libmath_la_SOURCES = signbit.c signbitf.c cabs.c cabsf.c LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -TOPLEVEL_INCLUDES = -I$(includedir) -INCLUDES = -I../include $(TOPLEVEL_INCLUDES) +INCLUDES = -I$(GLIBCPP_INCLUDES) $(TOPLEVEL_INCLUDES) mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index 3fc12f94de6..87693567137 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -41,12 +41,12 @@ toolexeclib_LTLIBRARIES = libsupc++.la # 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a noinst_LTLIBRARIES = libsupc++convenience.la -# Root level of the include sources. -glibcpp_includedir = $(top_srcdir)/include + +LIBSUPCXX_INCLUDES = -I$(top_srcdir)/libsupc++/include INCLUDES = \ -I$(top_srcdir)/../gcc -I$(top_srcdir)/../include \ - -I$(top_srcdir)/libsupc++/include -I$(glibcpp_includedir) \ + $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDES) \ $(CONFIG_INCLUDES) headers = \ diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 1b93a771717..526843b1bec 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -113,10 +113,9 @@ toolexeclib_LTLIBRARIES = libsupc++.la # 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a noinst_LTLIBRARIES = libsupc++convenience.la -# Root level of the include sources. -glibcpp_includedir = $(top_srcdir)/include +LIBSUPCXX_INCLUDES = -I$(top_srcdir)/libsupc++/include -INCLUDES = -I$(top_srcdir)/../gcc -I$(top_srcdir)/../include -I$(top_srcdir)/libsupc++/include -I$(glibcpp_includedir) $(CONFIG_INCLUDES) +INCLUDES = -I$(top_srcdir)/../gcc -I$(top_srcdir)/../include $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDES) $(CONFIG_INCLUDES) headers = include/cxxabi.h include/exception include/new include/new.h include/typeinfo diff --git a/libstdc++-v3/shadow/assert.h b/libstdc++-v3/shadow/assert.h deleted file mode 100644 index 3507bdf449a..00000000000 --- a/libstdc++-v3/shadow/assert.h +++ /dev/null @@ -1,51 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999 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. - - -// no include guard here. -#ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _ASSERT_NEED_C_LEGACY_ -#endif - -#include - - // expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - -#ifdef _ASSERT_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _ASSERT_NEED_C_LEGACY_ -#endif /* _ASSERT_NEED_C_LEGACY_ */ diff --git a/libstdc++-v3/shadow/ctype.h b/libstdc++-v3/shadow/ctype.h deleted file mode 100644 index 7dcea803ab5..00000000000 --- a/libstdc++-v3/shadow/ctype.h +++ /dev/null @@ -1,68 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_CTYPE_H_ -# define _INCLUDED_CPP_CTYPE_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" -#error ctype.h - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _CTYPE_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using std::isalnum; - using std::isalpha; - using std::iscntrl; - using std::isdigit; - using std::isgraph; - using std::islower; - using std::isprint; - using std::ispunct; - using std::isspace; - using std::isupper; - using std::isxdigit; - using std::tolower; - using std::toupper; - -# ifdef _CTYPE_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _CTYPE_NEED_C_LEGACY_ -# endif /* _CTYPE_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_CTYPE_H_ */ diff --git a/libstdc++-v3/shadow/errno.h b/libstdc++-v3/shadow/errno.h deleted file mode 100644 index f2e6aee6701..00000000000 --- a/libstdc++-v3/shadow/errno.h +++ /dev/null @@ -1,55 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_ERRNO_H_ -# define _INCLUDED_CPP_ERRNO_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _ERRNO_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using std::errno; - -# ifdef _ERRNO_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _ERRNO_NEED_C_LEGACY_ -# endif /* _ERRNO_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_ERRNO_H_ */ diff --git a/libstdc++-v3/shadow/fcntl.h b/libstdc++-v3/shadow/fcntl.h deleted file mode 100644 index f19a1549274..00000000000 --- a/libstdc++-v3/shadow/fcntl.h +++ /dev/null @@ -1,63 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_FCNTL_H_ -# define _INCLUDED_CPP_FCNTL_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _FCNTL_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using _C_legacy::flock; - - using _C_legacy::creat; - using _C_legacy::open; - using _C_legacy::fcntl; - -# ifdef _FCNTL_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _FCNTL_NEED_C_LEGACY_ -# endif /* _FCNTL_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_FCNTL_H_ */ - - - - diff --git a/libstdc++-v3/shadow/float.h b/libstdc++-v3/shadow/float.h deleted file mode 100644 index f52c5f5c9eb..00000000000 --- a/libstdc++-v3/shadow/float.h +++ /dev/null @@ -1,54 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_FLOAT_H_ -# define _INCLUDED_CPP_FLOAT_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _FLOAT_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - -# ifdef _FLOAT_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _FLOAT_NEED_C_LEGACY_ -# endif /* _FLOAT_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_FLOAT_H_ */ diff --git a/libstdc++-v3/shadow/iconv.h b/libstdc++-v3/shadow/iconv.h deleted file mode 100644 index 1ea5038c24a..00000000000 --- a/libstdc++-v3/shadow/iconv.h +++ /dev/null @@ -1,66 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 2000 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 _INCLUDED_CPP_ICONV_H_ -# define _INCLUDED_CPP_ICONV_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _ICONV_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - - // NB: Cannot use typedefs here to inject the names as the "C" headers - // often include typedefs that include the keyword 'struct' - using _C_legacy::iconv_t; - - using _C_legacy::iconv_open; - using _C_legacy::iconv; - using _C_legacy::iconv_close; - -# ifdef _ICONV_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _ICONV_NEED_C_LEGACY_ -# endif /* _ICONV_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_ICONV_H_ */ - - - - diff --git a/libstdc++-v3/shadow/iolibio.h b/libstdc++-v3/shadow/iolibio.h deleted file mode 100644 index 845f6403594..00000000000 --- a/libstdc++-v3/shadow/iolibio.h +++ /dev/null @@ -1,58 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 2000 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 _INCLUDED_CPP_IOLIBIO_H_ -# define _INCLUDED_CPP_IOLIBIO_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _IOLIBIO_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - -# ifdef _IOLIBIO_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _IOLIBIO_NEED_C_LEGACY_ -# endif /* _IOLIBIO_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_IOLIBIO_H_ */ - - - - diff --git a/libstdc++-v3/shadow/libio.h b/libstdc++-v3/shadow/libio.h deleted file mode 100644 index 2cafc7d88eb..00000000000 --- a/libstdc++-v3/shadow/libio.h +++ /dev/null @@ -1,81 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 2000 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 _INCLUDED_CPP_LIBIO_H_ -# define _INCLUDED_CPP_LIBIO_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _LIBIO_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - - // NB: Cannot use typedefs here to inject the names as the "C" headers - // often include typedefs that include the keyword 'struct' - using _C_legacy::_IO_pos_t; - using _C_legacy::_IO_fpos_t; - using _C_legacy::_IO_fpos64_t; - using _C_legacy::_IO_size_t; - using _C_legacy::_IO_ssize_t; - using _C_legacy::_IO_off_t; - using _C_legacy::_IO_off64_t; - using _C_legacy::_IO_pid_t; - using _C_legacy::_IO_uid_t; - using _C_legacy::_IO_iconv_t; - using _C_legacy::_IO_va_list; - using _C_legacy::_IO_wint_t; - using _C_legacy::_IO_lock_t; - - using _C_legacy::_IO_marker; - using _C_legacy::_IO_codecvt; - using _C_legacy::_IO_wide_data; - using _C_legacy::_IO_FILE; - using _C_legacy::_IO_cookie_io_functions_t; - using _C_legacy::_IO_cookie_file; - -# ifdef _LIBIO_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _LIBIO_NEED_C_LEGACY_ -# endif /* _LIBIO_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_LIBIO_H_ */ - - - - diff --git a/libstdc++-v3/shadow/libioP.h b/libstdc++-v3/shadow/libioP.h deleted file mode 100644 index da3e716768f..00000000000 --- a/libstdc++-v3/shadow/libioP.h +++ /dev/null @@ -1,64 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 2000 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 _INCLUDED_CPP_LIBIOP_H_ -# define _INCLUDED_CPP_LIBIOP_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _LIBIOP_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using _C_legacy::_IO_jump_t; - using _C_legacy::_IO_FILE_plus; - using _C_legacy::_IO_cookie_file; - - using _C_legacy::_IO_file_jumps; - using _C_legacy::_IO_wfile_jumps; - -# ifdef _LIBIOP_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _LIBIOP_NEED_C_LEGACY_ -# endif /* _LIBIOP_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_LIBIOP_H_ */ - - - - diff --git a/libstdc++-v3/shadow/limits.h b/libstdc++-v3/shadow/limits.h deleted file mode 100644 index 26aa771f2d5..00000000000 --- a/libstdc++-v3/shadow/limits.h +++ /dev/null @@ -1,54 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_LIMITS_H_ -# define _INCLUDED_CPP_LIMITS_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _LIMITS_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - -# ifdef _LIMITS_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _LIMITS_NEED_C_LEGACY_ -# endif /* _LIMITS_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_LIMITS_H_ */ diff --git a/libstdc++-v3/shadow/locale.h b/libstdc++-v3/shadow/locale.h deleted file mode 100644 index 1d5f529ed89..00000000000 --- a/libstdc++-v3/shadow/locale.h +++ /dev/null @@ -1,57 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_LOCALE_H_ -# define _INCLUDED_CPP_LOCALE_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _LOCALE_NEED_C_LEGACY_ -#endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using std::lconv; - using std::setlocale; - using std::localeconv; - -# ifdef _LOCALE_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _LOCALE_NEED_C_LEGACY_ -# endif /* _LOCALE_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_LOCALE_H_ */ diff --git a/libstdc++-v3/shadow/math.h b/libstdc++-v3/shadow/math.h deleted file mode 100644 index f2ec04af671..00000000000 --- a/libstdc++-v3/shadow/math.h +++ /dev/null @@ -1,131 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_MATH_H_ -# define _INCLUDED_CPP_MATH_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _MATH_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using std::abs; - using std::acos; - using std::asin; - using std::atan; - using std::atan2; - using std::cos; - using std::sin; - using std::tan; - using std::cosh; - using std::sinh; - using std::tanh; - using std::exp; - using std::frexp; - using std::ldexp; - using std::log; - using std::log10; - using std::modf; - using std::pow; - using std::sqrt; - using std::ceil; - using std::fabs; - using std::floor; - using std::fmod; - - // From ISO/IEC 9899:1999 - using std::absf; - using std::acosf; - using std::asinf; - using std::atanf; - using std::atan2f; - using std::cosf; - using std::sinf; - using std::tanf; - using std::coshf; - using std::sinhf; - using std::tanhf; - using std::expf; - using std::frexpf; - using std::ldexpf; - using std::logf; - using std::log10f; - using std::modff; - using std::powf; - using std::sqrtf; - using std::ceilf; - using std::fabsf; - using std::floorf; - using std::fmodf; - - // From ISO/IEC 9899:1999 - using std::absl; - using std::acosl; - using std::asinl; - using std::atanl; - using std::atan2l; - using std::cosl; - using std::sinl; - using std::tanl; - using std::coshl; - using std::sinhl; - using std::tanhl; - using std::expl; - using std::frexpl; - using std::ldexpl; - using std::logl; - using std::log10l; - using std::modfl; - using std::powl; - using std::sqrtl; - using std::ceill; - using std::fabsl; - using std::floorl; - using std::fmodl; - -# ifdef _MATH_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _MATH_NEED_C_LEGACY_ -# endif /* _MATH_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_MATH_H_ */ - - - - diff --git a/libstdc++-v3/shadow/pthread.h b/libstdc++-v3/shadow/pthread.h deleted file mode 100644 index 8692d3e52d4..00000000000 --- a/libstdc++-v3/shadow/pthread.h +++ /dev/null @@ -1,86 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 2000 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 _INCLUDED_CPP_PTHREAD_H_ -# define _INCLUDED_CPP_PTHREAD_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _PTHREAD_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using _C_legacy::__sched_param; - - using _C_legacy::pthread_attr_t; - using _C_legacy::pthread_cond_t; - using _C_legacy::pthread_condattr_t; - using _C_legacy::pthread_key_t; - using _C_legacy::pthread_mutex_t; - using _C_legacy::pthread_mutexattr_t; - using _C_legacy::pthread_once_t; - using _C_legacy::pthread_rwlock_t; - using _C_legacy::pthread_rwlockattr_t; - using _C_legacy::pthread_t; - - using _C_legacy::pthread_mutex_init; - using _C_legacy::pthread_mutex_destroy; - using _C_legacy::pthread_mutex_lock; - using _C_legacy::pthread_mutex_trylock; - using _C_legacy::pthread_mutex_unlock; - using _C_legacy::pthread_mutexattr_init; - using _C_legacy::pthread_mutexattr_destroy; - using _C_legacy::pthread_mutexattr_settype; - using _C_legacy::pthread_mutexattr_gettype; - using _C_legacy::pthread_key_create; - using _C_legacy::pthread_key_delete; - using _C_legacy::pthread_setspecific; - using _C_legacy::pthread_getspecific; - using _C_legacy::pthread_once; - using _C_legacy::pthread_atfork; - -# ifdef _PTHREAD_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _PTHREAD_NEED_C_LEGACY_ -# endif /* _PTHREAD_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_PTHREAD_H_ */ - - - - diff --git a/libstdc++-v3/shadow/setjmp.h b/libstdc++-v3/shadow/setjmp.h deleted file mode 100644 index c4061e871db..00000000000 --- a/libstdc++-v3/shadow/setjmp.h +++ /dev/null @@ -1,56 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_SETJMP_H_ -# define _INCLUDED_CPP_SETJMP_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _SETJMP_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using std::jmp_buf; - using std::longjmp; - -# ifdef _SETJMP_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _SETJMP_NEED_C_LEGACY_ -# endif /* _SETJMP_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_SETJMP_H_ */ diff --git a/libstdc++-v3/shadow/signal.h b/libstdc++-v3/shadow/signal.h deleted file mode 100644 index 819ddf22f32..00000000000 --- a/libstdc++-v3/shadow/signal.h +++ /dev/null @@ -1,58 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_SIGNAL_H_ -# define _INCLUDED_CPP_SIGNAL_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _SIGNAL_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using std::sig_atomic_t; - - using std::raise; - using std::signal; - -# ifdef _SIGNAL_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _SIGNAL_NEED_C_LEGACY_ -# endif /* _SIGNAL_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_SIGNAL_H_ */ diff --git a/libstdc++-v3/shadow/stdarg.h b/libstdc++-v3/shadow/stdarg.h deleted file mode 100644 index cb32feca7d6..00000000000 --- a/libstdc++-v3/shadow/stdarg.h +++ /dev/null @@ -1,55 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_STDARG_H_ -# define _INCLUDED_CPP_STDARG_H_ 1 - -#ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _STDARG_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using std::va_list; - -# ifdef _STDARG_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _STDARG_NEED_C_LEGACY_ -# endif /* _STDARG_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_STDARG_H_ */ diff --git a/libstdc++-v3/shadow/stddef.h b/libstdc++-v3/shadow/stddef.h deleted file mode 100644 index 03d5896779e..00000000000 --- a/libstdc++-v3/shadow/stddef.h +++ /dev/null @@ -1,60 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_STDDEF_H_ -# define _INCLUDED_CPP_STDDEF_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _STDDEF_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using std::ptrdiff_t; - using std::size_t; - -# ifdef _STDDEF_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _STDDEF_NEED_C_LEGACY_ -# endif /* _STDDEF_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_STDDEF_H_ */ - - - - diff --git a/libstdc++-v3/shadow/stdio.h b/libstdc++-v3/shadow/stdio.h deleted file mode 100644 index c3a43b736c2..00000000000 --- a/libstdc++-v3/shadow/stdio.h +++ /dev/null @@ -1,97 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_STDIO_H_ -# define _INCLUDED_CPP_STDIO_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _STDIO_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using std::FILE; - using std::fpos_t; - - using std::remove; - using std::rename; - using std::tmpfile; - using std::tmpnam; - using std::fclose; - using std::fflush; - using std::fopen; - using std::freopen; - using std::setbuf; - using std::setvbuf; - using std::fprintf; - using std::fscanf; - using std::printf; - using std::scanf; - using std::sprintf; - using std::sscanf; - using std::vfprintf; - using std::vprintf; - using std::vsprintf; - using std::fgetc; - using std::fgets; - using std::fputc; - using std::fputs; - using std::getc; - using std::getchar; - using std::gets; - using std::putc; - using std::putchar; - using std::puts; - using std::ungetc; - using std::fread; - using std::fwrite; - using std::fgetpos; - using std::fseek; - using std::fsetpos; - using std::ftell; - using std::rewind; - using std::clearerr; - using std::feof; - using std::ferror; - using std::perror; - -# ifdef _STDIO_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _STDIO_NEED_C_LEGACY_ -# endif /* _STDIO_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_STDIO_H_ */ diff --git a/libstdc++-v3/shadow/stdlib.h b/libstdc++-v3/shadow/stdlib.h deleted file mode 100644 index bc5dcc96743..00000000000 --- a/libstdc++-v3/shadow/stdlib.h +++ /dev/null @@ -1,95 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_STDLIB_H_ -# define _INCLUDED_CPP_STDLIB_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _STDLIB_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using std::div_t; - using std::ldiv_t; -#ifdef _GLIBCPP_USE_LONG_LONG - using std::lldiv_t; -#endif - - using std::abort; - using std::abs; - using std::atexit; - using std::atof; - using std::atoi; - using std::atol; - using std::bsearch; - using std::calloc; - using std::div; - using std::exit; - using std::free; - using std::getenv; - using std::labs; - using std::ldiv; - using std::malloc; - using std::mblen; - using std::mbstowcs; - using std::mbtowc; - using std::qsort; - using std::rand; - using std::realloc; - using std::srand; - using std::strtod; - using std::strtol; - using std::strtoul; - using std::system; - using std::wcstombs; - using std::wctomb; - -#ifdef _GLIBCPP_USE_LONG_LONG - using std::strtoll; - using std::strtoull; - using std::strtof; - using std::strtold; -#endif - -# ifdef _STDLIB_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _STDLIB_NEED_C_LEGACY_ -# endif /* _STDLIB_NEED_C__LEGACY_ */ -#endif /* _INCLUDED_CPP_STDLIB_H_ */ diff --git a/libstdc++-v3/shadow/string.h b/libstdc++-v3/shadow/string.h deleted file mode 100644 index 6f9e6cc6372..00000000000 --- a/libstdc++-v3/shadow/string.h +++ /dev/null @@ -1,76 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_STRING_H_ -# define _INCLUDED_CPP_STRING_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _STRING_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using std::memcpy; - using std::memmove; - using std::strcpy; - using std::strncpy; - using std::strcat; - using std::strncat; - using std::memcmp; - using std::strcmp; - using std::strcoll; - using std::strncmp; - using std::strxfrm; - using std::memchr; - using std::strchr; - using std::strcspn; - using std::strpbrk; - using std::strrchr; - using std::strspn; - using std::strstr; - using std::strtok; - using std::memset; - using std::strerror; - using std::strlen; - -# ifdef _STRING_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _STRING_NEED_C_LEGACY_ -# endif /* _STRING_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_STRING_H_ */ diff --git a/libstdc++-v3/shadow/time.h b/libstdc++-v3/shadow/time.h deleted file mode 100644 index 31064aaa135..00000000000 --- a/libstdc++-v3/shadow/time.h +++ /dev/null @@ -1,67 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_TIME_H_ -# define _INCLUDED_CPP_TIME_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _TIME_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using std::clock_t; - using std::time_t; - using std::tm; - - using std::clock; - using std::difftime; - using std::mktime; - using std::time; - using std::asctime; - using std::ctime; - using std::gmtime; - using std::localtime; - using std::strftime; - -# ifdef _TIME_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _TIME_NEED_C_LEGACY_ -# endif /* _TIME_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_TIME_H_ */ diff --git a/libstdc++-v3/shadow/wchar.h b/libstdc++-v3/shadow/wchar.h deleted file mode 100644 index efabb1519a5..00000000000 --- a/libstdc++-v3/shadow/wchar.h +++ /dev/null @@ -1,131 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_WCHAR_H_ -# define _INCLUDED_CPP_WCHAR_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ /* sub-included by a C header */ -# define _WCHAR_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using std::wchar_t; - using std::wint_t; - using std::mbstate_t; - -#if 0 - using std::fwprintf; - using std::fwscanf; - using std::swprintf; - using std::swscanf; - using std::vfwprintf; - using std::vfwscanf; - using std::vswprintf; - using std::vswscanf; - using std::vwprintf; - using std::vwscanf; - using std::wprintf; - using std::wscanf; - using std::fgetwc; - using std::fgetws; - using std::fputwc; - using std::fputws; - using std::fwide; - using std::getwc; - using std::getwchar; - using std::putwc; - using std::putwchar; - using std::ungetwc; -#endif - - using std::wcstod; - using std::wcstof; - using std::wcstold; - using std::wcstol; - using std::wcstoll; - using std::wcstoul; - using std::wcstoull; - using std::wcscpy; - using std::wcsncpy; - using std::wcscat; - using std::wcsncat; - -#if 0 - using std::wcsmp; -#endif - - using std::wcscoll; - using std::wcsncmp; - using std::wcsxfrm; - using std::wcschr; - using std::wcscspn; - using std::wcslen; - using std::wcspbrk; - using std::wcsrchr; - using std::wcsspn; - using std::wcsstr; - using std::wcstok; - using std::wmemchr; - using std::wmemcmp; - using std::wmemcpy; - using std::wmemmove; - using std::wmemset; - -#if 0 - using std::wcsftime; -#endif - - using std::btowc; - using std::wctob; - using std::mbsinit; - using std::mbrlen; - using std::mbrtowc; - using std::wcrtomb; - using std::mbsrtowcs; - using std::wcsrtombs; - -# ifdef _WCHAR_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _WCHAR_NEED_C_LEGACY_ -# endif /* _WCHAR_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_WCHAR_H_ */ - - - diff --git a/libstdc++-v3/shadow/wctype.h b/libstdc++-v3/shadow/wctype.h deleted file mode 100644 index cae1aff43e1..00000000000 --- a/libstdc++-v3/shadow/wctype.h +++ /dev/null @@ -1,74 +0,0 @@ -// -*- C++ -*- header wrapper. - -// Copyright (C) 1997-1999, 2000 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 _INCLUDED_CPP_CWCTYPE_H_ -# define _INCLUDED_CPP_CWCTYPE_H_ 1 - -# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ - // get out of the "legacy" - } // close extern "C" - } // close namespace _C_legacy:: -# undef _IN_C_LEGACY_ -# define _CWCHAR_NEED_C_LEGACY_ -# endif - -# include - - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using std::wint_t; - using std::wctype_t; - using std::wctrans_t; - using std::iswalpha; - using std::iswupper; - using std::iswlower; - using std::iswdigit; - using std::iswxdigit; - using std::iswalnum; - using std::iswspace; - using std::iswpunct; - using std::iswprint; - using std::iswgraph; - using std::iswcntrl; - using std::iswctype; - using std::towctrans; - using std::towlower; - using std::towupper; - using std::wctrans; - using std::wctype; - -# ifdef _CWCHAR_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _CWCHAR_NEED_C_LEGACY_ -# endif /* _CWCHAR_NEED_C_LEGACY_ */ -#endif /* _INCLUDED_CPP_CWCTYPE_H_ */ diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 3a5f9999d91..f7873945d04 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -21,7 +21,7 @@ ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## USA. -## $Id: Makefile.am,v 1.35 2000/10/07 01:05:37 bkoz Exp $ +## $Id: Makefile.am,v 1.36 2000/10/07 18:54:08 bkoz Exp $ AUTOMAKE_OPTIONS = 1.3 gnits MAINT_CHARSET = latin1 @@ -35,69 +35,16 @@ toolexecdir = $(exec_prefix)/$(target_alias) toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) endif + toolexeclib_LTLIBRARIES = libstdc++.la EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la -# AM_CXXFLAGS needs to be in each subdirectory so that it can be -# modified in a per-library or per-sub-library way. -# Need to manually set this option because CONFIG_CXXFLAGS has to be at -# the end of the compile line so that -O2 can be overridden as the -# occasion call for it. (ie, --enable-debug) -AM_CXXFLAGS = \ - -fno-implicit-templates \ - $(WARN_CXXFLAGS) \ - $(OPTIMIZE_CXXFLAGS) \ - $(CONFIG_CXXFLAGS) - -# Need to explicitly set this so that AM_CXXFLAGS is last. In -# addition, we don't use $(DEFS), which tries to set $(top_srcdir) as -# an include diretory, which screws up shadow headers. (That way, -# things like -O2 passed down from the toplevel can be overridden by -# --enable-debug.) -CXXCOMPILE = $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(CXXFLAGS) $(AM_CXXFLAGS) - -LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) - -# We have a problem when building the shared libstdc++ object if the -# rules automake generates would be used. We cannot allow CXX to be used -# in libtool since this would add -lstdc++ to the link line which of -# course is impossible. -CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ - - -# Root level of the include sources. -glibcpp_includedir = $(top_srcdir)/include - -# Passed down for cross compilers, canadian crosses. -TOPLEVEL_INCLUDES = -I$(includedir) - -LIBMATH_INCLUDES = -I$(top_srcdir)/libmath - -if GLIBCPP_NEED_LIBIO -LIBIO_INCLUDES = \ - -I$(top_builddir)/libio -I$(top_srcdir)/libio -else -LIBIO_INCLUDES = -I$(top_srcdir)/libio -endif - -if GLIBCPP_USE_CSHADOW -#CSHADOW_INCLUDES = \ -# -I$(glibcpp_includedir)/std -I$(top_srcdir)/shadow -I$(top_builddir)/cshadow -CSHADOW_INCLUDES = \ - -I$(glibcpp_includedir)/std -I$(top_srcdir)/shadow -else -CSHADOW_INCLUDES = -endif - INCLUDES = \ -D_GNU_SOURCE -D_ISOC99_SOURCE -nostdinc++ $(CSHADOW_INCLUDES) \ - -I$(top_builddir) -I$(glibcpp_includedir) \ - $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) \ - $(TOPLEVEL_INCLUDES) - + -I$(top_builddir) -I$(GLIBCPP_INCLUDES) \ + $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) \ + $(TOPLEVEL_INCLUDES) headers = \ bits/std_cctype.h \ @@ -211,7 +158,7 @@ wstring_sources = \ wstring-inst.cc VPATH += $(top_srcdir) $(top_srcdir)/src -VPATH += $(glibcpp_includedir) $(top_srcdir)/std +VPATH += $(GLIBCPP_INCLUDES) $(top_srcdir)/std # Actual sources for the distro, but don't build these. @@ -261,8 +208,8 @@ install: myinstallheaders myinstallheaders: $(headers:%=$(myincludep)%) if test -z "$(MULTISUBDIR)"; then \ for i in $(std_headers); do \ - echo "$(INSTALL_DATA) $(glibcpp_includedir)/std/$$i $(myincludep)"; \ - $(INSTALL_DATA) $(glibcpp_includedir)/std/$$i $(myincludep); \ + echo "$(INSTALL_DATA) $(GLIBCPP_INCLUDES)/std/$$i $(myincludep)"; \ + $(INSTALL_DATA) $(GLIBCPP_INCLUDES)/std/$$i $(myincludep); \ done; \ for i in $(build_headers); do \ echo "$(INSTALL_DATA) $$i $(myincludep)bits/"; \ @@ -325,6 +272,33 @@ tmp-libstdc++.INC: Makefile echo -I$(top_builddir) $(INCLUDES) > $@ +# AM_CXXFLAGS needs to be in each subdirectory so that it can be +# modified in a per-library or per-sub-library way. +# Need to manually set this option because CONFIG_CXXFLAGS has to be at +# the end of the compile line so that -O2 can be overridden as the +# occasion call for it. (ie, --enable-debug) +AM_CXXFLAGS = \ + -fno-implicit-templates \ + $(WARN_CXXFLAGS) \ + $(OPTIMIZE_CXXFLAGS) \ + $(CONFIG_CXXFLAGS) + +# Need to explicitly set this so that AM_CXXFLAGS is last. In +# addition, we don't use $(DEFS), which tries to set $(top_srcdir) as +# an include diretory, which screws up shadow headers. (That way, +# things like -O2 passed down from the toplevel can be overridden by +# --enable-debug.) +CXXCOMPILE = $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(CXXFLAGS) $(AM_CXXFLAGS) + +LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) + +# We have a problem when building the shared libstdc++ object if the +# rules automake generates would be used. We cannot allow CXX to be used +# in libtool since this would add -lstdc++ to the link line which of +# course is impossible. +CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 176e8e75aa0..a354b387c75 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -109,44 +109,7 @@ MAINT_CHARSET = latin1 toolexeclib_LTLIBRARIES = libstdc++.la EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la -# AM_CXXFLAGS needs to be in each subdirectory so that it can be -# modified in a per-library or per-sub-library way. -# Need to manually set this option because CONFIG_CXXFLAGS has to be at -# the end of the compile line so that -O2 can be overridden as the -# occasion call for it. (ie, --enable-debug) -AM_CXXFLAGS = -fno-implicit-templates $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) - - -# Need to explicitly set this so that AM_CXXFLAGS is last. In -# addition, we don't use $(DEFS), which tries to set $(top_srcdir) as -# an include diretory, which screws up shadow headers. (That way, -# things like -O2 passed down from the toplevel can be overridden by -# --enable-debug.) -CXXCOMPILE = $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) - - -LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) - - -# We have a problem when building the shared libstdc++ object if the -# rules automake generates would be used. We cannot allow CXX to be used -# in libtool since this would add -lstdc++ to the link line which of -# course is impossible. -CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ - -# Root level of the include sources. -glibcpp_includedir = $(top_srcdir)/include - -# Passed down for cross compilers, canadian crosses. -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_includedir)/std -I$(top_srcdir)/shadow -@GLIBCPP_USE_CSHADOW_FALSE@CSHADOW_INCLUDES = - -INCLUDES = -D_GNU_SOURCE -D_ISOC99_SOURCE -nostdinc++ $(CSHADOW_INCLUDES) -I$(top_builddir) -I$(glibcpp_includedir) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) $(TOPLEVEL_INCLUDES) +INCLUDES = -D_GNU_SOURCE -D_ISOC99_SOURCE -nostdinc++ $(CSHADOW_INCLUDES) -I$(top_builddir) -I$(GLIBCPP_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) $(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 @@ -165,7 +128,7 @@ sources = limitsMEMBERS.cc cmath.cc complex.cc complexf.cc complexl.cc compl wstring_sources = wstring-inst.cc -VPATH = $(top_srcdir) $(top_srcdir)/src $(glibcpp_includedir) $(top_srcdir)/std +VPATH = $(top_srcdir) $(top_srcdir)/src $(GLIBCPP_INCLUDES) $(top_srcdir)/std # Actual sources for the distro, but don't build these. #EXTRA_sources = string-inst.cc @@ -187,6 +150,31 @@ libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD) # statically decide which headers to install. So we have our own special # installation routine here. myincludep = $(DESTDIR)$(includedir)/g++-v3/ + +# AM_CXXFLAGS needs to be in each subdirectory so that it can be +# modified in a per-library or per-sub-library way. +# Need to manually set this option because CONFIG_CXXFLAGS has to be at +# the end of the compile line so that -O2 can be overridden as the +# occasion call for it. (ie, --enable-debug) +AM_CXXFLAGS = -fno-implicit-templates $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) + + +# Need to explicitly set this so that AM_CXXFLAGS is last. In +# addition, we don't use $(DEFS), which tries to set $(top_srcdir) as +# an include diretory, which screws up shadow headers. (That way, +# things like -O2 passed down from the toplevel can be overridden by +# --enable-debug.) +CXXCOMPILE = $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) + + +LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) + + +# We have a problem when building the shared libstdc++ object if the +# rules automake generates would be used. We cannot allow CXX to be used +# in libtool since this would add -lstdc++ to the link line which of +# course is impossible. +CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -451,8 +439,8 @@ install: myinstallheaders myinstallheaders: $(headers:%=$(myincludep)%) if test -z "$(MULTISUBDIR)"; then \ for i in $(std_headers); do \ - echo "$(INSTALL_DATA) $(glibcpp_includedir)/std/$$i $(myincludep)"; \ - $(INSTALL_DATA) $(glibcpp_includedir)/std/$$i $(myincludep); \ + echo "$(INSTALL_DATA) $(GLIBCPP_INCLUDES)/std/$$i $(myincludep)"; \ + $(INSTALL_DATA) $(GLIBCPP_INCLUDES)/std/$$i $(myincludep); \ done; \ for i in $(build_headers); do \ echo "$(INSTALL_DATA) $$i $(myincludep)bits/"; \