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@36833 138bc75d-0d04-0410-961f-82ee72b054a4

9 files changed, 15 insertions, 16 deletions

diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
index 1df9114ce4c..6f4ae6a23da 100644
--- a/libstdc++-v3/include/bits/locale_facets.h
+++ b/libstdc++-v3/include/bits/locale_facets.h
@@ -37,7 +37,7 @@
 #define _CPP_BITS_LOCFACETS_H	1
 
 #include <bits/std_ctime.h>	// For struct tm
-#include <bits/std_typeinfo.h> 	// For bad_cast, which shouldn't be here.
+#include <typeinfo> 		// For bad_cast, which shouldn't be here.
 #include <bits/std_ios.h>	// For ios_base
 #include <bits/std_cwctype.h>	// For wctype_t
 
diff --git a/libstdc++-v3/include/bits/pthread_allocimpl.h b/libstdc++-v3/include/bits/pthread_allocimpl.h
index 3b63127ced7..dd99150b2c7 100644
--- a/libstdc++-v3/include/bits/pthread_allocimpl.h
+++ b/libstdc++-v3/include/bits/pthread_allocimpl.h
@@ -35,7 +35,7 @@
 #endif
 
 #ifndef __STL_NO_BAD_ALLOC
-#  include <bits/std_new.h>
+#  include <new>
 #endif
 
 __STL_BEGIN_NAMESPACE
diff --git a/libstdc++-v3/include/bits/std_ios.h b/libstdc++-v3/include/bits/std_ios.h
index 5c61547bff9..7fba3d75b2e 100644
--- a/libstdc++-v3/include/bits/std_ios.h
+++ b/libstdc++-v3/include/bits/std_ios.h
@@ -35,7 +35,7 @@
 #define _CPP_IOS	1
 
 #include <bits/std_iosfwd.h>
-#include <bits/std_exception.h> // For ios_base::failure
+#include <exception> 		// For ios_base::failure
 #include <bits/char_traits.h> 	// For char_traits, streamoff, streamsize, fpos
 #include <bits/stl_string_fwd.h>// For string.
 #include <bits/std_cstdio.h> 	// For SEEK_SET, SEEK_CUR, SEEK_END
diff --git a/libstdc++-v3/include/bits/std_stdexcept.h b/libstdc++-v3/include/bits/std_stdexcept.h
index 691b9b5825e..05b351116cd 100644
--- a/libstdc++-v3/include/bits/std_stdexcept.h
+++ b/libstdc++-v3/include/bits/std_stdexcept.h
@@ -14,7 +14,7 @@
 #ifndef _CPP_STDEXCEPT
 #define _CPP_STDEXCEPT 1
 
-#include <bits/std_exception.h>
+#include <exception>
 
 #if defined(__STL_USE_EXCEPTIONS) || \
     !(defined(_MIPS_SIM) && defined(_ABIO32) && _MIPS_SIM == _ABIO32)
diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index 71889e0853f..5a8a576e97f 100644
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -44,7 +44,7 @@
 #include <bits/std_climits.h>
 #include <bits/std_cstdlib.h>
 #include <bits/std_cstddef.h>
-#include <bits/std_new.h>
+#include <new>
 
 #ifdef __STL_USE_NEW_IOSTREAMS 
 #include <iosfwd>
diff --git a/libstdc++-v3/include/bits/stl_alloc.h b/libstdc++-v3/include/bits/stl_alloc.h
index ca22b90699f..c8332167f01 100644
--- a/libstdc++-v3/include/bits/stl_alloc.h
+++ b/libstdc++-v3/include/bits/stl_alloc.h
@@ -44,7 +44,7 @@
 #    include <bits/std_cstdlib.h>
 #    define __THROW_BAD_ALLOC fprintf(stderr, "out of memory\n"); exit(1)
 #  else /* Standard conforming out-of-memory handling */
-#    include <bits/std_new.h>
+#    include <new>
 #    define __THROW_BAD_ALLOC throw std::bad_alloc()
 #  endif
 #endif
diff --git a/libstdc++-v3/include/bits/stl_construct.h b/libstdc++-v3/include/bits/stl_construct.h
index 7841f8dc75e..c23b77ea993 100644
--- a/libstdc++-v3/include/bits/stl_construct.h
+++ b/libstdc++-v3/include/bits/stl_construct.h
@@ -31,7 +31,7 @@
 #ifndef _CPP_BITS_STL_CONSTRUCT_H
 #define _CPP_BITS_STL_CONSTRUCT_H 1
 
-#include <bits/std_new.h>
+#include <new>
 
 __STL_BEGIN_NAMESPACE
 
diff --git a/libstdc++-v3/include/bits/valarray_array.h b/libstdc++-v3/include/bits/valarray_array.h
index 2c88877bd28..a97bec9856f 100644
--- a/libstdc++-v3/include/bits/valarray_array.h
+++ b/libstdc++-v3/include/bits/valarray_array.h
@@ -36,7 +36,7 @@
 #include <bits/cpp_type_traits.h>
 #include <bits/std_cstdlib.h>
 #include <bits/std_cstring.h>
-#include <bits/std_new.h>
+#include <new>
 
 namespace std
 {
diff --git a/libstdc++-v3/include/c_std/bits/std_cstddef.h b/libstdc++-v3/include/c_std/bits/std_cstddef.h
index 713253768b1..a0c1f2c0194 100644
--- a/libstdc++-v3/include/c_std/bits/std_cstddef.h
+++ b/libstdc++-v3/include/c_std/bits/std_cstddef.h
@@ -47,12 +47,8 @@ namespace _C_legacy {
 #   define _IN_C_LEGACY_
 #   pragma GCC system_header
 
-    // XXX
-    // glibc 2.1.x time.h is on crack
-#   define __need_wchar_t
-#   define __need_ptrdiff_t
-#   define __need_size_t
-
+//#   define __need_ptrdiff_t
+//#   define __need_size_t
 #   include_next <stddef.h>
   }
 } // namespace _C_legacy
@@ -64,7 +60,6 @@ namespace _C_legacy {
 namespace std {
   using _C_legacy::ptrdiff_t;
   using _C_legacy::size_t;
-  using _C_legacy::wchar_t;
 } // namespace std
   
 # undef _IN_C_LEGACY_
@@ -73,7 +68,11 @@ namespace std {
   // some names and types with the std:: C++ version.
   using std::ptrdiff_t;
   using std::size_t;
-  using std::wchar_t;
+
+  // 3.9.1 Fundamental Types
+  // p 5
+  // wchar_t is a fundamental type
+  // using std::wchar_t;
 
 # ifdef _STDDEF_NEED_C_LEGACY_
   // dive back into the "swamp"