Revert mode_t change. Sigh. As Manuel so eloquently put it: "this is the way

we hose our code... hose our code... hose our code...  this is the way we hose
our code... all thanks to glibc"
 -Erik

7 files changed, 8 insertions, 9 deletions

diff --git a/libc/sysdeps/linux/alpha/bits/types.h b/libc/sysdeps/linux/alpha/bits/types.h
index 69ea02800..f4ddef749 100644
--- a/libc/sysdeps/linux/alpha/bits/types.h
+++ b/libc/sysdeps/linux/alpha/bits/types.h
@@ -59,7 +59,7 @@ typedef __kernel_dev_t __dev_t;		/* Type of device numbers.  */
 typedef __kernel_uid_t __uid_t;		/* Type of user identifications.  */
 typedef __kernel_gid_t __gid_t;		/* Type of group identifications.  */
 typedef __kernel_ino_t __ino_t;		/* Type of file serial numbers.  */
-typedef __kernel_mode_t __mode_t;	/* Type of file attribute bitmasks.  */
+typedef __uint32_t __mode_t;		/* Type of file attribute bitmasks.  */
 typedef __kernel_nlink_t __nlink_t;	/* Type of file link counts.  */
 typedef __kernel_off_t __off_t;		/* Type of file sizes and offsets.  */
 typedef __kernel_loff_t __loff_t;	/* Type of file sizes and offsets.  */
diff --git a/libc/sysdeps/linux/common/bits/types.h b/libc/sysdeps/linux/common/bits/types.h
index 6aef44901..99c882cfc 100644
--- a/libc/sysdeps/linux/common/bits/types.h
+++ b/libc/sysdeps/linux/common/bits/types.h
@@ -72,7 +72,7 @@ typedef __kernel_dev_t __dev_t;		/* Type of device numbers.  */
 typedef __kernel_uid_t __uid_t;		/* Type of user identifications.  */
 typedef __kernel_gid_t __gid_t;		/* Type of group identifications.  */
 typedef __kernel_ino_t __ino_t;		/* Type of file serial numbers.  */
-typedef __kernel_mode_t __mode_t;	/* Type of file attribute bitmasks.  */
+typedef __u_int __mode_t;		/* Type of file attribute bitmasks.  */
 typedef __kernel_nlink_t __nlink_t;	/* Type of file link counts.  */
 typedef __kernel_off_t __off_t;		/* Type of file sizes and offsets.  */
 typedef __kernel_loff_t __loff_t;	/* Type of file sizes and offsets.  */
diff --git a/libc/sysdeps/linux/common/syscalls.c b/libc/sysdeps/linux/common/syscalls.c
index 99684d069..1b31f7603 100644
--- a/libc/sysdeps/linux/common/syscalls.c
+++ b/libc/sysdeps/linux/common/syscalls.c
@@ -158,8 +158,7 @@ time_t time (time_t *t)
 //#define __NR_mknod            14
 #ifdef L_mknod
 #include <sys/stat.h>
-_syscall3(int, mknod, const char *, path, 
-		unsigned short int, mode, unsigned short int, dev);
+_syscall3(int, mknod, const char *, path, mode_t, mode, dev_t, dev);
 #endif
 
 //#define __NR_chmod            15
diff --git a/libc/sysdeps/linux/mips/bits/types.h b/libc/sysdeps/linux/mips/bits/types.h
index f60fb82d8..a7eed7768 100644
--- a/libc/sysdeps/linux/mips/bits/types.h
+++ b/libc/sysdeps/linux/mips/bits/types.h
@@ -72,7 +72,7 @@ typedef __kernel_dev_t __dev_t;		/* Type of device numbers.  */
 typedef __kernel_uid_t __uid_t;		/* Type of user identifications.  */
 typedef __kernel_gid_t __gid_t;		/* Type of group identifications.  */
 typedef __kernel_ino_t __ino_t;		/* Type of file serial numbers.  */
-typedef __kernel_mode_t __mode_t;	/* Type of file attribute bitmasks.  */
+typedef __u_int __mode_t;		/* Type of file attribute bitmasks.  */
 typedef __kernel_nlink_t __nlink_t;	/* Type of file link counts.  */
 typedef __kernel_off_t __off_t;		/* Type of file sizes and offsets.  */
 typedef __kernel_loff_t __loff_t;	/* Type of file sizes and offsets.  */
diff --git a/libc/sysdeps/linux/powerpc/bits/types.h b/libc/sysdeps/linux/powerpc/bits/types.h
index 6aef44901..99c882cfc 100644
--- a/libc/sysdeps/linux/powerpc/bits/types.h
+++ b/libc/sysdeps/linux/powerpc/bits/types.h
@@ -72,7 +72,7 @@ typedef __kernel_dev_t __dev_t;		/* Type of device numbers.  */
 typedef __kernel_uid_t __uid_t;		/* Type of user identifications.  */
 typedef __kernel_gid_t __gid_t;		/* Type of group identifications.  */
 typedef __kernel_ino_t __ino_t;		/* Type of file serial numbers.  */
-typedef __kernel_mode_t __mode_t;	/* Type of file attribute bitmasks.  */
+typedef __u_int __mode_t;		/* Type of file attribute bitmasks.  */
 typedef __kernel_nlink_t __nlink_t;	/* Type of file link counts.  */
 typedef __kernel_off_t __off_t;		/* Type of file sizes and offsets.  */
 typedef __kernel_loff_t __loff_t;	/* Type of file sizes and offsets.  */
diff --git a/libc/sysdeps/linux/sparc/bits/types.h b/libc/sysdeps/linux/sparc/bits/types.h
index 5dccfc4cb..aa62b0e77 100644
--- a/libc/sysdeps/linux/sparc/bits/types.h
+++ b/libc/sysdeps/linux/sparc/bits/types.h
@@ -83,7 +83,7 @@ typedef __kernel_dev_t __dev_t;		/* Type of device numbers.  */
 typedef __kernel_uid_t __uid_t;		/* Type of user identifications.  */
 typedef __kernel_gid_t __gid_t;		/* Type of group identifications.  */
 typedef __kernel_ino_t __ino_t;		/* Type of file serial numbers.  */
-typedef __kernel_mode_t __mode_t;	/* Type of file attribute bitmasks.  */
+typedef __u_int __mode_t;		/* Type of file attribute bitmasks.  */
 typedef __kernel_nlink_t __nlink_t;	/* Type of file link counts.  */
 typedef __kernel_off_t __off_t;		/* Type of file sizes and offsets.  */
 typedef __kernel_loff_t __loff_t;	/* Type of file sizes and offsets.  */
diff --git a/libpthread/linuxthreads/wrapsyscall.c b/libpthread/linuxthreads/wrapsyscall.c
index 847870862..ba6d1b860 100644
--- a/libpthread/linuxthreads/wrapsyscall.c
+++ b/libpthread/linuxthreads/wrapsyscall.c
@@ -109,13 +109,13 @@ CANCELABLE_SYSCALL (int, nanosleep, (const struct timespec *requested_time,
 
 /* open(2).  */
 CANCELABLE_SYSCALL_VA (int, open, (const char *pathname, int flags, ...),
-		       (pathname, flags, va_arg (ap, int)), flags)
+		       (pathname, flags, va_arg (ap, mode_t)), flags)
 
 
 #ifdef __UCLIBC_HAVE_LFS__
 /* open64(3).  */
 CANCELABLE_SYSCALL_VA (int, open64, (const char *pathname, int flags, ...),
-		       (pathname, flags, va_arg (ap, int)), flags)
+		       (pathname, flags, va_arg (ap, mode_t)), flags)
 #endif
 
 /* pause(2).  */