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, 3 insertions, 3 deletions

diff --git a/mdk-stage1/dietlibc/lib/execlp.c b/mdk-stage1/dietlibc/lib/execlp.c
index 3aea1e960..27dc0bb95 100644
--- a/mdk-stage1/dietlibc/lib/execlp.c
+++ b/mdk-stage1/dietlibc/lib/execlp.c
@@ -2,7 +2,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
-#include "dietstdarg.h"
+#include "dietfeatures.h"
 
 int execlp(const char* file, const char *arg,...) {
   va_list ap,bak;
@@ -15,12 +15,12 @@ int execlp(const char* file, const char *arg,...) {
     ++n;
   va_end (ap);
   if ((argv=(char **)alloca(n*sizeof(char*)))) {
-    argv[0]=arg;
+    argv[0]=(char*)arg;
     for (i=0; i<n; ++i)
       argv[i+1]=va_arg(bak,char *);
     va_end (bak);
     return execvp(file,argv);
   }
-  __set_errno(ENOMEM);
+  errno=ENOMEM;
   return -1;
 }