Merge in CVS dietlibc 0.21 for IA-64 and X86-64 support. However, drop the

following architectures we currently don't support: arm, mips, mipsel, parisc,
s390, sparc64.

1 files changed, 2 insertions, 32 deletions

diff --git a/mdk-stage1/dietlibc/libstdio/fdglue.c b/mdk-stage1/dietlibc/libstdio/fdglue.c
index 1c3918f1f..9542711e2 100644
--- a/mdk-stage1/dietlibc/libstdio/fdglue.c
+++ b/mdk-stage1/dietlibc/libstdio/fdglue.c
@@ -1,13 +1,9 @@
-#include "dietstdio.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <stdlib.h>
-
-#ifdef WANT_BUFFERED_STDIO
-extern int __stdio_atexit;
-extern void __stdio_flushall();
-#endif
+#include <pthread.h>
+#include "dietstdio.h"
 
 int __stdio_parse_mode(const char *mode) {
   int f=0;
@@ -24,29 +20,3 @@ int __stdio_parse_mode(const char *mode) {
   }
 }
 
-FILE* __stdio_init_file(int fd) {
-  FILE *tmp=(FILE*)malloc(sizeof(FILE));
-  if (!tmp) {
-    close(fd);
-    errno=ENOMEM;
-    return 0;
-  }
-  tmp->fd=fd;
-#ifdef WANT_BUFFERED_STDIO
-  tmp->bm=0;
-  tmp->bs=0;
-#endif
-#ifdef WANT_UNGETC
-  tmp->ungotten = 0;
-#endif
-  tmp->flags=0;
-#ifdef WANT_BUFFERED_STDIO
-  if (__stdio_atexit==0) {
-    __stdio_atexit=1;
-    atexit(__stdio_flushall);
-  }
-  tmp->next=__stdio_root;
-  __stdio_root=tmp;
-#endif
-  return tmp;
-}