Change <bits/syscall.h> to <bits/sysnum.h>.

34 files changed, 65 insertions, 65 deletions

diff --git a/Makefile b/Makefile
index 57767b8f3..6adec9824 100644
--- a/Makefile
+++ b/Makefile
@@ -129,8 +129,8 @@ headers: dummy
 	fi
 	@cd $(TOPDIR); \
 	set -x -e; \
-	rm -f include/bits/syscall.h; \
-	TOPDIR=$(TOPDIR) CC=$(CC) /bin/sh $(TOPDIR)/extra/scripts/gen_bits_syscall_h.sh > include/bits/syscall.h
+	rm -f include/bits/sysnum.h; \
+	TOPDIR=$(TOPDIR) CC=$(CC) /bin/sh $(TOPDIR)/extra/scripts/gen_bits_syscall_h.sh > include/bits/sysnum.h
 	$(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) headers
 
 uClibc_config: Makefile Config
diff --git a/extra/scripts/gen_bits_syscall_h.sh b/extra/scripts/gen_bits_syscall_h.sh
index df83bcef1..4c634e7db 100755
--- a/extra/scripts/gen_bits_syscall_h.sh
+++ b/extra/scripts/gen_bits_syscall_h.sh
@@ -3,7 +3,7 @@
 # June 27, 2001         Manuel Novoa III
 #
 # This script expects TOPDIR and CC (as used in the Makefiles) to be set in
-# the environment, and outputs the appropriate $TOPDIR/include/bits/syscall.h
+# the environment, and outputs the appropriate $TOPDIR/include/bits/sysnum.h
 # corresponding to $TOPDIR/include/asm/unistd.h to stdout.
 #
 # Warning!!! This does _no_ error checking!!!
@@ -16,10 +16,10 @@ UNISTD_H_PATH=$TOPDIR/include/asm/unistd.h
 ) |
 $CC -E - |
 ( echo "/* WARNING!!! AUTO-GENERATED FILE!!! DO NOT EDIT!!! */" ; echo ;
-  echo "#ifndef _BITS_SYSCALL_H" ;
-  echo "#define _BITS_SYSCALL_H" ;
+  echo "#ifndef _BITS_SYSNUM_H" ;
+  echo "#define _BITS_SYSNUM_H" ;
   echo "#ifndef _SYSCALL_H" ;
-  echo "# error \"Never use <bits/syscall.h> directly; include <sys/syscall.h> instead.\"" ;
+  echo "# error \"Never use <bits/sysnum.h> directly; include <sys/syscall.h> instead.\"" ;
   echo "#endif" ; echo ;
   sed -ne 's/^UCLIBC_\([A-Za-z0-9_]*\) *\(.*\)/#undef __NR_\1\
 #define __NR_\1 \2\
diff --git a/libc/sysdeps/linux/alpha/Makefile b/libc/sysdeps/linux/alpha/Makefile
index 5e19b6ca9..d7f87348c 100644
--- a/libc/sysdeps/linux/alpha/Makefile
+++ b/libc/sysdeps/linux/alpha/Makefile
@@ -63,5 +63,5 @@ headers:
 
 clean:
 	rm -f *.[oa] *~ core
-	rm -f bits/syscall.h
+	rm -f bits/sysnum.h
 
diff --git a/libc/sysdeps/linux/alpha/bits/syscalls.h b/libc/sysdeps/linux/alpha/bits/syscalls.h
index ecd4a1784..62541b873 100644
--- a/libc/sysdeps/linux/alpha/bits/syscalls.h
+++ b/libc/sysdeps/linux/alpha/bits/syscalls.h
@@ -1,19 +1,19 @@
 #ifndef _BITS_SYSCALLS_H
 #define _BITS_SYSCALLS_H
 #ifndef _SYSCALL_H
-# error "Never use <bits/syscall.h> directly; include <sys/syscall.h> instead."
+# error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead."
 #endif
 
 #include <features.h>
 
 /* Do something very evil for now.  Until we create our own syscall
- * macros, short circuit bits/syscall.h  and use asm/unistd.h instead */
+ * macros, short circuit bits/sysnum.h  and use asm/unistd.h instead */
 #include <asm/unistd.h>
 
 /* 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/syscall.h>
+#include <bits/sysnum.h>
 
 #endif /* _BITS_SYSCALLS_H */
 
diff --git a/libc/sysdeps/linux/arm/Makefile b/libc/sysdeps/linux/arm/Makefile
index 950cf660e..98555e32e 100644
--- a/libc/sysdeps/linux/arm/Makefile
+++ b/libc/sysdeps/linux/arm/Makefile
@@ -1,7 +1,7 @@
 # Makefile for uClibc
 #
 # Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000,2002 Erik Andersen <andersen@uclibc.org>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Library General Public License as published by the Free
@@ -63,5 +63,5 @@ headers:
 
 clean:
 	rm -f *.[oa] *~ core
-	rm -f bits/syscall.h
+	rm -f bits/sysnum.h
 
diff --git a/libc/sysdeps/linux/arm/bits/.cvsignore b/libc/sysdeps/linux/arm/bits/.cvsignore
index 414354767..87338254d 100644
--- a/libc/sysdeps/linux/arm/bits/.cvsignore
+++ b/libc/sysdeps/linux/arm/bits/.cvsignore
@@ -1 +1 @@
-syscall.h
+sysnum.h
diff --git a/libc/sysdeps/linux/arm/bits/syscalls.h b/libc/sysdeps/linux/arm/bits/syscalls.h
index 9d5e79fe1..937f13a0d 100644
--- a/libc/sysdeps/linux/arm/bits/syscalls.h
+++ b/libc/sysdeps/linux/arm/bits/syscalls.h
@@ -1,13 +1,13 @@
 #ifndef _BITS_SYSCALLS_H
 #define _BITS_SYSCALLS_H
 #ifndef _SYSCALL_H
-# error "Never use <bits/syscall.h> directly; include <sys/syscall.h> instead."
+# 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/syscall.h>
+#include <bits/sysnum.h>
 
 #ifndef __set_errno
 # define __set_errno(val) (*__errno_location ()) = (val)
diff --git a/libc/sysdeps/linux/h8300/bits/.cvsignore b/libc/sysdeps/linux/h8300/bits/.cvsignore
index 414354767..87338254d 100644
--- a/libc/sysdeps/linux/h8300/bits/.cvsignore
+++ b/libc/sysdeps/linux/h8300/bits/.cvsignore
@@ -1 +1 @@
-syscall.h
+sysnum.h
diff --git a/libc/sysdeps/linux/h8300/bits/syscalls.h b/libc/sysdeps/linux/h8300/bits/syscalls.h
index ecd4a1784..62541b873 100644
--- a/libc/sysdeps/linux/h8300/bits/syscalls.h
+++ b/libc/sysdeps/linux/h8300/bits/syscalls.h
@@ -1,19 +1,19 @@
 #ifndef _BITS_SYSCALLS_H
 #define _BITS_SYSCALLS_H
 #ifndef _SYSCALL_H
-# error "Never use <bits/syscall.h> directly; include <sys/syscall.h> instead."
+# error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead."
 #endif
 
 #include <features.h>
 
 /* Do something very evil for now.  Until we create our own syscall
- * macros, short circuit bits/syscall.h  and use asm/unistd.h instead */
+ * macros, short circuit bits/sysnum.h  and use asm/unistd.h instead */
 #include <asm/unistd.h>
 
 /* 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/syscall.h>
+#include <bits/sysnum.h>
 
 #endif /* _BITS_SYSCALLS_H */
 
diff --git a/libc/sysdeps/linux/i386/Makefile b/libc/sysdeps/linux/i386/Makefile
index 28c64991e..aa7b2cd28 100644
--- a/libc/sysdeps/linux/i386/Makefile
+++ b/libc/sysdeps/linux/i386/Makefile
@@ -1,7 +1,7 @@
 # Makefile for uClibc
 #
 # Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000,2001,2002 Erik Andersen <andersen@uclibc.org>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Library General Public License as published by the Free
@@ -75,5 +75,5 @@ headers:
 
 clean:
 	rm -f *.[oa] *~ core
-	rm -f bits/syscall.h
+	rm -f bits/sysnum.h
 
diff --git a/libc/sysdeps/linux/i386/bits/.cvsignore b/libc/sysdeps/linux/i386/bits/.cvsignore
index 414354767..87338254d 100644
--- a/libc/sysdeps/linux/i386/bits/.cvsignore
+++ b/libc/sysdeps/linux/i386/bits/.cvsignore
@@ -1 +1 @@
-syscall.h
+sysnum.h
diff --git a/libc/sysdeps/linux/i386/bits/syscalls.h b/libc/sysdeps/linux/i386/bits/syscalls.h
index cb70d15e3..944fb734a 100644
--- a/libc/sysdeps/linux/i386/bits/syscalls.h
+++ b/libc/sysdeps/linux/i386/bits/syscalls.h
@@ -1,13 +1,13 @@
 #ifndef _BITS_SYSCALLS_H
 #define _BITS_SYSCALLS_H
 #ifndef _SYSCALL_H
-# error "Never use <bits/syscall.h> directly; include <sys/syscall.h> instead."
+# 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/syscall.h>
+#include <bits/sysnum.h>
 
 #ifndef __set_errno
 # define __set_errno(val) (*__errno_location ()) = (val)
diff --git a/libc/sysdeps/linux/i960/Makefile b/libc/sysdeps/linux/i960/Makefile
index cf192b242..00a23b896 100644
--- a/libc/sysdeps/linux/i960/Makefile
+++ b/libc/sysdeps/linux/i960/Makefile
@@ -1,7 +1,7 @@
 # Makefile for uClibc
 #
 # Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000,2001,2002 Erik Andersen <andersen@uclibc.org>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Library General Public License as published by the Free
@@ -73,5 +73,5 @@ headers:
 
 clean:
 	rm -f *.[oa] *~ core
-	rm -f bits/syscall.h
+	rm -f bits/sysnum.h
 
diff --git a/libc/sysdeps/linux/i960/bits/syscalls.h b/libc/sysdeps/linux/i960/bits/syscalls.h
index ecd4a1784..62541b873 100644
--- a/libc/sysdeps/linux/i960/bits/syscalls.h
+++ b/libc/sysdeps/linux/i960/bits/syscalls.h
@@ -1,19 +1,19 @@
 #ifndef _BITS_SYSCALLS_H
 #define _BITS_SYSCALLS_H
 #ifndef _SYSCALL_H
-# error "Never use <bits/syscall.h> directly; include <sys/syscall.h> instead."
+# error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead."
 #endif
 
 #include <features.h>
 
 /* Do something very evil for now.  Until we create our own syscall
- * macros, short circuit bits/syscall.h  and use asm/unistd.h instead */
+ * macros, short circuit bits/sysnum.h  and use asm/unistd.h instead */
 #include <asm/unistd.h>
 
 /* 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/syscall.h>
+#include <bits/sysnum.h>
 
 #endif /* _BITS_SYSCALLS_H */
 
diff --git a/libc/sysdeps/linux/m68k/Makefile b/libc/sysdeps/linux/m68k/Makefile
index 5954b8df4..751f7072c 100644
--- a/libc/sysdeps/linux/m68k/Makefile
+++ b/libc/sysdeps/linux/m68k/Makefile
@@ -1,7 +1,7 @@
 # Makefile for uClibc
 #
 # Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000,2001,2002 Erik Andersen <andersen@uclibc.org>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Library General Public License as published by the Free
@@ -79,7 +79,7 @@ endif
 
 clean:
 	rm -f *.[oa] *~ core
-	rm -f bits/syscall.h
+	rm -f bits/sysnum.h
 ifeq ($(strip $(HAVE_ELF)),false)
 	rm -f $(TOPDIR)/include/float.h
 endif
diff --git a/libc/sysdeps/linux/m68k/bits/.cvsignore b/libc/sysdeps/linux/m68k/bits/.cvsignore
index 414354767..87338254d 100644
--- a/libc/sysdeps/linux/m68k/bits/.cvsignore
+++ b/libc/sysdeps/linux/m68k/bits/.cvsignore
@@ -1 +1 @@
-syscall.h
+sysnum.h
diff --git a/libc/sysdeps/linux/m68k/bits/syscalls.h b/libc/sysdeps/linux/m68k/bits/syscalls.h
index ecd4a1784..62541b873 100644
--- a/libc/sysdeps/linux/m68k/bits/syscalls.h
+++ b/libc/sysdeps/linux/m68k/bits/syscalls.h
@@ -1,19 +1,19 @@
 #ifndef _BITS_SYSCALLS_H
 #define _BITS_SYSCALLS_H
 #ifndef _SYSCALL_H
-# error "Never use <bits/syscall.h> directly; include <sys/syscall.h> instead."
+# error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead."
 #endif
 
 #include <features.h>
 
 /* Do something very evil for now.  Until we create our own syscall
- * macros, short circuit bits/syscall.h  and use asm/unistd.h instead */
+ * macros, short circuit bits/sysnum.h  and use asm/unistd.h instead */
 #include <asm/unistd.h>
 
 /* 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/syscall.h>
+#include <bits/sysnum.h>
 
 #endif /* _BITS_SYSCALLS_H */
 
diff --git a/libc/sysdeps/linux/mips/Makefile b/libc/sysdeps/linux/mips/Makefile
index 95da2dded..080f04394 100644
--- a/libc/sysdeps/linux/mips/Makefile
+++ b/libc/sysdeps/linux/mips/Makefile
@@ -1,7 +1,7 @@
 # Makefile for uClibc
 #
 # Copyright (C) 2001 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2002 Erik Andersen <andersen@uclibc.org>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Library General Public License as published by the Free
@@ -66,6 +66,6 @@ headers:
 
 clean:
 	rm -f *.[oa] *~ core
-	rm -f bits/syscall.h
+	rm -f bits/sysnum.h
 	rm -f $(TOPDIR)/include/sgidefs.h
 
diff --git a/libc/sysdeps/linux/mips/bits/.cvsignore b/libc/sysdeps/linux/mips/bits/.cvsignore
index 414354767..87338254d 100644
--- a/libc/sysdeps/linux/mips/bits/.cvsignore
+++ b/libc/sysdeps/linux/mips/bits/.cvsignore
@@ -1 +1 @@
-syscall.h
+sysnum.h
diff --git a/libc/sysdeps/linux/mips/bits/syscalls.h b/libc/sysdeps/linux/mips/bits/syscalls.h
index 0d7ae1e50..22d53aac5 100644
--- a/libc/sysdeps/linux/mips/bits/syscalls.h
+++ b/libc/sysdeps/linux/mips/bits/syscalls.h
@@ -1,13 +1,13 @@
 #ifndef _BITS_SYSCALLS_H
 #define _BITS_SYSCALLS_H
 #ifndef _SYSCALL_H
-# error "Never use <bits/syscall.h> directly; include <sys/syscall.h> instead."
+# 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/syscall.h>
+#include <bits/sysnum.h>
 
 #ifndef __set_errno
 # define __set_errno(val) (*__errno_location ()) = (val)
diff --git a/libc/sysdeps/linux/powerpc/Makefile b/libc/sysdeps/linux/powerpc/Makefile
index a351fe1f9..da11f940c 100644
--- a/libc/sysdeps/linux/powerpc/Makefile
+++ b/libc/sysdeps/linux/powerpc/Makefile
@@ -1,7 +1,7 @@
 # Makefile for uClibc
 #
 # Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000,2001,2002 Erik Andersen <andersen@uclibc.org>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Library General Public License as published by the Free
@@ -75,5 +75,5 @@ headers:
 
 clean:
 	rm -f *.[oa] *~ core
-	rm -f bits/syscall.h
+	rm -f bits/sysnum.h
 
diff --git a/libc/sysdeps/linux/powerpc/README.bits b/libc/sysdeps/linux/powerpc/README.bits
index 2d6d4fa68..c0542e5b2 100644
--- a/libc/sysdeps/linux/powerpc/README.bits
+++ b/libc/sysdeps/linux/powerpc/README.bits
@@ -7,7 +7,7 @@ Major differences:
   - termios.h is from the Linux kernel, not glibc, because glibc has
     a very strange legacy conversion layer, which we ignore.
 
-  - syscall.h is deleted, because it is autogenerated in uClibc
+  - syscall.h is deleted; instead, sysnum.h is autogenerated in uClibc
 
   - syscalls.h is added.
 
diff --git a/libc/sysdeps/linux/powerpc/bits/.cvsignore b/libc/sysdeps/linux/powerpc/bits/.cvsignore
index 414354767..87338254d 100644
--- a/libc/sysdeps/linux/powerpc/bits/.cvsignore
+++ b/libc/sysdeps/linux/powerpc/bits/.cvsignore
@@ -1 +1 @@
-syscall.h
+sysnum.h
diff --git a/libc/sysdeps/linux/powerpc/bits/syscalls.h b/libc/sysdeps/linux/powerpc/bits/syscalls.h
index 53fedf11e..6b11315e2 100644
--- a/libc/sysdeps/linux/powerpc/bits/syscalls.h
+++ b/libc/sysdeps/linux/powerpc/bits/syscalls.h
@@ -1,19 +1,19 @@
 #ifndef _BITS_SYSCALLS_H
 #define _BITS_SYSCALLS_H
 #ifndef _SYSCALL_H
-# error "Never use <bits/syscall.h> directly; include <sys/syscall.h> instead."
+# error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead."
 #endif
 
 #include <features.h>
 
 /* Do something very evil for now.  Until we create our own syscall
- * macros, short circuit bits/syscall.h  and use asm/unistd.h instead */
+ * macros, short circuit bits/sysnum.h  and use asm/unistd.h instead */
 #include <asm/unistd.h>
 
 /* 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/syscall.h>
+#include <bits/sysnum.h>
 
 /* The kernel includes don't provide _syscall6, so provide our own */
 #undef _syscall6
diff --git a/libc/sysdeps/linux/sh/Makefile b/libc/sysdeps/linux/sh/Makefile
index 6ff7f87e3..c9cec02c1 100644
--- a/libc/sysdeps/linux/sh/Makefile
+++ b/libc/sysdeps/linux/sh/Makefile
@@ -65,5 +65,5 @@ headers:
 
 clean:
 	rm -f *.[oa] *~ core
-	rm -f bits/syscall.h
+	rm -f bits/sysnum.h
 
diff --git a/libc/sysdeps/linux/sh/bits/.cvsignore b/libc/sysdeps/linux/sh/bits/.cvsignore
index 414354767..87338254d 100644
--- a/libc/sysdeps/linux/sh/bits/.cvsignore
+++ b/libc/sysdeps/linux/sh/bits/.cvsignore
@@ -1 +1 @@
-syscall.h
+sysnum.h
diff --git a/libc/sysdeps/linux/sh/bits/syscalls.h b/libc/sysdeps/linux/sh/bits/syscalls.h
index a9b41059a..db4648eb4 100644
--- a/libc/sysdeps/linux/sh/bits/syscalls.h
+++ b/libc/sysdeps/linux/sh/bits/syscalls.h
@@ -1,13 +1,13 @@
 #ifndef _BITS_SYSCALLS_H
 #define _BITS_SYSCALLS_H
 #ifndef _SYSCALL_H
-# error "Never use <bits/syscall.h> directly; include <sys/syscall.h> instead."
+# 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/syscall.h>
+#include <bits/sysnum.h>
 
 #ifndef __set_errno
 # define __set_errno(val) (*__errno_location ()) = (val)
diff --git a/libc/sysdeps/linux/sparc/Makefile b/libc/sysdeps/linux/sparc/Makefile
index d57e1ea5e..bce1752dc 100644
--- a/libc/sysdeps/linux/sparc/Makefile
+++ b/libc/sysdeps/linux/sparc/Makefile
@@ -1,7 +1,7 @@
 # Makefile for uClibc
 #
 # Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000,2001,2002 Erik Andersen <andersen@uclibc.org>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Library General Public License as published by the Free
@@ -63,5 +63,5 @@ headers:
 
 clean:
 	rm -f *.[oa] *~ core
-	rm -f bits/syscall.h
+	rm -f bits/sysnum.h
 
diff --git a/libc/sysdeps/linux/sparc/bits/.cvsignore b/libc/sysdeps/linux/sparc/bits/.cvsignore
index 414354767..87338254d 100644
--- a/libc/sysdeps/linux/sparc/bits/.cvsignore
+++ b/libc/sysdeps/linux/sparc/bits/.cvsignore
@@ -1 +1 @@
-syscall.h
+sysnum.h
diff --git a/libc/sysdeps/linux/sparc/bits/syscalls.h b/libc/sysdeps/linux/sparc/bits/syscalls.h
index ecd4a1784..62541b873 100644
--- a/libc/sysdeps/linux/sparc/bits/syscalls.h
+++ b/libc/sysdeps/linux/sparc/bits/syscalls.h
@@ -1,19 +1,19 @@
 #ifndef _BITS_SYSCALLS_H
 #define _BITS_SYSCALLS_H
 #ifndef _SYSCALL_H
-# error "Never use <bits/syscall.h> directly; include <sys/syscall.h> instead."
+# error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead."
 #endif
 
 #include <features.h>
 
 /* Do something very evil for now.  Until we create our own syscall
- * macros, short circuit bits/syscall.h  and use asm/unistd.h instead */
+ * macros, short circuit bits/sysnum.h  and use asm/unistd.h instead */
 #include <asm/unistd.h>
 
 /* 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/syscall.h>
+#include <bits/sysnum.h>
 
 #endif /* _BITS_SYSCALLS_H */
 
diff --git a/libc/sysdeps/linux/v850/Makefile b/libc/sysdeps/linux/v850/Makefile
index 3ba329aae..ead5daa90 100644
--- a/libc/sysdeps/linux/v850/Makefile
+++ b/libc/sysdeps/linux/v850/Makefile
@@ -66,5 +66,5 @@ headers:
 
 clean:
 	rm -f *.[oa] *~ core
-	rm -f bits/syscall.h
+	rm -f bits/sysnum.h
 
diff --git a/libc/sysdeps/linux/v850/bits/.cvsignore b/libc/sysdeps/linux/v850/bits/.cvsignore
index 414354767..87338254d 100644
--- a/libc/sysdeps/linux/v850/bits/.cvsignore
+++ b/libc/sysdeps/linux/v850/bits/.cvsignore
@@ -1 +1 @@
-syscall.h
+sysnum.h
diff --git a/libc/sysdeps/linux/v850/bits/syscalls.h b/libc/sysdeps/linux/v850/bits/syscalls.h
index ecd4a1784..62541b873 100644
--- a/libc/sysdeps/linux/v850/bits/syscalls.h
+++ b/libc/sysdeps/linux/v850/bits/syscalls.h
@@ -1,19 +1,19 @@
 #ifndef _BITS_SYSCALLS_H
 #define _BITS_SYSCALLS_H
 #ifndef _SYSCALL_H
-# error "Never use <bits/syscall.h> directly; include <sys/syscall.h> instead."
+# error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead."
 #endif
 
 #include <features.h>
 
 /* Do something very evil for now.  Until we create our own syscall
- * macros, short circuit bits/syscall.h  and use asm/unistd.h instead */
+ * macros, short circuit bits/sysnum.h  and use asm/unistd.h instead */
 #include <asm/unistd.h>
 
 /* 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/syscall.h>
+#include <bits/sysnum.h>
 
 #endif /* _BITS_SYSCALLS_H */
 
diff --git a/libc/sysdeps/linux/v850/vfork.S b/libc/sysdeps/linux/v850/vfork.S
index 52c341c06..e5058a49a 100644
--- a/libc/sysdeps/linux/v850/vfork.S
+++ b/libc/sysdeps/linux/v850/vfork.S
@@ -1,8 +1,8 @@
 /*
  * libc/sysdeps/linux/v850/vfork.S -- `vfork' syscall for linux/v850
  *
- *  Copyright (C) 2001  NEC Corporation
- *  Copyright (C) 2001  Miles Bader <miles@gnu.org>
+ *  Copyright (C) 2001,2002  NEC Corporation
+ *  Copyright (C) 2001,2002  Miles Bader <miles@gnu.org>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License.  See the file COPYING.LIB in the main
@@ -14,7 +14,7 @@
 #define _ERRNO_H	1
 #include <bits/errno.h>
 #define _SYSCALL_H
-#include <bits/syscall.h>
+#include <bits/sysnum.h>
 
 #include <clinkage.h>