From f77e6fc792e1080a0eca022cd51c34216dc9b183 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 14 Sep 2022 01:41:14 -0700 Subject: [PATCH 01/16] musl: add support for SIGEV_THREAD_ID timers https://git.musl-libc.org/cgit/musl/commit/?id=7c71792e87691451f2a6b76348e83ad1889f1dcb --- ...d-support-for-SIGEV_THREAD_ID-timers.patch | 74 +++++++++++++++++++ srcpkgs/musl/template | 2 +- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/musl/patches/add-support-for-SIGEV_THREAD_ID-timers.patch diff --git a/srcpkgs/musl/patches/add-support-for-SIGEV_THREAD_ID-timers.patch b/srcpkgs/musl/patches/add-support-for-SIGEV_THREAD_ID-timers.patch new file mode 100644 index 000000000000..e20dff5ba0d4 --- /dev/null +++ b/srcpkgs/musl/patches/add-support-for-SIGEV_THREAD_ID-timers.patch @@ -0,0 +1,74 @@ +From 7c71792e87691451f2a6b76348e83ad1889f1dcb Mon Sep 17 00:00:00 2001 +From: James Y Knight +Date: Sun, 30 Jun 2019 21:55:20 -0400 +Subject: [PATCH] add support for SIGEV_THREAD_ID timers + +This is like SIGEV_SIGNAL, but targeted to a particular thread's +tid, rather than the process. +--- + include/signal.h | 16 +++++++++++++--- + src/time/timer_create.c | 8 ++++++-- + 2 files changed, 19 insertions(+), 5 deletions(-) + +diff --git a/include/signal.h b/include/signal.h +index fbdf667b2..9ed929e4f 100644 +--- a/include/signal.h ++++ b/include/signal.h +@@ -180,14 +180,24 @@ struct sigevent { + union sigval sigev_value; + int sigev_signo; + int sigev_notify; +- void (*sigev_notify_function)(union sigval); +- pthread_attr_t *sigev_notify_attributes; +- char __pad[56-3*sizeof(long)]; ++ union { ++ char __pad[64 - 2*sizeof(int) - sizeof(union sigval)]; ++ pid_t sigev_notify_thread_id; ++ struct { ++ void (*sigev_notify_function)(union sigval); ++ pthread_attr_t *sigev_notify_attributes; ++ } __sev_thread; ++ } __sev_fields; + }; + ++#define sigev_notify_thread_id __sev_fields.sigev_notify_thread_id ++#define sigev_notify_function __sev_fields.__sev_thread.sigev_notify_function ++#define sigev_notify_attributes __sev_fields.__sev_thread.sigev_notify_attributes ++ + #define SIGEV_SIGNAL 0 + #define SIGEV_NONE 1 + #define SIGEV_THREAD 2 ++#define SIGEV_THREAD_ID 4 + + int __libc_current_sigrtmin(void); + int __libc_current_sigrtmax(void); +diff --git a/src/time/timer_create.c b/src/time/timer_create.c +index 5ddfda278..4bef23905 100644 +--- a/src/time/timer_create.c ++++ b/src/time/timer_create.c +@@ -71,11 +71,15 @@ int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict + switch (evp ? evp->sigev_notify : SIGEV_SIGNAL) { + case SIGEV_NONE: + case SIGEV_SIGNAL: ++ case SIGEV_THREAD_ID: + if (evp) { + ksev.sigev_value = evp->sigev_value; + ksev.sigev_signo = evp->sigev_signo; + ksev.sigev_notify = evp->sigev_notify; +- ksev.sigev_tid = 0; ++ if (evp->sigev_notify == SIGEV_THREAD_ID) ++ ksev.sigev_tid = evp->sigev_notify_thread_id; ++ else ++ ksev.sigev_tid = 0; + ksevp = &ksev; + } + if (syscall(SYS_timer_create, clk, ksevp, &timerid) < 0) +@@ -107,7 +111,7 @@ int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict + + ksev.sigev_value.sival_ptr = 0; + ksev.sigev_signo = SIGTIMER; +- ksev.sigev_notify = 4; /* SIGEV_THREAD_ID */ ++ ksev.sigev_notify = SIGEV_THREAD_ID; + ksev.sigev_tid = td->tid; + if (syscall(SYS_timer_create, clk, &ksev, &timerid) < 0) + timerid = -1; diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index 5bdc5c48e623..34e6ed4fba6e 100644 --- a/srcpkgs/musl/template +++ b/srcpkgs/musl/template @@ -2,7 +2,7 @@ pkgname=musl reverts="1.2.0_1" version=1.1.24 -revision=10 +revision=11 archs="*-musl" bootstrap=yes build_style=gnu-configure From f6de5b8d77043aca5b5575b83ac45fa4ba59fe61 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 14 Sep 2022 01:58:39 -0700 Subject: [PATCH 02/16] criu: remove un-needed sigev patch --- srcpkgs/criu/patches/sigev-musl.patch | 29 --------------------------- 1 file changed, 29 deletions(-) delete mode 100644 srcpkgs/criu/patches/sigev-musl.patch diff --git a/srcpkgs/criu/patches/sigev-musl.patch b/srcpkgs/criu/patches/sigev-musl.patch deleted file mode 100644 index f0e256234485..000000000000 --- a/srcpkgs/criu/patches/sigev-musl.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- /dev/null -+++ b/include/signal_compat.h -@@ -0,0 +1,4 @@ -+#define SIGEV_SIGNAL 0 /* notify via signal */ -+#define SIGEV_NONE 1 /* other notification: meaningless */ -+#define SIGEV_THREAD 2 /* deliver via thread creation */ -+#define SIGEV_THREAD_ID 4 /* deliver to thread */ ---- a/criu/pie/restorer.c -+++ b/criu/pie/restorer.c -@@ -50,6 +50,10 @@ - #include "shmem.h" - #include "restorer.h" - -+#ifndef __GLIBC__ -+#include "signal_compat.h" -+#endif -+ - #ifndef PR_SET_PDEATHSIG - #define PR_SET_PDEATHSIG 1 - #endif -@@ -1067,7 +1071,7 @@ - #ifdef __GLIBC__ - sev._sigev_un._tid = args->posix_timers[i].spt.notify_thread_id; - #else -- sev.sigev_notify_thread_id = args->posix_timers[i].spt.notify_thread_id; -+ sev.sigev_notify_function = args->posix_timers[i].spt.notify_thread_id; - #endif - sev.sigev_value.sival_ptr = args->posix_timers[i].spt.sival_ptr; - From ba886bb7d826e6df723e0f11006739871f0d7b00 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 14 Sep 2022 02:06:56 -0700 Subject: [PATCH 03/16] cross-aarch64-linux-musl: rebuild for sigev patch --- srcpkgs/cross-aarch64-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template index bb6a770afb79..6c73ec143867 100644 --- a/srcpkgs/cross-aarch64-linux-musl/template +++ b/srcpkgs/cross-aarch64-linux-musl/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _libucontext_version=1.0 pkgname=cross-aarch64-linux-musl version=0.34 -revision=4 +revision=5 build_style=void-cross configure_args="--with-arch=armv8-a" hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" From 51eb3e32eee6697998de174b39161bfa4f5dbad4 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 14 Sep 2022 02:06:56 -0700 Subject: [PATCH 04/16] cross-i686-linux-musl: rebuild for sigev patch --- srcpkgs/cross-i686-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template index 8be16a230d8d..39f87d76cc3f 100644 --- a/srcpkgs/cross-i686-linux-musl/template +++ b/srcpkgs/cross-i686-linux-musl/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _libucontext_version=1.0 pkgname=cross-i686-linux-musl version=0.34 -revision=4 +revision=5 build_style=void-cross hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel" From de92fafac146a3d1f8cca399598a2c8b3a03adf0 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 14 Sep 2022 02:06:56 -0700 Subject: [PATCH 05/16] cross-mips-linux-musl: rebuild for sigev patch --- srcpkgs/cross-mips-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template index 9b5d5819b1a0..ec10dc302f14 100644 --- a/srcpkgs/cross-mips-linux-musl/template +++ b/srcpkgs/cross-mips-linux-musl/template @@ -5,7 +5,7 @@ _musl_version=1.1.24 _linux_version=5.10.4 pkgname=cross-mips-linux-musl version=0.34 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=mips32r2 --with-float=soft --with-linker-hash-style=sysv" From d89345c172a72a2541d50e6c66e1f5805c55ae92 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 14 Sep 2022 02:06:56 -0700 Subject: [PATCH 06/16] cross-mipsel-linux-musl: rebuild for sigev patch --- srcpkgs/cross-mipsel-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template index 1acba7016dbc..f8e6823de0ec 100644 --- a/srcpkgs/cross-mipsel-linux-musl/template +++ b/srcpkgs/cross-mipsel-linux-musl/template @@ -5,7 +5,7 @@ _musl_version=1.1.24 _linux_version=5.10.4 pkgname=cross-mipsel-linux-musl version=0.34 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=mips32r2 --with-float=soft --with-linker-hash-style=sysv" From f4b697c3beed06818281bc450a1ccc74ea13e4bc Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 14 Sep 2022 02:06:56 -0700 Subject: [PATCH 07/16] cross-powerpc-linux-musl: rebuild for sigev patch --- srcpkgs/cross-powerpc-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template index f9b22f0610d3..ce89f609f015 100644 --- a/srcpkgs/cross-powerpc-linux-musl/template +++ b/srcpkgs/cross-powerpc-linux-musl/template @@ -5,7 +5,7 @@ _musl_version=1.1.24 _linux_version=5.10.4 pkgname=cross-powerpc-linux-musl version=0.34 -revision=3 +revision=4 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --disable-decimal-float" From 89a3857ac82a8a6c2de68fd1dc851be1feb883f3 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 14 Sep 2022 02:06:56 -0700 Subject: [PATCH 08/16] cross-powerpc64-linux-musl: rebuild for sigev patch --- srcpkgs/cross-powerpc64-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template index 1ebd0fb2048d..90930b46904b 100644 --- a/srcpkgs/cross-powerpc64-linux-musl/template +++ b/srcpkgs/cross-powerpc64-linux-musl/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _libucontext_version=1.0 pkgname=cross-powerpc64-linux-musl version=0.34 -revision=4 +revision=5 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux" From 7262bd0ae6aca5e6b426bef7a2a65f10db632cdd Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 14 Sep 2022 02:06:56 -0700 Subject: [PATCH 09/16] cross-powerpc64le-linux-musl: rebuild for sigev patch --- srcpkgs/cross-powerpc64le-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template index 76a70aa1d6db..1429677235bb 100644 --- a/srcpkgs/cross-powerpc64le-linux-musl/template +++ b/srcpkgs/cross-powerpc64le-linux-musl/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _libucontext_version=1.0 pkgname=cross-powerpc64le-linux-musl version=0.34 -revision=4 +revision=5 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux" From 6df6eca649e8e213be3e6b62a898842f86607893 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 14 Sep 2022 02:06:56 -0700 Subject: [PATCH 10/16] cross-powerpcle-linux-musl: rebuild for sigev patch --- srcpkgs/cross-powerpcle-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template index ec9324ddaa99..c3af9d0c4db9 100644 --- a/srcpkgs/cross-powerpcle-linux-musl/template +++ b/srcpkgs/cross-powerpcle-linux-musl/template @@ -5,7 +5,7 @@ _musl_version=1.1.24 _linux_version=5.10.4 pkgname=cross-powerpcle-linux-musl version=0.34 -revision=3 +revision=4 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --disable-decimal-float" From cbe6d2436b656b8954bd5c6ae8f64b82d8b6eb37 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 14 Sep 2022 02:06:56 -0700 Subject: [PATCH 11/16] cross-x86_64-linux-musl: rebuild for sigev patch --- srcpkgs/cross-x86_64-linux-musl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template index a941e7e02f6f..7f979afc68c1 100644 --- a/srcpkgs/cross-x86_64-linux-musl/template +++ b/srcpkgs/cross-x86_64-linux-musl/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _libucontext_version=1.0 pkgname=cross-x86_64-linux-musl version=0.34 -revision=3 +revision=4 build_style=void-cross hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel" From 35cae5a735e162de105b29101b0b94d85b5edfef Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 14 Sep 2022 02:06:56 -0700 Subject: [PATCH 12/16] cross-mips-linux-muslhf: rebuild for sigev patch --- srcpkgs/cross-mips-linux-muslhf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template index d7590af9ec03..3a7944e7e545 100644 --- a/srcpkgs/cross-mips-linux-muslhf/template +++ b/srcpkgs/cross-mips-linux-muslhf/template @@ -5,7 +5,7 @@ _musl_version=1.1.24 _linux_version=5.10.4 pkgname=cross-mips-linux-muslhf version=0.34 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=mips32r2 --with-float=hard --with-linker-hash-style=sysv" From 68c481b83e61df8f00579027cf1306a01bb564c8 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 14 Sep 2022 02:06:57 -0700 Subject: [PATCH 13/16] cross-mipsel-linux-muslhf: rebuild for sigev patch --- srcpkgs/cross-mipsel-linux-muslhf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template index e4a55f028bc4..7178877a1714 100644 --- a/srcpkgs/cross-mipsel-linux-muslhf/template +++ b/srcpkgs/cross-mipsel-linux-muslhf/template @@ -5,7 +5,7 @@ _musl_version=1.1.24 _linux_version=5.10.4 pkgname=cross-mipsel-linux-muslhf version=0.34 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=mips32r2 --with-float=hard --with-linker-hash-style=sysv" From a968031643e2ef5c1c7830c59af251b2b7355980 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 14 Sep 2022 02:06:57 -0700 Subject: [PATCH 14/16] cross-arm-linux-musleabi: rebuild for sigev patch --- srcpkgs/cross-arm-linux-musleabi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template index 6692d891e1bd..570529a14b77 100644 --- a/srcpkgs/cross-arm-linux-musleabi/template +++ b/srcpkgs/cross-arm-linux-musleabi/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _libucontext_version=1.0 pkgname=cross-arm-linux-musleabi version=0.34 -revision=4 +revision=5 build_style=void-cross configure_args="--with-arch=armv5te --with-float=soft" hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" From 74f6a0285ef5ec4467c599c014e96ed60d93ac8e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 14 Sep 2022 02:06:57 -0700 Subject: [PATCH 15/16] cross-arm-linux-musleabihf: rebuild for sigev patch --- srcpkgs/cross-arm-linux-musleabihf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template index bb62bd5ebc55..1de7466350db 100644 --- a/srcpkgs/cross-arm-linux-musleabihf/template +++ b/srcpkgs/cross-arm-linux-musleabihf/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _libucontext_version=1.0 pkgname=cross-arm-linux-musleabihf version=0.34 -revision=4 +revision=5 build_style=void-cross configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard" hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" From 1ac592f22c99ecc1eb4a64ee0d9045b5161c35b3 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 14 Sep 2022 02:06:57 -0700 Subject: [PATCH 16/16] cross-armv7l-linux-musleabihf: rebuild for sigev patch --- srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template index 0a588cdf1a58..16dcb7d28dd3 100644 --- a/srcpkgs/cross-armv7l-linux-musleabihf/template +++ b/srcpkgs/cross-armv7l-linux-musleabihf/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _libucontext_version=1.0 pkgname=cross-armv7l-linux-musleabihf version=0.34 -revision=4 +revision=5 build_style=void-cross configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard" hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"