This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch sid
in repository glibc.

commit 1a8d022184fcabf4d6734fca97d94e5910d38055
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date:   Mon Oct 10 22:51:31 2016 +0000

    hurd: Restore malloc_hook for now for mach-defpager
    
    hurd-i386/tg-glibc-2.24-restore-malloc-hook.diff
---
 debian/changelog                                          |  2 ++
 .../hurd-i386/tg-glibc-2.24-restore-malloc-hook.diff      | 15 +++++++++++++++
 debian/patches/series.hurd-i386                           |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8ad32b8..db80e12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ glibc (2.24-4) UNRELEASED; urgency=medium
     hurd-i386/tg-allocalim.diff.
   * hurd-i386/unsubmitted-timer_routines.diff: Rename to
     hurd-i386/tg-timer_routines.diff.
+  * hurd-i386/tg-glibc-2.24-restore-malloc-hook.diff: Restore malloc_hook for
+    now for mach-defpager.
 
  -- Aurelien Jarno <aure...@debian.org>  Sat, 17 Sep 2016 20:03:04 +0200
 
diff --git a/debian/patches/hurd-i386/tg-glibc-2.24-restore-malloc-hook.diff 
b/debian/patches/hurd-i386/tg-glibc-2.24-restore-malloc-hook.diff
new file mode 100644
index 0000000..a1a5a3e
--- /dev/null
+++ b/debian/patches/hurd-i386/tg-glibc-2.24-restore-malloc-hook.diff
@@ -0,0 +1,15 @@
+Restore malloc hooks for mach-defpager until we have mlockall ready.
+
+Index: glibc-2.24/malloc/malloc.c
+===================================================================
+--- glibc-2.24.orig/malloc/malloc.c
++++ glibc-2.24/malloc/malloc.c
+@@ -1852,8 +1852,6 @@ static void *memalign_hook_ini (size_t a
+ 
+ #if HAVE_MALLOC_INIT_HOOK
+ void weak_variable (*__malloc_initialize_hook) (void) = NULL;
+-compat_symbol (libc, __malloc_initialize_hook,
+-             __malloc_initialize_hook, GLIBC_2_0);
+ #endif
+ 
+ void weak_variable (*__free_hook) (void *__ptr,
diff --git a/debian/patches/series.hurd-i386 b/debian/patches/series.hurd-i386
index 399d788..e83edf7 100644
--- a/debian/patches/series.hurd-i386
+++ b/debian/patches/series.hurd-i386
@@ -14,3 +14,4 @@ hurd-i386/tg-timer_routines.diff
 hurd-i386/local-versions-hack.diff
 hurd-i386/unsubmitted-prof-eintr.diff
 hurd-i386/submitted-malloc-setstate.diff
+hurd-i386/tg-glibc-2.24-restore-malloc-hook.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

Reply via email to