Benjamin Kosnik <bkoz@gnu.org>

	* *: Merge with mainline glibc sources.
	* filedoalloc.c (_IO_file_doallocate): Don't call
	_IO_cleanup_registration_needed, even if not libc.
	* iofwide.c (_IO_fwide): Correct placement of defines.
	* cleanup.c: Remove.

From-SVN: r35693

diff --git a/libstdc++-v3/libio/cleanup.c b/libstdc++-v3/libio/cleanup.c
deleted file mode 100644 (file)
index 691fa83..0000000
--- a/libstdc++-v3/libio/cleanup.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "libioP.h"
-#if _G_HAVE_ATEXIT
-#include <stdlib.h>
-
-typedef void (*voidfunc) __P((void));
-
-static void
-_IO_register_cleanup ()
-{
-  atexit ((voidfunc)_IO_cleanup);
-  _IO_cleanup_registration_needed = 0;
-}
-
-void (*_IO_cleanup_registration_needed)() = _IO_register_cleanup;
-#else
-void (*_IO_cleanup_registration_needed)() = NULL;
-#endif /* _G_HAVE_ATEXIT */