From patchwork Tue Jan 30 20:43:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 867667 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-89833-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="n3BU8c6D"; 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 3zWJHT2t48z9sP1 for ; Wed, 31 Jan 2018 07:43:17 +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; q=dns; s= default; b=uTzbrTnOIVc5uCtmyrCYEe3gOaVVZgwwstToRGYSfH1UGralHLdIR 9brnC8kZZypJaq4p66Cn2TqC+fdFPQxETNXiG29BOUPeTUfxZtSw5ES9HvjW2vyB zywSvMfJ3j5lwM6q374u0R7ug/0UGboHGljJ7ruEfztLjvWxR+VoKQ= 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; s=default; bh=V0itlpplU4CcdR97VNQ1KkulCbI=; b=n3BU8c6Dr0JJh4oQLTuJgWZB0EFP Bb9sEYezUJJMALdb/8iUnrOxibl4X15Qcz9aIXQQ9zZXHIJadD/IwxtXOSzqu1GI 9yB9IKEayjQSaCXgQ7oPZ2FQuxr7VmKNIO7wj/Mmm4Wfe5fi64O1sfIG7hvRw6mM ObRtK7RmWKIeHYI= Received: (qmail 28624 invoked by alias); 30 Jan 2018 20:43:11 -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 28612 invoked by uid 89); 30 Jan 2018 20:43:11 -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] allocalim.h: use __glibc_likely instead of __builtin_expect Date: Tue, 30 Jan 2018 21:43:05 +0100 Message-Id: <20180130204305.9239-1-samuel.thibault@ens-lyon.org> * sysdeps/pthread/allocalim.h (__libc_use_alloca): Use __glibc_likely instead of __builtin_expect. --- ChangeLog | 5 +++++ sysdeps/pthread/allocalim.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c4868434c..06250f9007 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-01-30 Samuel Thibault * nss/bug17079.c (do_test): Use nss_files only for reading passwd diff --git a/sysdeps/pthread/allocalim.h b/sysdeps/pthread/allocalim.h index 38faf57b70..99f74838dd 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 (__builtin_expect (__libc_alloca_cutoff (size), 1) + return (__glibc_likely (__libc_alloca_cutoff (size)) #ifdef PTHREAD_STACK_MIN - || __builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1) + || __glibc_likely (size <= PTHREAD_STACK_MIN / 4) #endif ); }