From ffd98ffec71ec6c7b7e7a96f5e6dce40077b3785 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 8 Dec 2006 21:05:37 +0000
Subject: Take Mike Frysinger's comments into account -- make certain that user
 applications stop using _syscall#() and use syscall() instead.  Cleanup
 internal handling of syscall includes to use the correct header file.

---
 libc/sysdeps/linux/sh/bits/syscalls.h | 5 -----
 libc/sysdeps/linux/sh/clone.S         | 2 +-
 libc/sysdeps/linux/sh/pread_write.c   | 2 +-
 libc/sysdeps/linux/sh/vfork.S         | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'libc/sysdeps/linux/sh')

diff --git a/libc/sysdeps/linux/sh/bits/syscalls.h b/libc/sysdeps/linux/sh/bits/syscalls.h
index f953ed3e8..234f80653 100644
--- a/libc/sysdeps/linux/sh/bits/syscalls.h
+++ b/libc/sysdeps/linux/sh/bits/syscalls.h
@@ -11,11 +11,6 @@
 # define __SH_SYSCALL_TRAP_BASE 0x10
 #endif
 
-/* This includes the `__NR_<name>' syscall numbers taken from the Linux kernel
- * header files.  It also defines the traditional `SYS_<name>' macros for older
- * programs.  */
-#include <bits/sysnum.h>
-
 #ifndef __ASSEMBLER__
 
 #include <errno.h>
diff --git a/libc/sysdeps/linux/sh/clone.S b/libc/sysdeps/linux/sh/clone.S
index 6999f9490..dec05a2c7 100644
--- a/libc/sysdeps/linux/sh/clone.S
+++ b/libc/sysdeps/linux/sh/clone.S
@@ -24,7 +24,7 @@
 #define _ERRNO_H	1
 #include <bits/errno.h>
 #define _SYSCALL_H
-#include <bits/syscalls.h>
+#include <bits/sysnum.h>
 
 
 #ifdef __HAVE_SHARED__ 
diff --git a/libc/sysdeps/linux/sh/pread_write.c b/libc/sysdeps/linux/sh/pread_write.c
index dc756d647..9cc4bbf97 100644
--- a/libc/sysdeps/linux/sh/pread_write.c
+++ b/libc/sysdeps/linux/sh/pread_write.c
@@ -12,7 +12,7 @@
  * from GNU libc 2.2.5, but reworked considerably...
  */
 
-#include "../common/syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <stdint.h>
 
diff --git a/libc/sysdeps/linux/sh/vfork.S b/libc/sysdeps/linux/sh/vfork.S
index b8872e1e8..5d7e51dd5 100644
--- a/libc/sysdeps/linux/sh/vfork.S
+++ b/libc/sysdeps/linux/sh/vfork.S
@@ -25,7 +25,7 @@
 #include <bits/sysnum.h>
 #define _ERRNO_H	1
 #include <bits/errno.h>
-#include <bits/syscalls.h>
+#include <bits/sysnum.h>
 
 /* Clone the calling process, but without copying the whole address space.
    The calling process is suspended until the new process exits or is
-- 
cgit v1.2.3