From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 2CA551F55B for ; Thu, 28 May 2020 09:23:25 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5BD1C395C038; Thu, 28 May 2020 09:23:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5BD1C395C038 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1590657804; bh=KF3tj0tzzSy6pY3ycbcBIXjpy+gcVAO9xVMrDMYcWNs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=o5POucAe2bX+89zruJqMKt+ChnrWAYIesABpxbijGPOF/wNP/AAqGY4x3xTE138Bq LdBCiBwkxlIq0Ide7TIo3mkVn6D3nmFzDwkxo1lyoBA4Rp4EEupJYrkeb1hMg/K86P hY3WNuyPcX1r6WNhenqPPxhfsXW9Tm2SwE/Dfh78= Received: from albireo.enyo.de (albireo.enyo.de [37.24.231.21]) by sourceware.org (Postfix) with ESMTPS id E7B54386F46E for ; Thu, 28 May 2020 09:23:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E7B54386F46E Received: from [172.17.203.2] (helo=deneb.enyo.de) by albireo.enyo.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1jeEky-0001dQ-SJ; Thu, 28 May 2020 09:23:20 +0000 Received: from fw by deneb.enyo.de with local (Exim 4.92) (envelope-from ) id 1jeEky-00016F-QP; Thu, 28 May 2020 11:23:20 +0200 To: libc-alpha@sourceware.org Subject: [PATCH 2/2] Hurd: Move internals into wrapper header Message-ID: <87y2pcmn3a.fsf@totally-fudged-out-message-id> Date: Thu, 28 May 2020 11:23:20 +0200 MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Florian Weimer via Libc-alpha Reply-To: Florian Weimer Cc: commit-hurd@gnu.org Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" _hurdsig_preemptors and _hurdsig_preempted_set are not ABI symbols, so do not declare them. HURD_PREEMPT_SIGNAL_P is an implementation detail, so move it as well. --- hurd/hurd/sigpreempt.h | 10 -------- sysdeps/hurd/include/hurd/sigpreempt.h | 32 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 sysdeps/hurd/include/hurd/sigpreempt.h diff --git a/hurd/hurd/sigpreempt.h b/hurd/hurd/sigpreempt.h index 4ab5b1369f..8cbf66a198 100644 --- a/hurd/hurd/sigpreempt.h +++ b/hurd/hurd/sigpreempt.h @@ -50,16 +50,6 @@ struct hurd_signal_preemptor struct hurd_signal_preemptor *next; /* List structure. */ }; -#define HURD_PREEMPT_SIGNAL_P(preemptor, signo, sigcode) \ - (((preemptor)->signals & __sigmask (signo)) \ - && (sigcode) >= (preemptor)->first && (sigcode) <= (preemptor)->last) - - -/* Signal preemptors applying to all threads; locked by _hurd_siglock. */ -extern struct hurd_signal_preemptor *_hurdsig_preemptors; -extern sigset_t _hurdsig_preempted_set; - - /* The caller must initialize all members of *PREEMPTOR except `next'. The preemptor is registered on the global list. */ void hurd_preempt_signals (struct hurd_signal_preemptor *preemptor); diff --git a/sysdeps/hurd/include/hurd/sigpreempt.h b/sysdeps/hurd/include/hurd/sigpreempt.h new file mode 100644 index 0000000000..fc0fdfd5e8 --- /dev/null +++ b/sysdeps/hurd/include/hurd/sigpreempt.h @@ -0,0 +1,32 @@ +/* Preemption of Hurd signals before POSIX.1 semantics take over. Wrapper. + Copyright (C) 1996-2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _HURD_SIGPREEMPT_H +# include + +# ifndef _ISOMAC +# define HURD_PREEMPT_SIGNAL_P(preemptor, signo, sigcode) \ + (((preemptor)->signals & __sigmask (signo)) \ + && (sigcode) >= (preemptor)->first && (sigcode) <= (preemptor)->last) + +/* Signal preemptors applying to all threads; locked by _hurd_siglock. */ +extern struct hurd_signal_preemptor *_hurdsig_preemptors; +extern sigset_t _hurdsig_preempted_set; + +# endif /* _ISOMAC */ +#endif /* _HURD_SIGPREEMPT_H */ -- 2.20.1