diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-03-13 19:10:08 +0000 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-04-21 14:01:58 -0300 |
| commit | 34d49f120df2787788acfdf86769277a1a7ebccb (patch) | |
| tree | 860541c9c962b2db55cb4670a7c5839a230a6b89 | |
| parent | c6663fee4340291cd825fd8a88c219621f4eca9d (diff) | |
| download | glibc-34d49f120df2787788acfdf86769277a1a7ebccb.tar.gz glibc-34d49f120df2787788acfdf86769277a1a7ebccb.tar.xz glibc-34d49f120df2787788acfdf86769277a1a7ebccb.zip | |
ia64: Remove sigprocmask/sigblock objects from libpthread
It is required because __libc_unwind_longjmp (used on thread cancellation) calls __sigprocmask. Replace with a direct call. They are required because __libc_unwind_longjmp (used for thread cancellation) calls __sigprocmask. Replace this with a direct call. The sigblock function is not exported and is not used internally, so it can be removed. Checked on cross build for ia64-linux-gnu.
| -rw-r--r-- | sysdeps/ia64/nptl/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sysdeps/ia64/nptl/Makefile b/sysdeps/ia64/nptl/Makefile index b7d87c37c8..d34cb27699 100644 --- a/sysdeps/ia64/nptl/Makefile +++ b/sysdeps/ia64/nptl/Makefile @@ -20,6 +20,6 @@ gen-as-const-headers += tcb-offsets.sym endif ifeq ($(subdir),nptl) -libpthread-routines += sysdep sigblock sigprocmask -libpthread-shared-only-routines += sysdep sigblock sigprocmask +libpthread-routines += sysdep +libpthread-shared-only-routines += sysdep endif diff --git a/sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c b/sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c index 93d1d66dd0..d9ed942963 100644 --- a/sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c +++ b/sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c @@ -34,8 +34,7 @@ __libc_unwind_longjmp (sigjmp_buf env, int val) if (env[0].__mask_was_saved) /* Restore the saved signal mask. */ - (void) __sigprocmask (SIG_SETMASK, &env[0].__saved_mask, - (sigset_t *) NULL); + __libc_signal_restore_set (&env[0].__saved_mask); /* Call the machine-dependent function to restore machine state. */ __sigstack_longjmp (env[0].__jmpbuf, val ?: 1); |