From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 49302 invoked by alias); 5 Sep 2017 20:25:53 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 48698 invoked by uid 89); 5 Sep 2017 20:25:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,SPF_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; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vNvXvq/YMFrd6O0WBAEOcoW3aw/0OUbKgfdhdeg2PX4=; b=SzsrPZelGED90Nj5Cau0MJX8MpbP35m+nT5HplIS4eacWZUjBZT5RXWU2mzhMm0LHL sDv8iwIJvBMr7Ch691uc4JTStyVWgOLBzOwUDYZX69lMdiD9tGE/JptIGOYJ033Ei3kJ WSbhPiYk1NtfUawkx2apee3uoWLZevKxF3AZQJmHAA8s8rE3MyZZ8HDU5C+GRvL9Ayp+ 2DVifjfxdJOG9tCIWCN1dbe7UOrfNTBsMeUSvL49i6WyY2CdAu1Z8XPqvLisv81AtYYg l/b4Bmb5rUT9RGO6gQlP6Ew6KWdvPG9DGxtGmcoyyQliy2EyLye644BS3MbjLjHQ+DIz 5QPg== X-Gm-Message-State: AHPjjUgo4chA1VDRbmfKDVptGlHuVQxFi5Jv6dePn2C6fC2ZWGdy3saD DT+3r8r4LWCe0Tgeomt3lA== X-Google-Smtp-Source: ADKCNb59IurxUORVc3t5j4aUlWMDzJ0qCrSqQodAnGDkSC6uuCyz5ljaazhJZrfidgK9d17Pcs/zUg== X-Received: by 10.55.176.1 with SMTP id z1mr483053qke.44.1504643138872; Tue, 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, 05 Sep 2017 20:25:00 -0000 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> X-SW-Source: 2017-09/txt/msg00211.txt.bz2 This patch syncs the scratch_buffer grom gnulib commit 3866ef6 with GLIBC code. Checked on x86_64-linux-gnu and on a build using build-many-glibcs.py for all major architectures. * include/scratch_buffer.h (scratch_buffer): Use a C99 align method instead of GCC extension. * malloc/scratch_buffer_grow.c [!_LIBC]: Include libc-config.h. * malloc/scratch_buffer_grow_preserve.c [!_LIBC]: Likewise. * malloc/scratch_buffer_set_array_size.c [!_LIBC]: Likewise. --- ChangeLog | 6 ++++++ include/scratch_buffer.h | 3 +-- malloc/scratch_buffer_grow.c | 6 +++++- malloc/scratch_buffer_grow_preserve.c | 6 +++++- malloc/scratch_buffer_set_array_size.c | 6 +++++- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/include/scratch_buffer.h b/include/scratch_buffer.h index dd17a4a..bb04662 100644 --- a/include/scratch_buffer.h +++ b/include/scratch_buffer.h @@ -66,8 +66,7 @@ struct scratch_buffer { void *data; /* Pointer to the beginning of the scratch area. */ size_t length; /* Allocated space at the data pointer, in bytes. */ - char __space[1024] - __attribute__ ((aligned (__alignof__ (max_align_t)))); + max_align_t __space[(1023 + sizeof (max_align_t)) / sizeof (max_align_t)]; }; /* Initializes *BUFFER so that BUFFER->data points to BUFFER->__space diff --git a/malloc/scratch_buffer_grow.c b/malloc/scratch_buffer_grow.c index 22bae50..d2df028 100644 --- a/malloc/scratch_buffer_grow.c +++ b/malloc/scratch_buffer_grow.c @@ -16,6 +16,10 @@ License along with the GNU C Library; if not, see . */ +#ifndef _LIBC +# include +#endif + #include #include @@ -49,4 +53,4 @@ __libc_scratch_buffer_grow (struct scratch_buffer *buffer) buffer->length = new_length; return true; } -libc_hidden_def (__libc_scratch_buffer_grow); +libc_hidden_def (__libc_scratch_buffer_grow) diff --git a/malloc/scratch_buffer_grow_preserve.c b/malloc/scratch_buffer_grow_preserve.c index 18543ef..9268615 100644 --- a/malloc/scratch_buffer_grow_preserve.c +++ b/malloc/scratch_buffer_grow_preserve.c @@ -16,6 +16,10 @@ License along with the GNU C Library; if not, see . */ +#ifndef _LIBC +# include +#endif + #include #include #include @@ -60,4 +64,4 @@ __libc_scratch_buffer_grow_preserve (struct scratch_buffer *buffer) buffer->length = new_length; return true; } -libc_hidden_def (__libc_scratch_buffer_grow_preserve); +libc_hidden_def (__libc_scratch_buffer_grow_preserve) diff --git a/malloc/scratch_buffer_set_array_size.c b/malloc/scratch_buffer_set_array_size.c index 8ab6d9d..6fcc115 100644 --- a/malloc/scratch_buffer_set_array_size.c +++ b/malloc/scratch_buffer_set_array_size.c @@ -16,6 +16,10 @@ License along with the GNU C Library; if not, see . */ +#ifndef _LIBC +# include +#endif + #include #include #include @@ -57,4 +61,4 @@ __libc_scratch_buffer_set_array_size (struct scratch_buffer *buffer, buffer->length = new_length; return true; } -libc_hidden_def (__libc_scratch_buffer_set_array_size); +libc_hidden_def (__libc_scratch_buffer_set_array_size) -- 2.7.4