4 files changed, 10 insertions, 22 deletions
diff --git a/libc/sysdeps/linux/common/__syscall_rt_sigaction.c b/libc/sysdeps/linux/common/__syscall_rt_sigaction.c
index 6fb416039..c3246b1bf 100644
--- a/libc/sysdeps/linux/common/__syscall_rt_sigaction.c
+++ b/libc/sysdeps/linux/common/__syscall_rt_sigaction.c
@@ -13,8 +13,8 @@
 #include <signal.h>
 #include <bits/kernel_sigaction.h>
 
-#define __NR___rt_sigaction __NR_rt_sigaction
-_syscall4(int, __rt_sigaction, int, signum,
-		  const struct kernel_sigaction *, act, struct kernel_sigaction *, oldact,
+#define __NR___syscall_rt_sigaction __NR_rt_sigaction
+_syscall4(int, __syscall_rt_sigaction, int, signum,
+		  const struct sigaction *, act, struct sigaction *, oldact,
 		  size_t, size)
 #endif
diff --git a/libc/sysdeps/linux/common/creat.c b/libc/sysdeps/linux/common/creat.c
deleted file mode 100644
index 429b4824c..000000000
--- a/libc/sysdeps/linux/common/creat.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * open() for uClibc
- *
- * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
- *
- * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
- */
-#include <fcntl.h>
-
-extern int __libc_open(const char *file, int flags, ...);
-
-int creat(const char *file, mode_t mode)
-{
-	return __libc_open(file, O_WRONLY | O_CREAT | O_TRUNC, mode);
-}
diff --git a/libc/sysdeps/linux/common/open64.c b/libc/sysdeps/linux/common/open64.c
index 7a68b4cd9..403e91a46 100644
--- a/libc/sysdeps/linux/common/open64.c
+++ b/libc/sysdeps/linux/common/open64.c
@@ -44,7 +44,7 @@ int open64 (const char *file, int oflag, ...)
 
   return result;
 #else
-  return __libc_open(file, oflag | O_LARGEFILE, mode);
+  return open(file, oflag | O_LARGEFILE, mode);
 #endif
 }
 libc_hidden_def(open64)
diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
index 6609dd312..8641a48c0 100644
--- a/libc/sysdeps/linux/i386/bits/kernel_types.h
+++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
@@ -7,10 +7,14 @@
 
 /* a hack for compiling a 32 bit user space with 64 bit
  * kernel on x86_64  */
-#if !defined(__ARCH_I386_POSIX_TYPES_H) && !defined(_ASM_X86_64_POSIX_TYPES_H)
+#if !defined(__ARCH_I386_POSIX_TYPES_H) && \
+    !defined(_ASM_X86_64_POSIX_TYPES_H) && \
+    !defined(_ASM_X86_POSIX_TYPES_32_H) && \
+    !defined(_ASM_X86_POSIX_TYPES_64_H)
 #define _ASM_X86_64_POSIX_TYPES_H
 #define __ARCH_I386_POSIX_TYPES_H
-
+#define _ASM_X86_POSIX_TYPES_32_H
+#define _ASM_X86_POSIX_TYPES_64_H
 typedef unsigned short	__kernel_dev_t;
 typedef unsigned long	__kernel_ino_t;
 typedef unsigned short	__kernel_mode_t;