Aurelien Jarno <[email protected]> writes: > Ok, great if you are working on a release. I am not on a hurry > personally, the package in the archive still works perfectly, the > problem is just when trying to rebuild it. Given I am the "one" who > broke that, I felt that I have to offer help.
I've started looking at the changes, and normally, when possible, I like to cherry pick from the upstream changes (say from emacs-25), and it looked like this commit might cover the the gmalloc patch (after resolving a minor merge conflict): commit 4b1436b702d56eedd27a0777fc7232cdfb7ac4f6 Author: Wolfgang Jenkner <[email protected]> Date: Sat Dec 26 12:12:02 2015 -0800 Always define gmalloc etc. in src/gmalloc.c This is a work-around to prevent the compiler from using semantic knowledge about malloc for optimization purposes. E.g., gcc 5.2 with -O2 replaces most of calloc's definition by a call to calloc; see Bug#22085. * src/gmalloc.c [!HYBRID_MALLOC] (malloc, realloc, calloc) (aligned_alloc, free): Do not undef. Instead, define these as functions (perhaps renamed to gmalloc etc.) in terms of gmalloc etc. But I didn't find anything as directly relevant for the glibc patch. Perhaps there's nothing very close upstream (with respect to emacs-24), i.e. maybe the patch you've attached is more appropriate there? Thanks -- Rob Browning rlb @defaultvalue.org and @debian.org GPG as of 2011-07-10 E6A9 DA3C C9FD 1FF8 C676 D2C4 C0F0 39E9 ED1B 597A GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4
