From patchwork Wed Jun 27 16:42:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 935599 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-93705-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="aKEONoHv"; 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 41G7xD2nYdz9s29 for ; Thu, 28 Jun 2018 02:42:24 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; q=dns; s=default; b= dPiXYs05+6+kMOO3LX6Zc61ZXOVMETXgeKdeZYmF80E4q8Lx4VckhftQilJQx1mh aIwG9+fpRZFupkhN3nUapOHn2ruFw1yi0eF/vcJOmjrMD8TxGYmXkJMdlCVTll5d bVcImqX2sRP231PeEbk9UAfYNC61tNDKie7wCeRcRhQ= 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:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; s=default; bh=XUUWVc mwUQonbeDtPXjXr+SZKIg=; b=aKEONoHvfirlq+OZPxUvdCCLgLtEAL0OTufon8 S6LD39QQVXXazXynC4Zax+bWP1aiWBsiyd18TeF45YtDAu4v4QP1rGZntbwjPDAk VjJRQGMTDFDRDzo9Q8fNKHto8figcFjpYLOqfN3vFrp0p14x0xhbfYf3VfMnpIAW 4v4So= Received: (qmail 49046 invoked by alias); 27 Jun 2018 16:42:18 -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 48517 invoked by uid 89); 27 Jun 2018 16:42:17 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Date: Wed, 27 Jun 2018 18:42:13 +0200 To: libc-alpha@sourceware.org Subject: [PATCH] Remove macros extend_alloca, extend_alloca_account [BZ #18023] User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20180627164213.7A3E943994575@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) The unused macro definition in posix/glob.c comes from gnulib and will have to be removed there. 2018-06-27 Florian Weimer [BZ #18023] * include/alloca.h (stackinfo_alloca_round, extend_alloca) (extend_alloca_account): Remove. * manual/stdio.texi (Variable Arguments Output): Update comment. diff --git a/include/alloca.h b/include/alloca.h index fd90664f0a..c0b8395443 100644 --- a/include/alloca.h +++ b/include/alloca.h @@ -23,57 +23,17 @@ libc_hidden_proto (__libc_alloca_cutoff) #include -#ifndef stackinfo_alloca_round -# define stackinfo_alloca_round(l) (((l) + 15) & -16) -#endif - -#if _STACK_GROWS_DOWN -# define extend_alloca(buf, len, newlen) \ - (__typeof (buf)) ({ size_t __newlen = stackinfo_alloca_round (newlen); \ - char *__newbuf = __alloca (__newlen); \ - if (__newbuf + __newlen == (char *) (buf)) \ - len += __newlen; \ - else \ - len = __newlen; \ - __newbuf; }) -#elif _STACK_GROWS_UP -# define extend_alloca(buf, len, newlen) \ - (__typeof (buf)) ({ size_t __newlen = stackinfo_alloca_round (newlen); \ - char *__newbuf = __alloca (__newlen); \ - char *__buf = (char *) (buf); \ - if (__buf + len == __newbuf) \ - { \ - len += __newlen; \ - __newbuf = __buf; \ - } \ - else \ - len = __newlen; \ - __newbuf; }) -#else -# define extend_alloca(buf, len, newlen) \ - __alloca (((len) = (newlen))) -#endif - #if defined stackinfo_get_sp && defined stackinfo_sub_sp # define alloca_account(size, avar) \ ({ void *old__ = stackinfo_get_sp (); \ void *m__ = __alloca (size); \ avar += stackinfo_sub_sp (old__); \ m__; }) -# define extend_alloca_account(buf, len, newlen, avar) \ - ({ void *old__ = stackinfo_get_sp (); \ - void *m__ = extend_alloca (buf, len, newlen); \ - avar += stackinfo_sub_sp (old__); \ - m__; }) #else # define alloca_account(size, avar) \ ({ size_t s__ = (size); \ avar += s__; \ __alloca (s__); }) -# define extend_alloca_account(buf, len, newlen, avar) \ - ({ size_t s__ = (newlen); \ - avar += s__; \ - extend_alloca (buf, len, s__); }) #endif # endif /* !_ISOMAC */ diff --git a/manual/stdio.texi b/manual/stdio.texi index 38be236991..379f003b3f 100644 --- a/manual/stdio.texi +++ b/manual/stdio.texi @@ -2622,7 +2622,6 @@ pointer @var{ap}. @c __libc_use_alloca @c process_arg @c process_string_arg -@c extend_alloca @c __parse_one_spec(wc|mb) @c *__printf_arginfo_table unguarded @c __printf_va_arg_table-> unguarded