Make sure that bits/syscalls.h always includes bits/syscall.h

 -Erik

8 files changed, 37 insertions, 1 deletions

diff --git a/extra/scripts/gen_bits_syscall_h.sh b/extra/scripts/gen_bits_syscall_h.sh
index ce599c9b0..df83bcef1 100755
--- a/extra/scripts/gen_bits_syscall_h.sh
+++ b/extra/scripts/gen_bits_syscall_h.sh
@@ -21,7 +21,8 @@ $CC -E - |
   echo "#ifndef _SYSCALL_H" ;
   echo "# error \"Never use <bits/syscall.h> directly; include <sys/syscall.h> instead.\"" ;
   echo "#endif" ; echo ;
-  sed -ne 's/^UCLIBC_\([A-Za-z0-9_]*\) *\(.*\)/#define __NR_\1 \2\
+  sed -ne 's/^UCLIBC_\([A-Za-z0-9_]*\) *\(.*\)/#undef __NR_\1\
+#define __NR_\1 \2\
 #define SYS_\1 __NR_\1/gp'
   echo "#endif" ; echo ;
 )
diff --git a/libc/sysdeps/linux/alpha/bits/syscalls.h b/libc/sysdeps/linux/alpha/bits/syscalls.h
index da6a6d43e..fff97378f 100644
--- a/libc/sysdeps/linux/alpha/bits/syscalls.h
+++ b/libc/sysdeps/linux/alpha/bits/syscalls.h
@@ -11,5 +11,10 @@
 #define _BITS_SYSCALL_H
 #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>
+
 #endif /* _BITS_SYSCALLS_H */
 
diff --git a/libc/sysdeps/linux/h8300/bits/syscalls.h b/libc/sysdeps/linux/h8300/bits/syscalls.h
index da6a6d43e..fff97378f 100644
--- a/libc/sysdeps/linux/h8300/bits/syscalls.h
+++ b/libc/sysdeps/linux/h8300/bits/syscalls.h
@@ -11,5 +11,10 @@
 #define _BITS_SYSCALL_H
 #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>
+
 #endif /* _BITS_SYSCALLS_H */
 
diff --git a/libc/sysdeps/linux/i960/bits/syscalls.h b/libc/sysdeps/linux/i960/bits/syscalls.h
index da6a6d43e..fff97378f 100644
--- a/libc/sysdeps/linux/i960/bits/syscalls.h
+++ b/libc/sysdeps/linux/i960/bits/syscalls.h
@@ -11,5 +11,10 @@
 #define _BITS_SYSCALL_H
 #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>
+
 #endif /* _BITS_SYSCALLS_H */
 
diff --git a/libc/sysdeps/linux/m68k/bits/syscalls.h b/libc/sysdeps/linux/m68k/bits/syscalls.h
index da6a6d43e..fff97378f 100644
--- a/libc/sysdeps/linux/m68k/bits/syscalls.h
+++ b/libc/sysdeps/linux/m68k/bits/syscalls.h
@@ -11,5 +11,10 @@
 #define _BITS_SYSCALL_H
 #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>
+
 #endif /* _BITS_SYSCALLS_H */
 
diff --git a/libc/sysdeps/linux/powerpc/bits/syscalls.h b/libc/sysdeps/linux/powerpc/bits/syscalls.h
index 6efff713e..37a9cfe3e 100644
--- a/libc/sysdeps/linux/powerpc/bits/syscalls.h
+++ b/libc/sysdeps/linux/powerpc/bits/syscalls.h
@@ -11,6 +11,11 @@
 #define _BITS_SYSCALL_H
 #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>
+
 /* The kernel includes don't provide _syscall6, so provide our own */
 #undef _syscall6
 #define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \
diff --git a/libc/sysdeps/linux/sparc/bits/syscalls.h b/libc/sysdeps/linux/sparc/bits/syscalls.h
index da6a6d43e..fff97378f 100644
--- a/libc/sysdeps/linux/sparc/bits/syscalls.h
+++ b/libc/sysdeps/linux/sparc/bits/syscalls.h
@@ -11,5 +11,10 @@
 #define _BITS_SYSCALL_H
 #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>
+
 #endif /* _BITS_SYSCALLS_H */
 
diff --git a/libc/sysdeps/linux/v850/bits/syscalls.h b/libc/sysdeps/linux/v850/bits/syscalls.h
index da6a6d43e..fff97378f 100644
--- a/libc/sysdeps/linux/v850/bits/syscalls.h
+++ b/libc/sysdeps/linux/v850/bits/syscalls.h
@@ -11,5 +11,10 @@
 #define _BITS_SYSCALL_H
 #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>
+
 #endif /* _BITS_SYSCALLS_H */