From: Paul Eggert <eggert@cs.ucla.edu>
To: Wolfgang Jenkner <wjenkner@inode.at>, 22086@debbugs.gnu.org
Subject: bug#22086: 25.1.50; [PATCH] Integrate the musl hybrid mallo
Date: Sun, 31 Jan 2016 09:54:26 -0800 [thread overview]
Message-ID: <56AE4A52.6030507@cs.ucla.edu> (raw)
In-Reply-To: <85egcxsndr.fsf@iznogoud.viz>
[-- Attachment #1: Type: text/plain, Size: 534 bytes --]
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.
[-- Attachment #2: 0001-Port-new-hybrid-malloc-to-FreeBSD.patch --]
[-- Type: text/x-diff, Size: 1559 bytes --]
From 1005257b104d2dac80479eac2c98246ad29147ec Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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 <http://www.gnu.org/licenses/>.
/* 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
next prev parent reply other threads:[~2016-01-31 17:54 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-03 17:57 bug#22086: 25.1.50; [PATCH] Integrate the musl hybrid malloc patch for elf systems Wolfgang Jenkner
2015-12-16 8:28 ` Paul Eggert
2015-12-16 17:15 ` Rich Felker
2015-12-16 17:47 ` Eli Zaretskii
2015-12-17 13:16 ` Wolfgang Jenkner
2015-12-17 16:17 ` Eli Zaretskii
2015-12-17 16:26 ` Rich Felker
2015-12-18 0:06 ` Wolfgang Jenkner
2015-12-18 6:57 ` Eli Zaretskii
2015-12-18 13:15 ` Wolfgang Jenkner
2015-12-18 14:38 ` Eli Zaretskii
2015-12-20 22:33 ` Paul Eggert
2015-12-21 1:59 ` Rich Felker
2015-12-21 2:37 ` Paul Eggert
2015-12-21 2:51 ` Rich Felker
2015-12-21 11:10 ` Paul Eggert
2015-12-21 18:01 ` Rich Felker
2015-12-23 8:24 ` Paul Eggert
2015-12-21 3:37 ` Ken Brown
2015-12-21 4:06 ` Rich Felker
2015-12-21 12:24 ` Ken Brown
2015-12-21 20:08 ` Daniel Colascione
2015-12-21 20:49 ` Rich Felker
2015-12-21 20:58 ` Daniel Colascione
2015-12-21 3:44 ` Eli Zaretskii
2015-12-21 11:18 ` Paul Eggert
2015-12-21 15:37 ` Eli Zaretskii
2015-12-21 17:11 ` Paul Eggert
2015-12-21 15:14 ` Wolfgang Jenkner
2015-12-21 15:46 ` Wolfgang Jenkner
2015-12-21 17:06 ` Paul Eggert
2015-12-21 17:28 ` Wolfgang Jenkner
2015-12-23 8:31 ` Paul Eggert
2016-01-30 9:17 ` bug#22086: 25.1.50; [PATCH] Integrate the musl hybrid mallo Paul Eggert
2016-01-30 9:40 ` Eli Zaretskii
2016-01-31 0:43 ` Paul Eggert
2016-01-31 16:51 ` Wolfgang Jenkner
2016-01-31 17:54 ` Paul Eggert [this message]
2016-01-31 0:53 ` Rich Felker
2016-02-01 15:15 ` Wolfgang Jenkner
2016-02-01 16:58 ` Paul Eggert
2016-02-01 18:34 ` Wolfgang Jenkner
2016-02-01 19:38 ` Eli Zaretskii
2016-02-01 23:08 ` Paul Eggert
2016-02-09 14:55 ` Wolfgang Jenkner
2016-02-09 23:31 ` Paul Eggert
2016-02-10 12:27 ` Wolfgang Jenkner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56AE4A52.6030507@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=22086@debbugs.gnu.org \
--cc=wjenkner@inode.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.