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, 6 insertions, 5 deletions

diff --git a/mdk-stage1/dietlibc/lib/assert_fail.c b/mdk-stage1/dietlibc/lib/assert_fail.c
index 3d6ba65c1..35b8b186a 100644
--- a/mdk-stage1/dietlibc/lib/assert_fail.c
+++ b/mdk-stage1/dietlibc/lib/assert_fail.c
@@ -2,14 +2,15 @@
 #include <string.h>
 #include <unistd.h>
 #include "dietwarning.h"
+#include <write12.h>
 
-extern int __ltostr(char *s, int size, unsigned long i, int base, char UpCase);
+void __assert_fail (const char *assertion, const char *file, unsigned int line, const char *function);
 
 void __assert_fail (const char *assertion, const char *file, unsigned int line, const char *function)
 {
-  int alen=strlen(assertion);
-  int flen=strlen(file);
-  int fulen=strlen(function);
+  unsigned int alen=strlen(assertion);
+  unsigned int flen=strlen(file);
+  unsigned int fulen=function?strlen(function):0;
   char *buf=(char*)alloca(alen+flen+fulen+50);
   if (buf) {
     char *tmp;
@@ -22,7 +23,7 @@ void __assert_fail (const char *assertion, const char *file, unsigned int line,
     strcat(buf,"Assertion `");
     strcat(buf,assertion);
     strcat(buf,"' failed.\n");
-    write(2,buf,strlen(buf));
+    __write2(buf);
   }
   abort();
 }