diff --git a/glibc.changes b/glibc.changes index bcf109d..62a2fcf 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 18 13:57:25 UTC 2019 - Andreas Schwab + +- riscv-vfork.patch: Fix RISC-V vfork build with Linux 5.3 kernel headers + ------------------------------------------------------------------- Mon Aug 19 13:47:26 UTC 2019 - Andreas Schwab diff --git a/glibc.spec b/glibc.spec index 39c8f84..8f16cfc 100644 --- a/glibc.spec +++ b/glibc.spec @@ -261,6 +261,8 @@ Patch306: glibc-fix-double-loopback.diff ### # PATCH-FIX-UPSTREAM malloc: Remove unwanted leading whitespace in malloc_info (BZ #24867) Patch1000: malloc-info-whitespace.patch +# PATCH-FIX-UPSTREAM Fix RISC-V vfork build with Linux 5.3 kernel headers +Patch1001: riscv-vfork.patch ### # Patches awaiting upstream approval @@ -467,6 +469,7 @@ makedb: A program to create a database for nss %patch306 -p1 %patch1000 -p1 +%patch1001 -p1 %patch2000 -p1 %patch2001 -p1 diff --git a/riscv-vfork.patch b/riscv-vfork.patch new file mode 100644 index 0000000..50275cb --- /dev/null +++ b/riscv-vfork.patch @@ -0,0 +1,25 @@ +2019-09-18 Joseph Myers + + * sysdeps/unix/sysv/linux/riscv/vfork.S: Do not include + . + (CLONE_VM): New macro. + (CLONE_VFORK): Likewise. + +Index: glibc-2.30/sysdeps/unix/sysv/linux/riscv/vfork.S +=================================================================== +--- glibc-2.30.orig/sysdeps/unix/sysv/linux/riscv/vfork.S ++++ glibc-2.30/sysdeps/unix/sysv/linux/riscv/vfork.S +@@ -21,9 +21,12 @@ + #include + #include + #define __ASSEMBLY__ +-#include + #include + ++#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) +