mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Hurd: Use __sigmask in favor of deprecated sigmask

Browse Source 
This fixes various build errors due to deprecation warnings.

Fixes commit 02802fafcf
("signal: Deprecate additional legacy signal handling functions").

Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Florian Weimer 2020-05-28 11:17:51 +02:00
parent f901178749
commit a9175662f8
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hurd/catch-signal.c
View File

@ -84,7 +84,7 @@ hurd_safe_memset (void *dest, int byte, size_t nbytes)
memset (dest, byte, nbytes);
return 0;
}
return __hurd_catch_signal (sigmask (SIGBUS) | sigmask (SIGSEGV),
return __hurd_catch_signal (__sigmask (SIGBUS) | __sigmask (SIGSEGV),
(vm_address_t) dest, (vm_address_t) dest + nbytes,
&operate, SIG_ERR);
}
@ -98,7 +98,7 @@ hurd_safe_copyout (void *dest, const void *src, size_t nbytes)
memcpy (dest, src, nbytes);
return 0;
}
return __hurd_catch_signal (sigmask (SIGBUS) | sigmask (SIGSEGV),
return __hurd_catch_signal (__sigmask (SIGBUS) | __sigmask (SIGSEGV),
(vm_address_t) dest, (vm_address_t) dest + nbytes,
&operate, SIG_ERR);
}
@ -111,7 +111,7 @@ hurd_safe_copyin (void *dest, const void *src, size_t nbytes)
memcpy (dest, src, nbytes);
return 0;
}
return __hurd_catch_signal (sigmask (SIGBUS) | sigmask (SIGSEGV),
return __hurd_catch_signal (__sigmask (SIGBUS) | __sigmask (SIGSEGV),
(vm_address_t) src, (vm_address_t) src + nbytes,
&operate, SIG_ERR);
}
@ -125,13 +125,13 @@ hurd_safe_memmove (void *dest, const void *src, size_t nbytes)
struct hurd_signal_preemptor src_preemptor =
{
sigmask (SIGBUS) | sigmask (SIGSEGV),
__sigmask (SIGBUS) | __sigmask (SIGSEGV),
(vm_address_t) src, (vm_address_t) src + nbytes,
NULL, (sighandler_t) &throw,
};
struct hurd_signal_preemptor dest_preemptor =
{
sigmask (SIGBUS) | sigmask (SIGSEGV),
__sigmask (SIGBUS) | __sigmask (SIGSEGV),
(vm_address_t) dest, (vm_address_t) dest + nbytes,
NULL, (sighandler_t) &throw,
&src_preemptor

2
hurd/hurd/sigpreempt.h
View File

@ -51,7 +51,7 @@ struct hurd_signal_preemptor
};
#define HURD_PREEMPT_SIGNAL_P(preemptor, signo, sigcode) \
(((preemptor)->signals & sigmask (signo)) \
(((preemptor)->signals & __sigmask (signo)) \
&& (sigcode) >= (preemptor)->first && (sigcode) <= (preemptor)->last)

2
hurd/hurdfault.h
View File

@ -43,7 +43,7 @@ extern struct hurd_signal_preemptor _hurdsig_fault_preemptor;
#define _hurdsig_catch_memory_fault(object) \
_hurdsig_catch_fault (sigmask (SIGSEGV) | sigmask (SIGBUS), \
_hurdsig_catch_fault (__sigmask (SIGSEGV) | __sigmask (SIGBUS), \
(object), (object) + 1)

4
hurd/hurdsig.c
View File

@ -595,8 +595,8 @@ sigset_t _hurdsig_preempted_set;
weak_alias (_hurdsig_preemptors, _hurdsig_preempters)
/* Mask of stop signals. */
#define STOPSIGS (sigmask (SIGTTIN) | sigmask (SIGTTOU) \
| sigmask (SIGSTOP) | sigmask (SIGTSTP))
#define STOPSIGS (__sigmask (SIGTTIN) | __sigmask (SIGTTOU) \
| __sigmask (SIGSTOP) | __sigmask (SIGTSTP))
/* Actual delivery of a single signal. Called with SS unlocked. When
the signal is delivered, return SS, locked (or, if SS was originally

4
sysdeps/generic/sigset-cvt-mask.h
View File

@ -37,7 +37,7 @@ sigset_set_old_mask (sigset_t *set, int mask)
return -1;
for (__sig = 1; __sig < NSIG && __sig <= sizeof (mask) * 8; __sig++)
if (mask & sigmask (__sig))
if (mask & __sigmask (__sig))
if (__sigaddset (set, __sig) < 0)
return -1;
}
@ -58,7 +58,7 @@ sigset_get_old_mask (const sigset_t *set)
for (sig = 1; sig < NSIG && sig <= sizeof (mask) * 8; sig++)
if (__sigismember (set, sig))
mask |= sigmask (sig);
mask |= __sigmask (sig);
return mask;
}