From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.bugs Subject: bug#22086: 25.1.50; [PATCH] Integrate the musl hybrid mallo Date: Sun, 31 Jan 2016 09:54:26 -0800 Organization: UCLA Computer Science Department Message-ID: <56AE4A52.6030507@cs.ucla.edu> References: <56AC7FA1.10300@cs.ucla.edu> <83powjwgl0.fsf@gnu.org> <56AD58B0.9050103@cs.ucla.edu> <85egcxsndr.fsf@iznogoud.viz> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------070408040006020106040000" X-Trace: ger.gmane.org 1454262926 15111 80.91.229.3 (31 Jan 2016 17:55:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 31 Jan 2016 17:55:26 +0000 (UTC) To: Wolfgang Jenkner , 22086@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Jan 31 18:55:15 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aPwDS-00039A-Rf for geb-bug-gnu-emacs@m.gmane.org; Sun, 31 Jan 2016 18:55:15 +0100 Original-Received: from localhost ([::1]:42662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPwDO-00060S-UI for geb-bug-gnu-emacs@m.gmane.org; Sun, 31 Jan 2016 12:55:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:32804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPwDJ-0005zf-AH for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 12:55:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPwDG-0002FS-2s for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 12:55:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:55189) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPwDF-0002F2-UR for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 12:55:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aPwDF-0000H1-Jt for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 12:55:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 31 Jan 2016 17:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22086 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 22086-submit@debbugs.gnu.org id=B22086.14542628821023 (code B ref 22086); Sun, 31 Jan 2016 17:55:01 +0000 Original-Received: (at 22086) by debbugs.gnu.org; 31 Jan 2016 17:54:42 +0000 Original-Received: from localhost ([127.0.0.1]:43409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aPwCw-0000GR-Ij for submit@debbugs.gnu.org; Sun, 31 Jan 2016 12:54:42 -0500 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:40464) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aPwCu-0000GB-3K for 22086@debbugs.gnu.org; Sun, 31 Jan 2016 12:54:40 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 3D7C81601E7; Sun, 31 Jan 2016 09:54:34 -0800 (PST) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 9e-sk9ynTlcD; Sun, 31 Jan 2016 09:54:30 -0800 (PST) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 8992A1605E1; Sun, 31 Jan 2016 09:54:30 -0800 (PST) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id l8gDzAjTlmNG; Sun, 31 Jan 2016 09:54:30 -0800 (PST) Original-Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net [100.32.155.148]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 677311601E7; Sun, 31 Jan 2016 09:54:30 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 In-Reply-To: <85egcxsndr.fsf@iznogoud.viz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:112150 Archived-At: This is a multi-part message in MIME format. --------------070408040006020106040000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Wolfgang Jenkner wrote: > Thanks, I think patch 5 of my OP (for turning off direct use of mmap for > buffer allocations on FreeBSD) should also be applied. Sorry, I missed that one. I don't recall why it's needed but I'll take your word for it. Done. > /usr/opt/src/emacs-paul-test/src/gmalloc.c:440: undefined reference to `__after_morecore_hook' > ... > /usr/opt/src/emacs-paul-test/src/gmalloc.c:553: undefined reference to `__malloc_initialize_hook' I installed the attached patch to try to fix these; please give it a try. --------------070408040006020106040000 Content-Type: text/x-diff; name="0001-Port-new-hybrid-malloc-to-FreeBSD.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Port-new-hybrid-malloc-to-FreeBSD.patch" >From 1005257b104d2dac80479eac2c98246ad29147ec Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 31 Jan 2016 09:50:07 -0800 Subject: [PATCH] Port new hybrid malloc to FreeBSD Problem reported by Wolfgang Jenkner in: http://bugs.gnu.org/22086#118 * src/gmalloc.c (__malloc_initialize_hook, __after_morecore_hook) (__morecore) [HYBRID_MALLOC]: Define in this case too. --- src/gmalloc.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/gmalloc.c b/src/gmalloc.c index 282216a..0b76aee 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -321,6 +321,13 @@ License along with this library. If not, see . /* Debugging hook for 'malloc'. */ static void *(*__MALLOC_HOOK_VOLATILE gmalloc_hook) (size_t); +/* Replacements for traditional glibc malloc hooks, for platforms that + do not already have these hooks. Platforms with these hooks all + used relaxed ref/def, so it is OK to define them here too. */ +void (*__MALLOC_HOOK_VOLATILE __malloc_initialize_hook) (void); +void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void); +void *(*__morecore) (ptrdiff_t); + #ifndef HYBRID_MALLOC /* Pointer to the base of the first block. */ @@ -347,10 +354,6 @@ size_t _bytes_free; /* Are you experienced? */ int __malloc_initialized; -void (*__MALLOC_HOOK_VOLATILE __malloc_initialize_hook) (void); -void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void); -void *(*__morecore) (ptrdiff_t); - #else static struct list _fraghead[BLOCKLOG]; -- 2.5.0 --------------070408040006020106040000--