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.


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

6 files changed, 0 insertions, 253 deletions

diff --git a/libstdc++-v3/include/bits/std_exception.h b/libstdc++-v3/include/bits/std_exception.h
deleted file mode 100644
index 0735601891f..00000000000
--- a/libstdc++-v3/include/bits/std_exception.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// 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.
-
-#ifndef _CPP_EXCEPTION
-#define _CPP_EXCEPTION 1
-
-#ifdef __GNUG__
-#pragma GCC system_header
-#include_next <exception>
-#else
-
-#include <bits/stl_config.h>
-
-__STL_BEGIN_NAMESPACE
-
-    // 18.6  Exception handling
-    class exception;
-    class bad_exception;
-     
-    typedef void (*unexpected_handler)();
-    unexpected_handler set_unexpected(unexpected_handler) throw();
-    void unexpected();
-    typedef void (*terminate_handler)();
-    terminate_handler set_terminate(terminate_handler) throw();
-    void terminate();
-    bool uncaught_exception();
-
-    // 18.6.1  Class exception 
-    class exception {
-    public:
-      exception() throw();
-      exception(const exception&) throw();
-      exception& operator=(const exception&) throw();
-      virtual ~exception() throw();
-      virtual const char* what() const throw();
-    };
-
-    // 18.6.2.1  Class bad_exception 
-    class bad_exception : public exception {
-    public:
-      bad_exception() throw();
-      bad_exception(const bad_exception&) throw();
-      bad_exception& operator=(const bad_exception&) throw();
-      virtual ~bad_exception() throw();
-      virtual const char* what() const throw();
-    };
-
-__STL_END_NAMESPACE
-
-#endif /* __GNUG__ */
-
-#endif /* _CPP_EXCEPTION */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/libstdc++-v3/include/bits/std_new.h b/libstdc++-v3/include/bits/std_new.h
deleted file mode 100644
index 2e019a9562d..00000000000
--- a/libstdc++-v3/include/bits/std_new.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// 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.
-
-#ifndef _CPP_NEW
-#define _CPP_NEW 1
-
-#include <bits/c++config.h>
-
-#ifdef __GNUG__
-# pragma GCC system_header
-# include_next <new>
-#else
-
-#include <bits/std_exception.h>
-
-
-// 18.4  Dynamic memory management
-
-__STL_BEGIN_NAMESPACE
-
-    class bad_alloc;
-    struct nothrow_t {};
-    extern const nothrow_t nothrow;
-    typedef void (*new_handler)();
-    new_handler set_new_handler(new_handler) throw();
-
-    class bad_alloc : public exception {
-    public:
-      bad_alloc() throw();
-      bad_alloc(const bad_alloc&) throw();
-      bad_alloc& operator=(const bad_alloc&) throw();
-      virtual ~bad_alloc() throw();
-      virtual const char* what() const throw();
-    };
-
-__STL_END_NAMESPACE
-
-    void* operator new(__STD::size_t) throw(__STD::bad_alloc);
-    void* operator new(__STD::size_t, const __STD::nothrow_t&) throw();
-    void  operator delete(void*) throw();
-    void  operator delete(void*, const __STD::nothrow_t&) throw();
-    void* operator new[](__STD::size_t) throw(__STD::bad_alloc);
-    void* operator new[](__STD::size_t, const __STD::nothrow_t&) throw();
-    void  operator delete[](void*) throw();
-    void  operator delete[](void*, const __STD::nothrow_t&) throw();
-    void* operator new  (__STD::size_t, void*) throw();
-    void* operator new[](__STD::size_t, void*) throw();
-    void  operator delete  (void*, void*) throw();
-    void  operator delete[](void*, void*) throw();
-
-#endif
-
-#endif /* _CPP_NEW */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/libstdc++-v3/include/bits/std_typeinfo.h b/libstdc++-v3/include/bits/std_typeinfo.h
deleted file mode 100644
index b0590121631..00000000000
--- a/libstdc++-v3/include/bits/std_typeinfo.h
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// 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.
-
-
-#ifndef _CPP_TYPEINFO
-#define _CPP_TYPEINFO 1
-
-#include <bits/c++config.h>
-#include <bits/std_exception.h>
-
-#ifdef __GNUG__
-# pragma GCC system_header
-# include_next <typeinfo>
-#else
-
-__STL_BEGIN_NAMESPACE
-
-    class type_info {
-    public:
-      virtual ~type_info();
-      bool operator==(const type_info& rhs) const;
-      bool operator!=(const type_info& rhs) const;
-      bool before(const type_info& rhs) const;
-      const char* name() const;
-    private:
-      type_info(const type_info& rhs);
-      type_info& operator=(const type_info& rhs);
-    };
-
-    class bad_cast : public exception {
-    public:
-      bad_cast() throw();
-      bad_cast(const bad_cast&) throw();
-      bad_cast& operator=(const bad_cast&) throw();
-      virtual ~bad_cast() throw();
-      virtual const char* what() const throw();
-    };
-
-    class bad_typeid : public exception {
-    public:
-      bad_typeid() throw();
-      bad_typeid(const bad_typeid&) throw();
-      bad_typeid& operator=(const bad_typeid&) throw();
-      virtual ~bad_typeid() throw();
-      virtual const char* what() const throw();
-    };
-
-__STL_END_NAMESPACE
-
-#endif
-
-#endif /* _CPP_TYPEINFO */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/libstdc++-v3/include/std/exception b/libstdc++-v3/include/std/exception
deleted file mode 100644
index 06653d17e7e..00000000000
--- a/libstdc++-v3/include/std/exception
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _CPP_EXCEPTION
-#include <bits/std_exception.h>
-#endif
diff --git a/libstdc++-v3/include/std/new b/libstdc++-v3/include/std/new
deleted file mode 100644
index dac53f8e7fc..00000000000
--- a/libstdc++-v3/include/std/new
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _CPP_NEW
-#include <bits/std_new.h>
-#endif
diff --git a/libstdc++-v3/include/std/typeinfo b/libstdc++-v3/include/std/typeinfo
deleted file mode 100644
index 26526f33693..00000000000
--- a/libstdc++-v3/include/std/typeinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _CPP_TYPEINFO
-#include <bits/std_typeinfo.h>
-#endif