01/01: gnu: jemalloc: Update to 5.1.0.

[Marius Bakke]

mbakke pushed a commit to branch core-updates-next
in repository guix.

commit 475c11b1a7699e63467c0182da3602fbe6222378
Author: Marius Bakke <address@hidden>
Date:   Wed May 9 15:37:16 2018 +0200

    gnu: jemalloc: Update to 5.1.0.
    
    * gnu/packages/jemalloc.scm (jemalloc): Update to 5.1.0.
    [source](patches): Remove.
    * gnu/packages/patches/jemalloc-arm-address-bits.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/jemalloc.scm                          |  5 ++-
 .../patches/jemalloc-arm-address-bits.patch        | 39 ----------------------
 3 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 4fa88e3..72de5f2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -802,7 +802,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/java-xerces-bootclasspath.patch \
   %D%/packages/patches/java-xerces-build_dont_unzip.patch      \
   %D%/packages/patches/java-xerces-xjavac_taskdef.patch        \
-  %D%/packages/patches/jemalloc-arm-address-bits.patch         \
   %D%/packages/patches/jbig2dec-ignore-testtest.patch          \
   %D%/packages/patches/json-glib-fix-tests-32bit.patch         \
   %D%/packages/patches/jq-CVE-2015-8863.patch                  \
diff --git a/gnu/packages/jemalloc.scm b/gnu/packages/jemalloc.scm
index 5086df7..cb87020 100644
--- a/gnu/packages/jemalloc.scm
+++ b/gnu/packages/jemalloc.scm
@@ -32,7 +32,7 @@
 (define-public jemalloc
   (package
     (name "jemalloc")
-    (version "5.0.1")
+    (version "5.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -40,8 +40,7 @@
                     version "/jemalloc-" version ".tar.bz2"))
               (sha256
                (base32
-                "1sf3lzgb0y8nnyzmp4zrca3sngdxw3kfh20sna9z03jv74fph528"))
-              (patches (search-patches "jemalloc-arm-address-bits.patch"))))
+                "0s3jpcyhzia8d4k0xyc67is78kg416p9yc3c2f9w6fhhqqffd5jk"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
diff --git a/gnu/packages/patches/jemalloc-arm-address-bits.patch 
b/gnu/packages/patches/jemalloc-arm-address-bits.patch
deleted file mode 100644
index f2ef24c..0000000
--- a/gnu/packages/patches/jemalloc-arm-address-bits.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8cfc9dec37b312a2686f602bbcdd102ca07cca99 Mon Sep 17 00:00:00 2001
-From: David Goldblatt <address@hidden>
-Date: Fri, 29 Sep 2017 13:54:08 -0700
-Subject: [PATCH] ARM: Don't extend bit LG_VADDR to compute high address bits.
-
-In userspace ARM on Linux, zero-ing the high bits is the correct way to do 
this.
-This doesn't fix the fact that we currently set LG_VADDR to 48 on ARM, when in
-fact larger virtual address sizes are coming soon.  We'll cross that bridge 
when
-we come to it.
----
- include/jemalloc/internal/rtree.h | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/include/jemalloc/internal/rtree.h 
b/include/jemalloc/internal/rtree.h
-index b5d4db39..4563db23 100644
---- a/include/jemalloc/internal/rtree.h
-+++ b/include/jemalloc/internal/rtree.h
-@@ -178,9 +178,21 @@ rtree_leaf_elm_bits_read(tsdn_t *tsdn, rtree_t *rtree, 
rtree_leaf_elm_t *elm,
- 
- JEMALLOC_ALWAYS_INLINE extent_t *
- rtree_leaf_elm_bits_extent_get(uintptr_t bits) {
-+#    ifdef __aarch64__
-+      /*
-+       * aarch64 doesn't sign extend the highest virtual address bit to set
-+       * the higher ones.  Instead, the high bits gets zeroed.
-+       */
-+      uintptr_t high_bit_mask = ((uintptr_t)1 << LG_VADDR) - 1;
-+      /* Mask off the slab bit. */
-+      uintptr_t low_bit_mask = ~(uintptr_t)1;
-+      uintptr_t mask = high_bit_mask & low_bit_mask;
-+      return (extent_t *)(bits & mask);
-+#    else
-       /* Restore sign-extended high bits, mask slab bit. */
-       return (extent_t *)((uintptr_t)((intptr_t)(bits << RTREE_NHIB) >>
-           RTREE_NHIB) & ~((uintptr_t)0x1));
-+#    endif
- }
- 
- JEMALLOC_ALWAYS_INLINE szind_t