diff options
| author |   Joseph Myers <joseph@codesourcery.com> | 2019-09-18 13:22:24 +0000 |
|---|---|---|
| committer |   Sergei Trofimovich <slyfox@gentoo.org> | 2019-10-22 18:54:45 +0100 |
| commit | b49c42dc33b7d14bb6fc30578bbc73d0cb6c88e5 (patch) | |
| tree | e49e7ddd4143f5f160a955c9b56fd520eb993daa | |
| parent | Revert "Gentoo: Fix 'make install-headers' when cross-compiler is not availab... (diff) | |
| download | glibc-gentoo/glibc-2.29-7.tar.gz glibc-gentoo/glibc-2.29-7.tar.bz2 glibc-gentoo/glibc-2.29-7.zip | |
Fix RISC-V vfork build with Linux 5.3 kernel headers.gentoo/glibc-2.29-7
Building glibc for RISC-V with Linux 5.3 kernel headers fails because
<linux/sched.h>, included in vfork.S for CLONE_* constants, contains a
structure definition not safe for inclusion in assembly code.
All other architectures already avoid use of that header in vfork.S,
either defining the CLONE_* constants locally or embedding the
required values directly in the relevant instruction, where they
implement vfork using the clone syscall (see the implementations for
aarch64, ia64, mips and nios2). This patch makes the RISC-V version
define the constants locally like the other architectures.
Tested build for all three RISC-V configurations in
build-many-glibcs.py with Linux 5.3 headers.
* sysdeps/unix/sysv/linux/riscv/vfork.S: Do not include
<linux/sched.h>.
(CLONE_VM): New macro.
(CLONE_VFORK): Likewise.
Cherry-picked upstream commit 8cacbcf4a984ccac24efedb795d9c8a7f149d17b.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
| -rw-r--r-- | sysdeps/unix/sysv/linux/riscv/vfork.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/riscv/vfork.S b/sysdeps/unix/sysv/linux/riscv/vfork.S index 67373f181b..dc173d6b47 100644 --- a/sysdeps/unix/sysv/linux/riscv/vfork.S +++ b/sysdeps/unix/sysv/linux/riscv/vfork.S @@ -21,9 +21,12 @@ #include <sys/asm.h> #include <sysdep.h> #define __ASSEMBLY__ -#include <linux/sched.h> #include <asm/signal.h> +#define CLONE_VM 0x00000100 /* Set if VM shared between processes. */ +#define CLONE_VFORK 0x00004000 /* Set if the parent wants the child to + wake it up on mm_release. */ + .text LEAF (__libc_vfork) |