Linux: Use system call tables during build

Message ID 87k1eaqlh1.fsf@oldenburg2.str.redhat.com
State New
Headers show
Series
  • Linux: Use system call tables during build
Related show

Commit Message

Florian Weimer May 28, 2019, 10:10 p.m.
Use <arch-syscall.h> instead of <asm/unistd.h> to obtain the system
call numbers.  A few direct includes of <asm/unistd.h> need to be
removed (if the system call numbers are already provided indirectly
by <sysdep.h>) or replaced with <sys/syscall.h>.

For the 32-bit arm architecture, eliminate the INTERNAL_SYSCALL_ARM
macro, now that we have regular system call names for cacheflush and
set_tls.

For ia64, it is desirable to use <asm/break.h> directly to obtain
the break number for system calls (which is not a system call number
itself).  This requires replacing __BREAK_SYSCALL with
__IA64_BREAK_SYSCALL because the former is defined as an alias in
<asm/unistd.h>, but not in <asm/break.h>.

2019-05-28  Florian Weimer  <fweimer@redhat.com>

	Linux: Use system call tables during build.
	* sysdeps/unix/sysv/linux/sys/syscall.h: Remove _LIBC preprocessor
	check.  This file is now only used with _ISOMAC (from the test
	suite), so <bits/syscall.h> can be included unconditionally.
	Update comment.
	* sysdeps/unix/sysv/linux/include/sys/syscall.h: New file.
	* sysdeps/ia64/start.S: Do not include <asm/unistd.h>.
	* sysdeps/microblaze/backtrace_linux.c: Include <sys/syscall.h>
	instead of <asm/unistd.h>.
	* sysdeps/unix/sysv/linux/arm/dl-machine.h (CLEAR_CACHE):
	Use INTERNAL_SYSCALL instead of INTERNAL_SYSCALL_ARM.
	* sysdeps/unix/sysv/linux/arm/tls.h (TLS_INIT_TP): Likewise.
	* sysdeps/unix/sysv/linux/arm/sysdep.h (INTERNAL_SYSCALL_ARM):
	Remove definition.
	* sysdeps/unix/sysv/linux/hppa/clone.S: Do not include
	<asm/unistd.h>.
	* sysdeps/unix/sysv/linux/ia64/brk.S: Likewise.
	* sysdeps/unix/sysv/linux/ia64/clone2.S (__clone2): Use
	__IA64_BREAK_SYSCALL instead of __BREAK_SYSCALL.
	* sysdeps/unix/sysv/linux/ia64/syscall.S (syscall): Likewise.
	* sysdeps/unix/sysv/linux/ia64/sysdep.S (__ia64_syscall):
	Likewise.
	* sysdeps/unix/sysv/linux/ia64/sysdep.h (DO_CALL_VIA_BREAK):
	Likewise.
	(DO_INLINE_SYSCALL_NCS): Likewise.
	* sysdeps/unix/sysv/linux/mips/vfork.S: Do not include
	<asm/unistd.h>.
	* sysdeps/unix/sysv/linux/nios2/sysdep.h: Likewise.
	* sysdeps/unix/sysv/linux/riscv/flush-icache.c: Unconditionally
	include <sys/sycall.h> instead of <asm/syscalls.h> or
	<asm/unistd.h>.
	* sysdeps/unix/sysv/linux/sparc/sparc32/clone.S: Do not include
	<asm/unistd.h>.
	* sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Likewise.

Patch

diff --git a/NEWS b/NEWS
index c885b960ca..9cd311466a 100644
--- a/NEWS
+++ b/NEWS
@@ -65,6 +65,9 @@  Changes to build and runtime requirements:
   Older GCC versions and non-GNU compilers are still supported when
   compiling programs that use the GNU C Library.
 
+* It is no longer necessary to have recent Linux kernel headers to build
+  working (non-stub) system call wrappers.
+
 Security related changes:
 
   CVE-2019-7309: x86-64 memcmp used signed Jcc instructions to check
diff --git a/sysdeps/ia64/start.S b/sysdeps/ia64/start.S
index 0ddc06ef57..839edf0661 100644
--- a/sysdeps/ia64/start.S
+++ b/sysdeps/ia64/start.S
@@ -35,7 +35,6 @@ 
 
 #include <sysdep.h>
 
-#include <asm/unistd.h>
 #include <asm/fpu.h>
 
 /*
diff --git a/sysdeps/microblaze/backtrace_linux.c b/sysdeps/microblaze/backtrace_linux.c
index c9549201e3..71febfd1b1 100644
--- a/sysdeps/microblaze/backtrace_linux.c
+++ b/sysdeps/microblaze/backtrace_linux.c
@@ -20,7 +20,7 @@ 
 #include <asm/sigcontext.h>
 #include <linux/signal.h>
 #include <asm-generic/ucontext.h>
-#include <asm/unistd.h>
+#include <sys/syscall.h>
 
 int
 _identify_sighandler (unsigned long fp, unsigned long pc,
diff --git a/sysdeps/unix/sysv/linux/arm/dl-machine.h b/sysdeps/unix/sysv/linux/arm/dl-machine.h
index 51cf8c7cce..a421cb8226 100644
--- a/sysdeps/unix/sysv/linux/arm/dl-machine.h
+++ b/sysdeps/unix/sysv/linux/arm/dl-machine.h
@@ -20,7 +20,7 @@ 
 
 /* This definition is Linux-specific.  */
 #define CLEAR_CACHE(BEG,END)                                            \
-  INTERNAL_SYSCALL_ARM (cacheflush, , 3, (BEG), (END), 0)
+  INTERNAL_SYSCALL (cacheflush, , 3, (BEG), (END), 0)
 
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/arm/sysdep.h b/sysdeps/unix/sysv/linux/arm/sysdep.h
index 9b4ed8d6a5..1e96a7608d 100644
--- a/sysdeps/unix/sysv/linux/arm/sysdep.h
+++ b/sysdeps/unix/sysv/linux/arm/sysdep.h
@@ -380,10 +380,6 @@  __local_syscall_error:						\
 #define INTERNAL_SYSCALL(name, err, nr, args...)		\
 	INTERNAL_SYSCALL_RAW(SYS_ify(name), err, nr, args)
 
-#undef INTERNAL_SYSCALL_ARM
-#define INTERNAL_SYSCALL_ARM(name, err, nr, args...)		\
-	INTERNAL_SYSCALL_RAW(__ARM_NR_##name, err, nr, args)
-
 #undef INTERNAL_SYSCALL_ERROR_P
 #define INTERNAL_SYSCALL_ERROR_P(val, err) \
   ((unsigned int) (val) >= 0xfffff001u)
diff --git a/sysdeps/unix/sysv/linux/arm/tls.h b/sysdeps/unix/sysv/linux/arm/tls.h
index 5fc3ccd013..0a54dcae3a 100644
--- a/sysdeps/unix/sysv/linux/arm/tls.h
+++ b/sysdeps/unix/sysv/linux/arm/tls.h
@@ -33,7 +33,7 @@ 
 # define TLS_INIT_TP(tcbp) \
   ({ INTERNAL_SYSCALL_DECL (err);					\
      long int result_var;						\
-     result_var = INTERNAL_SYSCALL_ARM (set_tls, err, 1, (tcbp));	\
+     result_var = INTERNAL_SYSCALL (set_tls, err, 1, (tcbp));		\
      INTERNAL_SYSCALL_ERROR_P (result_var, err)				\
        ? "unknown error" : NULL; })
 
diff --git a/sysdeps/unix/sysv/linux/hppa/clone.S b/sysdeps/unix/sysv/linux/hppa/clone.S
index 79fa4f6147..661f6e8e0e 100644
--- a/sysdeps/unix/sysv/linux/hppa/clone.S
+++ b/sysdeps/unix/sysv/linux/hppa/clone.S
@@ -20,7 +20,6 @@ 
 /* clone() is even more special than fork() as it mucks with stacks
    and invokes a function in the right context after its all over.  */
 
-#include <asm/unistd.h>
 #include <sysdep.h>
 #define _ERRNO_H	1
 #include <bits/errno.h>
diff --git a/sysdeps/unix/sysv/linux/ia64/brk.S b/sysdeps/unix/sysv/linux/ia64/brk.S
index 0d06c0c5b7..96abd462d1 100644
--- a/sysdeps/unix/sysv/linux/ia64/brk.S
+++ b/sysdeps/unix/sysv/linux/ia64/brk.S
@@ -20,7 +20,6 @@ 
 
 #include <sysdep.h>
 
-#include <asm/unistd.h>
 #include <asm/errno.h>
 
 	.global __curbrk
diff --git a/sysdeps/unix/sysv/linux/ia64/clone2.S b/sysdeps/unix/sysv/linux/ia64/clone2.S
index 054d4347f2..a699929c70 100644
--- a/sysdeps/unix/sysv/linux/ia64/clone2.S
+++ b/sysdeps/unix/sysv/linux/ia64/clone2.S
@@ -58,7 +58,7 @@  ENTRY(__clone2)
 	 */
 	mov r15=SYS_ify (clone2)
 	.save rp, r0
-	break __BREAK_SYSCALL
+	break __IA64_BREAK_SYSCALL
 	.body
 	cmp.eq p6,p0=-1,r10
 	cmp.eq CHILD,PARENT=0,r8 /* Are we the child?   */
@@ -78,7 +78,7 @@  ENTRY(__clone2)
 	mov gp=loc0
 	mov r15=SYS_ify (exit)
 	.save rp, r0
-	break __BREAK_SYSCALL
+	break __IA64_BREAK_SYSCALL
 	ret			/* Not reached.		*/
 PSEUDO_END(__clone2)
 
diff --git a/sysdeps/unix/sysv/linux/ia64/syscall.S b/sysdeps/unix/sysv/linux/ia64/syscall.S
index c1edd146f6..bb0432bff9 100644
--- a/sysdeps/unix/sysv/linux/ia64/syscall.S
+++ b/sysdeps/unix/sysv/linux/ia64/syscall.S
@@ -25,7 +25,7 @@  ENTRY(syscall)
 	   in {out0...out5} like the kernel syscall handler expects.  */
 	alloc r2=ar.pfs,1,0,8,0
 	mov r15=r32		/* syscall number */
-	break __BREAK_SYSCALL
+	break __IA64_BREAK_SYSCALL
 	;;
 	cmp.ne p6,p0=-1,r10	/* r10 = -1 on error */
 (p6)	ret
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.S b/sysdeps/unix/sysv/linux/ia64/sysdep.S
index a3b38fa8fc..553d9152c4 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.S
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.S
@@ -51,7 +51,7 @@  END(__syscall_error)
 
 ENTRY(__ia64_syscall)
 	mov r15=r37		/* syscall number */
-	break __BREAK_SYSCALL
+	break __IA64_BREAK_SYSCALL
 	cmp.eq p6,p0=-1,r10	/* r10 = -1 on error */
 (p6)	br.cond.spnt.few __syscall_error
 	ret
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h
index 3328502efe..be35bbf7e4 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h
@@ -25,6 +25,7 @@ 
 #include <sysdeps/ia64/sysdep.h>
 #include <dl-sysdep.h>
 #include <tls.h>
+#include <asm/break.h>
 
 /* In order to get __set_errno() definition in INLINE_SYSCALL.  */
 #ifndef __ASSEMBLER__
@@ -115,7 +116,7 @@ 
 
 #define DO_CALL_VIA_BREAK(num)			\
 	mov r15=num;				\
-	break __BREAK_SYSCALL
+	break __IA64_BREAK_SYSCALL
 
 #ifdef IA64_USE_NEW_STUB
 # ifdef SHARED
@@ -229,7 +230,7 @@ 
     register long _r15 asm ("r15") = name;			\
     long _retval;						\
     LOAD_REGS_##nr						\
-    __asm __volatile (BREAK_INSN (__BREAK_SYSCALL)		\
+    __asm __volatile (BREAK_INSN (__IA64_BREAK_SYSCALL)		\
 		      : "=r" (_r8), "=r" (_r10), "=r" (_r15)	\
 			ASM_OUTARGS_##nr			\
 		      : "2" (_r15) ASM_ARGS_##nr		\
diff --git a/sysdeps/unix/sysv/linux/include/sys/syscall.h b/sysdeps/unix/sysv/linux/include/sys/syscall.h
new file mode 100644
index 0000000000..fe87e8ee25
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/include/sys/syscall.h
@@ -0,0 +1,29 @@ 
+/* Wrapper header for <sys/syscall.h>.  Linux version.
+   Copyright (C) 2019 Free Software Foundation, Inc.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _SYSCALL_H
+
+#ifdef _ISOMAC
+# include <sysdeps/unix/sysv/linux/sys/syscall.h>
+#else /* !_ISOMAC */
+/* Use the built-in system call list, not <asm/unistd.h>, which may
+   not list all the system call numbers we need.  */
+# define _SYSCALL_H
+# include <arch-syscall.h>
+#endif /* !_ISOMAC */
+
+#endif /* _SYSCALL_H */
diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S
index f186c0f302..d95125a891 100644
--- a/sysdeps/unix/sysv/linux/mips/vfork.S
+++ b/sysdeps/unix/sysv/linux/mips/vfork.S
@@ -19,7 +19,6 @@ 
 
 #include <sys/asm.h>
 #include <sysdep.h>
-#include <asm/unistd.h>
 #include <sgidefs.h>
 #include <tls.h>
 
diff --git a/sysdeps/unix/sysv/linux/nios2/sysdep.h b/sysdeps/unix/sysv/linux/nios2/sysdep.h
index a617a5c03f..bf88ef08ae 100644
--- a/sysdeps/unix/sysv/linux/nios2/sysdep.h
+++ b/sysdeps/unix/sysv/linux/nios2/sysdep.h
@@ -19,7 +19,6 @@ 
 #ifndef _LINUX_NIOS2_SYSDEP_H
 #define _LINUX_NIOS2_SYSDEP_H 1
 
-#include <asm/unistd.h>
 #include <sysdeps/unix/sysdep.h>
 #include <sysdeps/nios2/sysdep.h>
 #include <sysdeps/unix/sysv/linux/generic/sysdep.h>
diff --git a/sysdeps/unix/sysv/linux/riscv/flush-icache.c b/sysdeps/unix/sysv/linux/riscv/flush-icache.c
index cd5c400977..328abd0780 100644
--- a/sysdeps/unix/sysv/linux/riscv/flush-icache.c
+++ b/sysdeps/unix/sysv/linux/riscv/flush-icache.c
@@ -21,11 +21,7 @@ 
 #include <stdlib.h>
 #include <atomic.h>
 #include <sys/cachectl.h>
-#if __has_include__ (<asm/syscalls.h>)
-# include <asm/syscalls.h>
-#else
-# include <asm/unistd.h>
-#endif
+#include <sys/syscall.h>
 
 typedef int (*func_type) (void *, void *, unsigned long int);
 
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S b/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
index 274605dc65..d67e339e2b 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
@@ -20,7 +20,6 @@ 
    and invokes a function in the right context after its all over.  */
 
 #include <asm/errno.h>
-#include <asm/unistd.h>
 #include <tcb-offsets.h>
 #include <sysdep.h>
 
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S b/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S
index 2d0cf2dbe6..ab9ffb7214 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S
@@ -20,7 +20,6 @@ 
    and invokes a function in the right context after its all over.  */
 
 #include <asm/errno.h>
-#include <asm/unistd.h>
 #include <tcb-offsets.h>
 #include <sysdep.h>
 
diff --git a/sysdeps/unix/sysv/linux/sys/syscall.h b/sysdeps/unix/sysv/linux/sys/syscall.h
index c0fc63b736..a04b9dda3d 100644
--- a/sysdeps/unix/sysv/linux/sys/syscall.h
+++ b/sysdeps/unix/sysv/linux/sys/syscall.h
@@ -23,12 +23,9 @@ 
    from the kernel sources.  */
 #include <asm/unistd.h>
 
-#ifndef _LIBC
-/* The Linux kernel header file defines macros `__NR_<name>', but some
-   programs expect the traditional form `SYS_<name>'.  So in building libc
-   we scan the kernel's list and produce <bits/syscall.h> with macros for
-   all the `SYS_' names.  */
-# include <bits/syscall.h>
-#endif
+/* The Linux kernel header file defines macros __NR_*, but some
+   programs expect the traditional form SYS_*.  <bits/syscall.h>
+   defines SYS_* macros for __NR_* macros of known names.  */
+#include <bits/syscall.h>
 
 #endif