about summary refs log tree commit diff
path: root/hurd
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2020-05-28 11:17:51 +0200
committerFlorian Weimer <fweimer@redhat.com>2020-05-28 11:40:13 +0200
commita9175662f8cdce65aa9e2c54ea09cbebd1215f7a (patch)
tree373ae534f3f67e1f67f9849f3f64b78720ce3cd1 /hurd
parentf9011787497a276f84ef79ae233992692a626dc7 (diff)
downloadglibc-a9175662f8cdce65aa9e2c54ea09cbebd1215f7a.tar.gz
glibc-a9175662f8cdce65aa9e2c54ea09cbebd1215f7a.tar.xz
glibc-a9175662f8cdce65aa9e2c54ea09cbebd1215f7a.zip
Hurd: Use __sigmask in favor of deprecated sigmask
This fixes various build errors due to deprecation warnings.

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

Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'hurd')
-rw-r--r--hurd/catch-signal.c10
-rw-r--r--hurd/hurd/sigpreempt.h2
-rw-r--r--hurd/hurdfault.h2
-rw-r--r--hurd/hurdsig.c4
4 files changed, 9 insertions, 9 deletions
diff --git a/hurd/catch-signal.c b/hurd/catch-signal.c
index 67667443a5..059a8690f6 100644
--- a/hurd/catch-signal.c
+++ b/hurd/catch-signal.c
@@ -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
diff --git a/hurd/hurd/sigpreempt.h b/hurd/hurd/sigpreempt.h
index 2591c472d3..4ab5b1369f 100644
--- a/hurd/hurd/sigpreempt.h
+++ b/hurd/hurd/sigpreempt.h
@@ -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)
 
 
diff --git a/hurd/hurdfault.h b/hurd/hurdfault.h
index 61ccc785e5..a83717222e 100644
--- a/hurd/hurdfault.h
+++ b/hurd/hurdfault.h
@@ -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)
 
 
diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
index 4d819d9af2..3150091e84 100644
--- a/hurd/hurdsig.c
+++ b/hurd/hurdsig.c
@@ -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