2.26 freeze in a little over a week
diff mbox

Message ID CAMe9rOr5wWfUBt6pDqiw-NdQVqP=4E3PQrg3n4dbBpkaPxsAjQ@mail.gmail.com
State New
Headers show

Commit Message

H.J. Lu June 29, 2017, 3:11 p.m. UTC
On Thu, Jun 29, 2017 at 8:08 AM, Florian Weimer <fweimer@redhat.com> wrote:
> On 06/29/2017 04:35 PM, Joseph Myers wrote:
>> On Thu, 29 Jun 2017, H.J. Lu wrote:
>>
>>> On Thu, Jun 22, 2017 at 9:49 AM, Siddhesh Poyarekar <siddhesh@gotplt.org> wrote:
>>>> Hi,
>>>>
>>>> PSA: The development freeze for 2.26 is due in a little over a week.  1
>>>> July is a Saturday, so we have until next week to finish major changes.
>>>>
>>>> I have a memcpy implementation for the Qualcomm falkor chip that I hope
>>>> to post by tomorrow.  Are there any major changes that need attention
>>>> but are not getting it?
>>>>
>>>
>>> Should we change i386 malloc alignment to 16 bytes:
>>>
>>> https://sourceware.org/bugzilla/show_bug.cgi?id=21120
>>
>> In my view, yes.
>
> I agree.
>
>> As I understand it, since we fixed bug 6527 such an
>> increase should be easy.  Is a malloc state version increase still needed
>> or not since we made malloc_get_state / malloc_set_state into compat
>> symbols?
>
> No, we don't have to change the implementation.  We just need to
> resurrect <malloc-machine.h> and use that to override the definition for
> x86 (and later hppa, which has a similar issue with the pthread types).
>

Or we can do something like this.

Comments

Florian Weimer June 29, 2017, 3:41 p.m. UTC | #1
On 06/29/2017 05:11 PM, H.J. Lu wrote:
> +ifeq ($(subdir),malloc)
> +CFLAGS-malloc.c += -DMALLOC_ALIGNMENT=16
> +endif

I'd prefer if we didn't do this because it is extremely confusing.

Thanks,
Florian

Patch
diff mbox

diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
index e30e133..321da38 100644
--- a/sysdeps/i386/Makefile
+++ b/sysdeps/i386/Makefile
@@ -101,3 +101,7 @@  $(objpfx)tst-ld-sse-use.out:
../sysdeps/i386/tst-ld-sse-use.sh $(objpfx)ld.so
 else
 CFLAGS-.os += $(if $(filter rtld-%.os,$(@F)), $(rtld-CFLAGS))
 endif
+
+ifeq ($(subdir),malloc)
+CFLAGS-malloc.c += -DMALLOC_ALIGNMENT=16