Merge from R9_0-AMD64, most notably:

- AMD64 support to insmod-busybox, minilibc, et al.
- Sync with insmod-modutils 2.4.19 something but everyone should use
  dietlibc nowadays
- Factor out compilation and prefix with $(DIET) for dietlibc builds
- 64-bit & varargs fixes

1 files changed, 7 insertions, 4 deletions

diff --git a/mdk-stage1/dietlibc/ppc/mmap.c b/mdk-stage1/dietlibc/ppc/mmap.c
index 25d2926b2..d03e87089 100644
--- a/mdk-stage1/dietlibc/ppc/mmap.c
+++ b/mdk-stage1/dietlibc/ppc/mmap.c
@@ -1,5 +1,7 @@
-#include <linux/types.h>
-#include <linux/unistd.h>
+#include "dietfeatures.h"
+#include <sys/types.h>
+#include <errno.h>
+#include "syscalls.h"
 
 int mmap(void*start,size_t length,int prot,int flags,int fd,off_t offset) {
   unsigned long __sc_ret, __sc_err;
@@ -29,9 +31,10 @@ int mmap(void*start,size_t length,int prot,int flags,int fd,off_t offset) {
 	      "r"   (__sc_6),
 	      "r"   (__sc_7),
 	      "r"   (__sc_8)
-	    : __syscall_clobbers);
+	    : "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12");
     __sc_ret = __sc_3;
     __sc_err = __sc_0;
   }
-  __syscall_return (int);
+  return (__sc_err & 0x10000000 ? errno = __sc_ret, __sc_ret = -1 : 0),
+	  (int) __sc_ret;
 }