From patchwork Mon Jan 29 22:00:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 867327 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-89806-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="BroI2hVj"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zVk5F5DvZz9s71 for ; Tue, 30 Jan 2018 09:02:25 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=xuAd0wuPSEt97nGvD9abBa1nhcMwpMV cdtm5ySPU0OYpW7rzUadWWMWbCfun/1T/xlaUu4Rr1Qy1B4OI5PYqFKmfKoDIm8l RHbaRwmbi0P/lsUHdaBxLoVJx5xG7mdFkgo9s02X1DORWd4Ub4CuSnKIKc+6zqTV t1aNlpAespFU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=a9rrBdKem2rYEiBs9BCpixiPUVA=; b=BroI2 hVjF37KC+WJ50bLRCUjGge9JXA8M9eefzDmwYneZJulf3NJXcK8EEggYxaLfIWOz SxKMJ8XOvh0gW5xFi7FhFJtz5Bp5I3NTAtKjS/Chm4rTYkmBN5hFCBhGZuzKTLvM M6GOqMBpbSbJVOqGjBqyQygrafP/n6XTitJ4Po= Received: (qmail 50682 invoked by alias); 29 Jan 2018 22:01:57 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 50529 invoked by uid 89); 29 Jan 2018 22:01:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited 1/6] hurd: Fix preprocessor indentation Date: Mon, 29 Jan 2018 23:00:43 +0100 Message-Id: <20180129220048.28097-2-samuel.thibault@ens-lyon.org> In-Reply-To: <20180129220048.28097-1-samuel.thibault@ens-lyon.org> References: <20180129220048.28097-1-samuel.thibault@ens-lyon.org> --- hurd/hurd/fd.h | 8 ++++---- hurd/hurd/port.h | 24 ++++++++++++------------ hurd/hurd/signal.h | 18 +++++++++--------- hurd/hurd/threadvar.h | 8 ++++---- hurd/hurd/userlink.h | 12 ++++++------ 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/hurd/hurd/fd.h b/hurd/hurd/fd.h index f43dec508a..22dc944dce 100644 --- a/hurd/hurd/fd.h +++ b/hurd/hurd/fd.h @@ -62,7 +62,7 @@ extern struct mutex _hurd_dtable_lock; /* Locks those two variables. */ extern struct hurd_fd *_hurd_fd_get (int fd); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_FD_H_EXTERN_INLINE struct hurd_fd * _hurd_fd_get (int fd) { @@ -95,7 +95,7 @@ _hurd_fd_get (int fd) return descriptor; } -# endif +# endif #endif @@ -281,7 +281,7 @@ extern int _hurd_select (int nfds, struct pollfd *pollfds, __hurd_file_name_lookup. */ #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_FD_H_EXTERN_INLINE error_t __hurd_at_flags (int *at_flags, int *flags) { @@ -298,7 +298,7 @@ __hurd_at_flags (int *at_flags, int *flags) return 0; } -# endif +# endif #endif /* Variant of file_name_lookup used in *at function implementations. diff --git a/hurd/hurd/port.h b/hurd/hurd/port.h index f1da86951d..eec85ccc29 100644 --- a/hurd/hurd/port.h +++ b/hurd/hurd/port.h @@ -63,7 +63,7 @@ struct hurd_port extern void _hurd_port_init (struct hurd_port *port, mach_port_t init); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_PORT_H_EXTERN_INLINE void _hurd_port_init (struct hurd_port *port, mach_port_t init) { @@ -71,7 +71,7 @@ _hurd_port_init (struct hurd_port *port, mach_port_t init) port->users = NULL; port->port = init; } -# endif +# endif #endif @@ -86,7 +86,7 @@ _hurd_port_locked_get (struct hurd_port *port, struct hurd_userlink *link); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_PORT_H_EXTERN_INLINE mach_port_t _hurd_port_locked_get (struct hurd_port *port, struct hurd_userlink *link) @@ -102,7 +102,7 @@ _hurd_port_locked_get (struct hurd_port *port, __spin_unlock (&port->lock); return result; } -# endif +# endif #endif /* Same, but locks PORT first. */ @@ -112,7 +112,7 @@ _hurd_port_get (struct hurd_port *port, struct hurd_userlink *link); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_PORT_H_EXTERN_INLINE mach_port_t _hurd_port_get (struct hurd_port *port, struct hurd_userlink *link) @@ -124,7 +124,7 @@ _hurd_port_get (struct hurd_port *port, HURD_CRITICAL_END; return result; } -# endif +# endif #endif @@ -136,7 +136,7 @@ _hurd_port_free (struct hurd_port *port, mach_port_t used_port); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_PORT_H_EXTERN_INLINE void _hurd_port_free (struct hurd_port *port, struct hurd_userlink *link, @@ -156,7 +156,7 @@ _hurd_port_free (struct hurd_port *port, if (dealloc) __mach_port_deallocate (__mach_task_self (), used_port); } -# endif +# endif #endif @@ -166,7 +166,7 @@ _hurd_port_free (struct hurd_port *port, extern void _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_PORT_H_EXTERN_INLINE void _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport) { @@ -177,7 +177,7 @@ _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport) if (old != MACH_PORT_NULL) __mach_port_deallocate (__mach_task_self (), old); } -# endif +# endif #endif /* Same, but locks PORT first. */ @@ -185,7 +185,7 @@ _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport) extern void _hurd_port_set (struct hurd_port *port, mach_port_t newport); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_PORT_H_EXTERN_INLINE void _hurd_port_set (struct hurd_port *port, mach_port_t newport) { @@ -194,7 +194,7 @@ _hurd_port_set (struct hurd_port *port, mach_port_t newport) _hurd_port_locked_set (port, newport); HURD_CRITICAL_END; } -# endif +# endif #endif diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h index 5ee95acd09..53234724a4 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -43,9 +43,9 @@ #include /* We cache sigstate in a threadvar. */ struct hurd_signal_preemptor; /* */ #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) || IS_IN (libpthread) -# include -# endif +# if IS_IN (libc) || IS_IN (libpthread) +# include +# endif #endif @@ -135,7 +135,7 @@ extern struct hurd_sigstate *_hurd_self_sigstate (void) #endif #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_SIGNAL_H_EXTERN_INLINE struct hurd_sigstate * _hurd_self_sigstate (void) { @@ -145,7 +145,7 @@ _hurd_self_sigstate (void) *location = _hurd_thread_sigstate (__mach_thread_self ()); return *location; } -# endif +# endif #endif /* Thread listening on our message port; also called the "signal thread". */ @@ -176,7 +176,7 @@ extern int _hurd_core_limit; extern void *_hurd_critical_section_lock (void); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_SIGNAL_H_EXTERN_INLINE void * _hurd_critical_section_lock (void) { @@ -201,13 +201,13 @@ _hurd_critical_section_lock (void) _hurd_critical_section_unlock to unlock it. */ return ss; } -# endif +# endif #endif extern void _hurd_critical_section_unlock (void *our_lock); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_SIGNAL_H_EXTERN_INLINE void _hurd_critical_section_unlock (void *our_lock) { @@ -230,7 +230,7 @@ _hurd_critical_section_unlock (void *our_lock) __msg_sig_post (_hurd_msgport, 0, 0, __mach_task_self ()); } } -# endif +# endif #endif /* Convenient macros for simple uses of critical sections. diff --git a/hurd/hurd/threadvar.h b/hurd/hurd/threadvar.h index b5fc29da77..9b9b863dd6 100644 --- a/hurd/hurd/threadvar.h +++ b/hurd/hurd/threadvar.h @@ -83,7 +83,7 @@ extern unsigned long int *__hurd_threadvar_location_from_sp (enum __hurd_threadvar_index __index, void *__sp); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_THREADVAR_H_EXTERN_INLINE unsigned long int * __hurd_threadvar_location_from_sp (enum __hurd_threadvar_index __index, void *__sp) @@ -95,7 +95,7 @@ __hurd_threadvar_location_from_sp (enum __hurd_threadvar_index __index, : (unsigned long int *) ((__stack & __hurd_threadvar_stack_mask) + __hurd_threadvar_stack_offset))[__index]; } -# endif +# endif #endif #include /* Define __thread_stack_pointer. */ @@ -111,14 +111,14 @@ __hurd_threadvar_location (enum __hurd_threadvar_index __index) __THROW __attribute__ ((__const__)); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_THREADVAR_H_EXTERN_INLINE unsigned long int * __hurd_threadvar_location (enum __hurd_threadvar_index __index) { return __hurd_threadvar_location_from_sp (__index, __thread_stack_pointer ()); } -# endif +# endif #endif diff --git a/hurd/hurd/userlink.h b/hurd/hurd/userlink.h index 66c04067a1..fb7cab27c3 100644 --- a/hurd/hurd/userlink.h +++ b/hurd/hurd/userlink.h @@ -81,7 +81,7 @@ _hurd_userlink_link (struct hurd_userlink **chainp, struct hurd_userlink *link); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_USERLINK_H_EXTERN_INLINE void _hurd_userlink_link (struct hurd_userlink **chainp, struct hurd_userlink *link) @@ -102,7 +102,7 @@ _hurd_userlink_link (struct hurd_userlink **chainp, link->thread.prevp = thread_chainp; *thread_chainp = link; } -# endif +# endif #endif @@ -112,7 +112,7 @@ _hurd_userlink_link (struct hurd_userlink **chainp, extern int _hurd_userlink_unlink (struct hurd_userlink *link); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_USERLINK_H_EXTERN_INLINE int _hurd_userlink_unlink (struct hurd_userlink *link) { @@ -135,7 +135,7 @@ _hurd_userlink_unlink (struct hurd_userlink *link) return dealloc; } -# endif +# endif #endif @@ -148,7 +148,7 @@ _hurd_userlink_unlink (struct hurd_userlink *link) extern int _hurd_userlink_clear (struct hurd_userlink **chainp); #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) +# if IS_IN (libc) _HURD_USERLINK_H_EXTERN_INLINE int _hurd_userlink_clear (struct hurd_userlink **chainp) { @@ -161,7 +161,7 @@ _hurd_userlink_clear (struct hurd_userlink **chainp) *chainp = NULL; return 0; } -# endif +# endif #endif #endif /* hurd/userlink.h */ From patchwork Mon Jan 29 22:00:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 867333 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-89808-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="E/xwBBaL"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zVkFc5Wt4z9s71 for ; Tue, 30 Jan 2018 09:09:40 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=Lx+7/wagQdcgCaVuZnjNT8+iQJs84QO T1m1zFHp+ZKn2UBqVwO54te41nuKCeL6A5xE+G1CB0X5fdZGGEluonIxthCgY5XL FiUCdJBDuqMR/cxjYsx67YjzyU5+xZYOBx7XrNkVXxy7S7N+fayW2o9wUa9eUJnS 9uiUKYqsA7j0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=5w0DDTWVw0zIgSkg5Q73emUnL6s=; b=E/xwB BaLvtSdxg+E531dwgUuXKU3qDO09ep5KUyu2cWtvsgXd4tAnHsrvmOF/FXCXsOdd lErE/lzq+HEZp8TkhDPh31jTASZF/+LtJbZyimUzOaLk4NHKYZLEyl4L3bTZKIwv eWIBbuAG61GopKdBw61GN4CNDkLyeez/VOZtxs= Received: (qmail 74365 invoked by alias); 29 Jan 2018 22:09:35 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 74353 invoked by uid 89); 29 Jan 2018 22:09:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited 2/6] hurd: Fix ChangeLog date Date: Mon, 29 Jan 2018 23:00:44 +0100 Message-Id: <20180129220048.28097-3-samuel.thibault@ens-lyon.org> In-Reply-To: <20180129220048.28097-1-samuel.thibault@ens-lyon.org> References: <20180129220048.28097-1-samuel.thibault@ens-lyon.org> --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6fefbee51e..873646e685 100644 --- a/ChangeLog +++ b/ChangeLog @@ -371,7 +371,7 @@ * sysdeps/mach/hurd/net/if_ppp.h: Do not include non-existing . -2008-12-18 Thomas Schwinge +2018-01-27 Thomas Schwinge * hurd/fcntl-internal.h: New file. From patchwork Mon Jan 29 22:00:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 867325 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-89804-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="PU4/ypzL"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zVk4w6sm6z9sBd for ; Tue, 30 Jan 2018 09:02:08 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=HAgc95Fs3LTbSaSMiGaA7GSaQCn8lpJ yqk7T/JtnrAst6LaElT0bQZNO6zwKUY8qxrNlQ47DyhGHNGhRut9SByiACjPoL29 V/dQOlEMFEwMWm7S25RfzdKj1WS9cNZ4ftZK4C34V/7De42gZp+/1EhPFOiqMv1T xhFKizz/4VL8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=ZCe7UGFR8/UfM6X7IZ2iVPuxJd4=; b=PU4/y pzL+o1owHXkWPsL2e2/FAeI6GlD+Fcl1/xzro4Sr7v98QxV20GqvGHe35Z+KUF6N Ku4L48L5HjBtogRHE24l5fIzG1Nasxb9Jvw/TuPJpbsjvL0wJ6IFCBytHw86llKy 54Vc13u4lHk6+8YYWpDvgHLNVlsManh1iQUz6Y= Received: (qmail 50519 invoked by alias); 29 Jan 2018 22:01:56 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 50411 invoked by uid 89); 29 Jan 2018 22:01:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy=UD:libresolv.abilist, sk:libreso, librt.abilist, libutilabilist X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited 3/6] allocalim.h: Fix codestyle Date: Mon, 29 Jan 2018 23:00:45 +0100 Message-Id: <20180129220048.28097-4-samuel.thibault@ens-lyon.org> In-Reply-To: <20180129220048.28097-1-samuel.thibault@ens-lyon.org> References: <20180129220048.28097-1-samuel.thibault@ens-lyon.org> * sysdeps/pthread/allocalim.h (__libc_use_alloca): Commute operands of || to respect codestyle. --- ChangeLog | 2 ++ sysdeps/pthread/allocalim.h | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 873646e685..476cb73847 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,8 @@ * sysdeps/mach/hurd/i386/libresolv.abilist: New file. * sysdeps/mach/hurd/i386/librt.abilist: New file. * sysdeps/mach/hurd/i386/libutil.abilist: New file. + * sysdeps/pthread/allocalim.h (__libc_use_alloca): Commute operands of + || to respect codestyle. 2018-01-29 Darius Rad diff --git a/sysdeps/pthread/allocalim.h b/sysdeps/pthread/allocalim.h index fdae0c251f..38faf57b70 100644 --- a/sysdeps/pthread/allocalim.h +++ b/sysdeps/pthread/allocalim.h @@ -24,9 +24,9 @@ extern __always_inline int __libc_use_alloca (size_t size) { - return ( + return (__builtin_expect (__libc_alloca_cutoff (size), 1) #ifdef PTHREAD_STACK_MIN - __builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1) || + || __builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1) #endif - __builtin_expect (__libc_alloca_cutoff (size), 1)); + ); } From patchwork Mon Jan 29 22:00:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 867326 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-89805-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="CA8MkrJv"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zVk551Dpkz9s71 for ; Tue, 30 Jan 2018 09:02:16 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=ZNTRKvLPiFpoBK9BFCRA0acCdTbaDDw uyOXpp1lorbbFWUs4TA0l6qUSdYm+xmERAFccrP+W0nTlqoCx1d8aPD+Hr1iKnlq fMBDtgLN3TDo//xAgeFJvKOwM7ri+4c3fxBgNvQYDyRnzDzXyG2t0gMkWWyjhB87 lQSFU/3IIymU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=VDVFEmxnJ8NDGvRoFyvfoOkFXgs=; b=CA8Mk rJvHe5Rrg0+TobT68SGNK4pCGZlQ6vaPPlk6U6vaQ7lwhHQImsaB9GRjzaR/1MEh Ixt80iopEhAeiIlEFFqUmaEQp+kiT+q+UgjtvC272uILmcL/kOBo+kzgDuR+ZUa/ XL754spTGbx7cvM+7+1i6uWYKzjbohFqR3NVCg= Received: (qmail 50648 invoked by alias); 29 Jan 2018 22:01:57 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 50484 invoked by uid 89); 29 Jan 2018 22:01:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL, UNSUBSCRIBE_BODY autolearn=ham version=3.3.2 spammy=UD:libutil.abilist, libutilabilist, libutil.abilist X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited 4/6] libio: Rename _FWRITE to FWRITE_FUNC Date: Mon, 29 Jan 2018 23:00:46 +0100 Message-Id: <20180129220048.28097-5-samuel.thibault@ens-lyon.org> In-Reply-To: <20180129220048.28097-1-samuel.thibault@ens-lyon.org> References: <20180129220048.28097-1-samuel.thibault@ens-lyon.org> _FWRITE would be in the reserved-namespace. * libio/tst-memstream3.c (_FWRITE): Rename to FWRITE_FUNC. (do_test_bz20181): Rename accordingly. --- ChangeLog | 2 ++ libio/tst-memstream3.c | 10 +++++----- libio/tst-wmemstream3.c | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 476cb73847..2694f6d363 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ * sysdeps/mach/hurd/i386/libutil.abilist: New file. * sysdeps/pthread/allocalim.h (__libc_use_alloca): Commute operands of || to respect codestyle. + * libio/tst-memstream3.c (_FWRITE): Rename to FWRITE_FUNC. + (do_test_bz20181): Rename accordingly. 2018-01-29 Darius Rad diff --git a/libio/tst-memstream3.c b/libio/tst-memstream3.c index df0da5bac5..bb3300dc57 100644 --- a/libio/tst-memstream3.c +++ b/libio/tst-memstream3.c @@ -29,7 +29,7 @@ # define W(o) o # define OPEN_MEMSTREAM open_memstream # define PRINTF printf -# define _FWRITE fwrite +# define FWRITE_FUNC fwrite # define FPUTC fputc # define STRCMP strcmp #endif @@ -114,14 +114,14 @@ do_test_bz20181 (void) if (fp == NULL) ERROR_RET1 ("%s failed\n", S(OPEN_MEMSTREAM)); - if ((ret = _FWRITE (W("abc"), 1, 3, fp)) != 3) - ERROR_RET1 ("%s failed (errno = %d)\n", S(_FWRITE), errno); + if ((ret = FWRITE_FUNC (W("abc"), 1, 3, fp)) != 3) + ERROR_RET1 ("%s failed (errno = %d)\n", S(FWRITE_FUNC), errno); if (fseek (fp, 0, SEEK_SET) != 0) ERROR_RET1 ("fseek failed (errno = %d)\n", errno); - if (_FWRITE (W("z"), 1, 1, fp) != 1) - ERROR_RET1 ("%s failed (errno = %d)\n", S(_FWRITE), errno); + if (FWRITE_FUNC (W("z"), 1, 1, fp) != 1) + ERROR_RET1 ("%s failed (errno = %d)\n", S(FWRITE_FUNC), errno); if (fflush (fp) != 0) ERROR_RET1 ("fflush failed (errno = %d)\n", errno); diff --git a/libio/tst-wmemstream3.c b/libio/tst-wmemstream3.c index 4edc2b9094..f24f0facc6 100644 --- a/libio/tst-wmemstream3.c +++ b/libio/tst-wmemstream3.c @@ -37,7 +37,7 @@ fwwrite (const void *ptr, size_t size, size_t nmemb, FILE *arq) #define W(o) L##o #define OPEN_MEMSTREAM open_wmemstream #define PRINTF wprintf -#define _FWRITE fwwrite +#define FWRITE_FUNC fwwrite #define FPUTC fputwc #define STRCMP wcscmp From patchwork Mon Jan 29 22:00:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 867328 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-89807-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="DQivZKYL"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zVk5Q4KRKz9s71 for ; Tue, 30 Jan 2018 09:02:34 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=w3dz0C0LRywxsyYVc9u5Yb/XxZ8MBgY irxbK3o3N8qAm50oi+ZN0hKl2th6R4hOKO/YkVUhhwIr/24V5LboZ/s5hUxLzzWM CJUHg92a3Z7x0wKPIMBb/UqwsD75sIgeO8NbkiTC1tfPEm5gujB+CeWL9XI/+e2F Amr6NR22czbA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=L/XKiEZk8K6j3//yqOIQuLC2wsI=; b=DQivZ KYLg5/8xQng9fUI3vQoaheTrMtDXLXIO6B3PScTGoX5xPk71fOIbz75TrnKkL3Fp lco4Pb2lvWonUk3/tN2rtETYMPiLXrLpjhLdVueVkVHEiJAK7hpivHINDl0q+P7o 3ysLsbSpyZ1Rt/9Shbk5zTGP/BFFfI1S88NUyc= Received: (qmail 51075 invoked by alias); 29 Jan 2018 22:01:59 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 50962 invoked by uid 89); 29 Jan 2018 22:01:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited 5/6] malloc: Use assert.h's assert macro Date: Mon, 29 Jan 2018 23:00:47 +0100 Message-Id: <20180129220048.28097-6-samuel.thibault@ens-lyon.org> In-Reply-To: <20180129220048.28097-1-samuel.thibault@ens-lyon.org> References: <20180129220048.28097-1-samuel.thibault@ens-lyon.org> This avoids assert definition conflicts if some of the headers used by malloc.c happens to include assert.h. Malloc still needs a malloc-avoiding implementation, which we get by redirecting __assert_fail to malloc's __malloc_assert. * malloc/malloc.c: Include . (assert): Do not define. [!defined NDEBUG] (__assert_fail): Define to __malloc_assert. --- ChangeLog | 3 +++ malloc/malloc.c | 11 ++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2694f6d363..c6bcba65dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,9 @@ || to respect codestyle. * libio/tst-memstream3.c (_FWRITE): Rename to FWRITE_FUNC. (do_test_bz20181): Rename accordingly. + * malloc/malloc.c: Include . + (assert): Do not define. + [!defined NDEBUG] (__assert_fail): Define to __malloc_assert. 2018-01-29 Darius Rad diff --git a/malloc/malloc.c b/malloc/malloc.c index 7889fb1961..f8e7250f70 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -223,6 +223,7 @@ #include #include /* needed for malloc_stats */ #include +#include #include @@ -278,13 +279,9 @@ #define MALLOC_DEBUG 0 #endif -#ifdef NDEBUG -# define assert(expr) ((void) 0) -#else -# define assert(expr) \ - ((expr) \ - ? ((void) 0) \ - : __malloc_assert (#expr, __FILE__, __LINE__, __func__)) +#ifndef NDEBUG +# define __assert_fail(assertion, file, line, function) \ + __malloc_assert(assertion, file, line, function) extern const char *__progname; From patchwork Mon Jan 29 22:00:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 867334 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-89809-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="RxJ2OZQu"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zVkFm3bXgz9s71 for ; Tue, 30 Jan 2018 09:09:48 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=jDjdm6pDJGdL2vntvmJNPyPZBS34fly koSLuwDmkzZ8RdrWOK5Bc4g2ic6SNfsefrdW0f0t1Ge8kWsTYIboAQWVMit4ELuB LZejb4p4SUA0xFUapBug1b2BPUKMrbmuLu8PGEqjzf7NALMtREF0Bb1D7ysZXgNV T/H1KzXO/Zws= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=nXpe5ja5Ki70DxV/NZL8fj7uI8Y=; b=RxJ2O ZQuTr+QV3wKiaMKlvu4BkWq9UtIHuNp9vXaCD1OdUW0wLpUOx5CNCPXmS1ekXJp8 OlmUkt/Ie0+RuhL0rmGY2NjmABgctlu1CUoMrsR04ZKgsRsfHnwLk9VXfuxLaalg KomWwbqUmDIX/Am3mxiFu+FiwdKDA9iMh3T7B0= Received: (qmail 74455 invoked by alias); 29 Jan 2018 22:09:35 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 74361 invoked by uid 89); 29 Jan 2018 22:09:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited 6/6] hurd: Fix comments for FREAD and FWRITE Date: Mon, 29 Jan 2018 23:00:48 +0100 Message-Id: <20180129220048.28097-7-samuel.thibault@ens-lyon.org> In-Reply-To: <20180129220048.28097-1-samuel.thibault@ens-lyon.org> References: <20180129220048.28097-1-samuel.thibault@ens-lyon.org> * bits/fcntl.h: Fix comment for FREAD and FWRITE. * sysdeps/mach/hurd/bits/fcntl.h: Likewise. --- ChangeLog | 2 ++ bits/fcntl.h | 5 +---- sysdeps/mach/hurd/bits/fcntl.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6bcba65dd..f74082f4cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,8 @@ * malloc/malloc.c: Include . (assert): Do not define. [!defined NDEBUG] (__assert_fail): Define to __malloc_assert. + * bits/fcntl.h: Fix comment for FREAD and FWRITE. + * sysdeps/mach/hurd/bits/fcntl.h: Likewise. 2018-01-29 Darius Rad diff --git a/bits/fcntl.h b/bits/fcntl.h index 7c62303829..671c9e6877 100644 --- a/bits/fcntl.h +++ b/bits/fcntl.h @@ -63,10 +63,7 @@ #endif #ifdef __USE_MISC -/* Bits in the file status flags returned by F_GETFL. - These are all the O_* flags, plus FREAD and FWRITE, which are - independent bits set by which of O_RDONLY, O_WRONLY, and O_RDWR, was - given to `open'. */ +/* Flags for TIOCFLUSH. */ # define FREAD 1 # define FWRITE 2 diff --git a/sysdeps/mach/hurd/bits/fcntl.h b/sysdeps/mach/hurd/bits/fcntl.h index cb8a6ff565..2cfaa872a5 100644 --- a/sysdeps/mach/hurd/bits/fcntl.h +++ b/sysdeps/mach/hurd/bits/fcntl.h @@ -135,7 +135,7 @@ #ifdef __USE_MISC -/* Bits in the file status flags returned by F_GETFL. */ +/* Flags for TIOCFLUSH. */ # define FREAD O_RDONLY # define FWRITE O_WRONLY