{"id":810279,"url":"http://patchwork.ozlabs.org/api/patches/810279/?format=json","web_url":"http://patchwork.ozlabs.org/project/glibc/patch/1504643122-14874-5-git-send-email-adhemerval.zanella@linaro.org/","project":{"id":41,"url":"http://patchwork.ozlabs.org/api/projects/41/?format=json","name":"GNU C Library","link_name":"glibc","list_id":"libc-alpha.sourceware.org","list_email":"libc-alpha@sourceware.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504643122-14874-5-git-send-email-adhemerval.zanella@linaro.org>","list_archive_url":null,"date":"2017-09-05T20:25:17","name":"[4/9] Sync scratch_buffer with gnulib","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"364398d9f73e0938ba2ef287717f6fb51c83ac81","submitter":{"id":66065,"url":"http://patchwork.ozlabs.org/api/people/66065/?format=json","name":"Adhemerval Zanella Netto","email":"adhemerval.zanella@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/glibc/patch/1504643122-14874-5-git-send-email-adhemerval.zanella@linaro.org/mbox/","series":[{"id":1647,"url":"http://patchwork.ozlabs.org/api/series/1647/?format=json","web_url":"http://patchwork.ozlabs.org/project/glibc/list/?series=1647","date":"2017-09-05T20:25:13","name":"posix: glob fixes and refactor","version":1,"mbox":"http://patchwork.ozlabs.org/series/1647/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810279/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810279/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","mailing list libc-alpha@sourceware.org"],"Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=sourceware.org\n\t(client-ip=209.132.180.131; helo=sourceware.org;\n\tenvelope-from=libc-alpha-return-84210-incoming=patchwork.ozlabs.org@sourceware.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tsecure) header.d=sourceware.org header.i=@sourceware.org\n\theader.b=\"geP8WPZ8\"; dkim-atps=neutral","sourceware.org; auth=none"],"Received":["from sourceware.org (server1.sourceware.org [209.132.180.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xmysp0qGkz9t2c\n\tfor ;\n\tWed, 6 Sep 2017 06:26:21 +1000 (AEST)","(qmail 49302 invoked by alias); 5 Sep 2017 20:25:53 -0000","(qmail 48698 invoked by uid 89); 5 Sep 2017 20:25:47 -0000"],"DomainKey-Signature":"a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:from:to:cc:subject:date:message-id:in-reply-to\n\t:references; q=dns; s=default; b=Fn0KYJ6vGmGK+ZSfr2ApFaGnBn06SU/\n\t6ySsozPnrjYj8MP6a3LTx2YkMPlrD3js/qZ5+ttO1I5hpRIfOcw52EVqMan0m8RI\n\trZ5ni8n3FdQDGB2Q7USiAiSa6RBp8pwbsL1qt5bukaVGQzEOV1k7z8jGaoy1IogU\n\tD1e7HLp99rZg=","DKIM-Signature":"v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:from:to:cc:subject:date:message-id:in-reply-to\n\t:references; s=default; bh=TU3l6j62j8eYc0Oqx+FPOHXejcM=; b=geP8W\n\tPZ8w5Wvyc6Sh1WCGyPmlpP8qK02sTjqmQMa2aqI/+K6wptqiNvWLaLarJf2RxJXh\n\tJRUtDIsRqspAPtA+xlzXOzF2rtHJh8i3rdIb9hLRUsC+5QfMJhBVhUmlASLBEsGG\n\tmKlaBrmYg5v9pEl/uPJ11Nbg7dp2pb6EqvNyok=","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":",\n\t","Sender":"libc-alpha-owner@sourceware.org","X-Virus-Found":"No","X-Spam-SWARE-Status":"No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0,\n\tGIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE,\n\tRCVD_IN_SORBS_SPAM,\n\tSPF_PASS autolearn=ham version=3.3.2 spammy=","X-HELO":"mail-qk0-f173.google.com","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=vNvXvq/YMFrd6O0WBAEOcoW3aw/0OUbKgfdhdeg2PX4=;\n\tb=SzsrPZelGED90Nj5Cau0MJX8MpbP35m+nT5HplIS4eacWZUjBZT5RXWU2mzhMm0LHL\n\tsDv8iwIJvBMr7Ch691uc4JTStyVWgOLBzOwUDYZX69lMdiD9tGE/JptIGOYJ033Ei3kJ\n\tWSbhPiYk1NtfUawkx2apee3uoWLZevKxF3AZQJmHAA8s8rE3MyZZ8HDU5C+GRvL9Ayp+\n\t2DVifjfxdJOG9tCIWCN1dbe7UOrfNTBsMeUSvL49i6WyY2CdAu1Z8XPqvLisv81AtYYg\n\tl/b4Bmb5rUT9RGO6gQlP6Ew6KWdvPG9DGxtGmcoyyQliy2EyLye644BS3MbjLjHQ+DIz\n\t5QPg==","X-Gm-Message-State":"AHPjjUgo4chA1VDRbmfKDVptGlHuVQxFi5Jv6dePn2C6fC2ZWGdy3saD\n\tDT+3r8r4LWCe0Tgeomt3lA==","X-Google-Smtp-Source":"ADKCNb59IurxUORVc3t5j4aUlWMDzJ0qCrSqQodAnGDkSC6uuCyz5ljaazhJZrfidgK9d17Pcs/zUg==","X-Received":"by 10.55.176.1 with SMTP id z1mr483053qke.44.1504643138872;\n\tTue, 05 Sep 2017 13:25:38 -0700 (PDT)","From":"Adhemerval Zanella ","To":"libc-alpha@sourceware.org","Cc":"Paul Eggert ","Subject":"[PATCH 4/9] Sync scratch_buffer with gnulib","Date":"Tue, 5 Sep 2017 17:25:17 -0300","Message-Id":"<1504643122-14874-5-git-send-email-adhemerval.zanella@linaro.org>","In-Reply-To":"<1504643122-14874-1-git-send-email-adhemerval.zanella@linaro.org>","References":"<1504643122-14874-1-git-send-email-adhemerval.zanella@linaro.org>"},"content":"This patch syncs the scratch_buffer grom gnulib commit 3866ef6 with\nGLIBC code.\n\nChecked on x86_64-linux-gnu and on a build using build-many-glibcs.py\nfor all major architectures.\n\n\t* include/scratch_buffer.h (scratch_buffer): Use a C99 align method\n\tinstead of GCC extension.\n\t* malloc/scratch_buffer_grow.c [!_LIBC]: Include libc-config.h.\n\t* malloc/scratch_buffer_grow_preserve.c [!_LIBC]: Likewise.\n\t* malloc/scratch_buffer_set_array_size.c [!_LIBC]: Likewise.\n---\n ChangeLog | 6 ++++++\n include/scratch_buffer.h | 3 +--\n malloc/scratch_buffer_grow.c | 6 +++++-\n malloc/scratch_buffer_grow_preserve.c | 6 +++++-\n malloc/scratch_buffer_set_array_size.c | 6 +++++-\n 5 files changed, 22 insertions(+), 5 deletions(-)","diff":"diff --git a/include/scratch_buffer.h b/include/scratch_buffer.h\nindex dd17a4a..bb04662 100644\n--- a/include/scratch_buffer.h\n+++ b/include/scratch_buffer.h\n@@ -66,8 +66,7 @@\n struct scratch_buffer {\n void *data; /* Pointer to the beginning of the scratch area. */\n size_t length; /* Allocated space at the data pointer, in bytes. */\n- char __space[1024]\n- __attribute__ ((aligned (__alignof__ (max_align_t))));\n+ max_align_t __space[(1023 + sizeof (max_align_t)) / sizeof (max_align_t)];\n };\n \n /* Initializes *BUFFER so that BUFFER->data points to BUFFER->__space\ndiff --git a/malloc/scratch_buffer_grow.c b/malloc/scratch_buffer_grow.c\nindex 22bae50..d2df028 100644\n--- a/malloc/scratch_buffer_grow.c\n+++ b/malloc/scratch_buffer_grow.c\n@@ -16,6 +16,10 @@\n License along with the GNU C Library; if not, see\n . */\n \n+#ifndef _LIBC\n+# include \n+#endif\n+\n #include \n #include \n \n@@ -49,4 +53,4 @@ __libc_scratch_buffer_grow (struct scratch_buffer *buffer)\n buffer->length = new_length;\n return true;\n }\n-libc_hidden_def (__libc_scratch_buffer_grow);\n+libc_hidden_def (__libc_scratch_buffer_grow)\ndiff --git a/malloc/scratch_buffer_grow_preserve.c b/malloc/scratch_buffer_grow_preserve.c\nindex 18543ef..9268615 100644\n--- a/malloc/scratch_buffer_grow_preserve.c\n+++ b/malloc/scratch_buffer_grow_preserve.c\n@@ -16,6 +16,10 @@\n License along with the GNU C Library; if not, see\n . */\n \n+#ifndef _LIBC\n+# include \n+#endif\n+\n #include \n #include \n #include \n@@ -60,4 +64,4 @@ __libc_scratch_buffer_grow_preserve (struct scratch_buffer *buffer)\n buffer->length = new_length;\n return true;\n }\n-libc_hidden_def (__libc_scratch_buffer_grow_preserve);\n+libc_hidden_def (__libc_scratch_buffer_grow_preserve)\ndiff --git a/malloc/scratch_buffer_set_array_size.c b/malloc/scratch_buffer_set_array_size.c\nindex 8ab6d9d..6fcc115 100644\n--- a/malloc/scratch_buffer_set_array_size.c\n+++ b/malloc/scratch_buffer_set_array_size.c\n@@ -16,6 +16,10 @@\n License along with the GNU C Library; if not, see\n . */\n \n+#ifndef _LIBC\n+# include \n+#endif\n+\n #include \n #include \n #include \n@@ -57,4 +61,4 @@ __libc_scratch_buffer_set_array_size (struct scratch_buffer *buffer,\n buffer->length = new_length;\n return true;\n }\n-libc_hidden_def (__libc_scratch_buffer_set_array_size);\n+libc_hidden_def (__libc_scratch_buffer_set_array_size)\n","prefixes":["4/9"]}