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/frv/bits/syscalls.h | 5 -----
 libc/sysdeps/linux/frv/fstat.c         | 2 +-
 libc/sysdeps/linux/frv/fstat64.c       | 2 +-
 libc/sysdeps/linux/frv/lstat.c         | 2 +-
 libc/sysdeps/linux/frv/lstat64.c       | 2 +-
 libc/sysdeps/linux/frv/stat.c          | 2 +-
 libc/sysdeps/linux/frv/stat64.c        | 2 +-
 7 files changed, 6 insertions(+), 11 deletions(-)

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

diff --git a/libc/sysdeps/linux/frv/bits/syscalls.h b/libc/sysdeps/linux/frv/bits/syscalls.h
index fae1079bd..eea3050ba 100644
--- a/libc/sysdeps/linux/frv/bits/syscalls.h
+++ b/libc/sysdeps/linux/frv/bits/syscalls.h
@@ -4,11 +4,6 @@
 # error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead."
 #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/frv/fstat.c b/libc/sysdeps/linux/frv/fstat.c
index a1d343cb8..fc8a25af5 100644
--- a/libc/sysdeps/linux/frv/fstat.c
+++ b/libc/sysdeps/linux/frv/fstat.c
@@ -9,7 +9,7 @@
  * Adapted to FR-V by Alexandre Oliva <aoliva@redhat.com>
  */
 
-#include "../common/syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
diff --git a/libc/sysdeps/linux/frv/fstat64.c b/libc/sysdeps/linux/frv/fstat64.c
index e07a28471..dcb9b922c 100644
--- a/libc/sysdeps/linux/frv/fstat64.c
+++ b/libc/sysdeps/linux/frv/fstat64.c
@@ -9,7 +9,7 @@
  * Adapted to FR-V by Alexandre Oliva <aoliva@redhat.com>
  */
 
-#include "../common/syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
diff --git a/libc/sysdeps/linux/frv/lstat.c b/libc/sysdeps/linux/frv/lstat.c
index b178af76b..7a0297bfa 100644
--- a/libc/sysdeps/linux/frv/lstat.c
+++ b/libc/sysdeps/linux/frv/lstat.c
@@ -9,7 +9,7 @@
  * Adapted to FR-V by Alexandre Oliva <aoliva@redhat.com>
  */
 
-#include "../common/syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
diff --git a/libc/sysdeps/linux/frv/lstat64.c b/libc/sysdeps/linux/frv/lstat64.c
index 9a6236b14..e95653ed5 100644
--- a/libc/sysdeps/linux/frv/lstat64.c
+++ b/libc/sysdeps/linux/frv/lstat64.c
@@ -9,7 +9,7 @@
  * Adapted to FR-V by Alexandre Oliva <aoliva@redhat.com>
  */
 
-#include "../common/syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
diff --git a/libc/sysdeps/linux/frv/stat.c b/libc/sysdeps/linux/frv/stat.c
index 56cb668db..6c3f0b962 100644
--- a/libc/sysdeps/linux/frv/stat.c
+++ b/libc/sysdeps/linux/frv/stat.c
@@ -9,7 +9,7 @@
  * Adapted to FR-V by Alexandre Oliva <aoliva@redhat.com>
  */
 
-#include "../common/syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
diff --git a/libc/sysdeps/linux/frv/stat64.c b/libc/sysdeps/linux/frv/stat64.c
index 641644ffd..659ad8ae2 100644
--- a/libc/sysdeps/linux/frv/stat64.c
+++ b/libc/sysdeps/linux/frv/stat64.c
@@ -9,7 +9,7 @@
  * Adapted to FR-V by Alexandre Oliva <aoliva@redhat.com>
  */
 
-#include "../common/syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
-- 
cgit v1.2.3