summaryrefslogtreecommitdiff
path: root/dev-libs/jemalloc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-11-19 10:19:50 +0000
committerV3n3RiX <venerix@redcorelinux.org>2017-11-19 10:19:50 +0000
commit20d8e9cfb95a9f054d654ab6405e848807186aa0 (patch)
tree8a308cb480d00fd37d0189950e04f7d59004954f /dev-libs/jemalloc
parenta5956e0a0daddcad648e0d8d8e5cb3e49e09bda7 (diff)
gentoo resync : 19.11.2017
Diffstat (limited to 'dev-libs/jemalloc')
-rw-r--r--dev-libs/jemalloc/Manifest3
-rw-r--r--dev-libs/jemalloc/files/jemalloc-4.1-fix_stack_corruption.patch70
-rw-r--r--dev-libs/jemalloc/files/jemalloc-4.2-issue_399.patch26
-rw-r--r--dev-libs/jemalloc/files/jemalloc-4.2-issue_443.patch58
4 files changed, 0 insertions, 157 deletions
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 05e52a6829cd..baf17e0d1a8f 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -6,9 +6,6 @@ AUX jemalloc-3.0.0_fix_html_install.patch 333 SHA256 859aa0ca3e04afc0f17a9d4c74e
AUX jemalloc-3.5.1-no-pprof.patch 822 SHA256 41858870b20554a2548482cff92a5daeac6a2f2ab940228f2a835e1fd12e642b SHA512 1560154337302c7a56d79af21822d27b5d5bfd64afa4af3753306ca0d0a307b5abb9b240be168c7591d858a9c4be15e8d6571fd52da2d6732c472755dffa545f WHIRLPOOL b4ed0dc44d70a97787767babc5f9e7ebd8d7b46ccb1d6174110236bd94c0da7b22d188555382ecfde7b95c7a2f1480b69279f9df21a0277a1cc0999b285c0ff0
AUX jemalloc-3.5.1-strip-optimization.patch 886 SHA256 e92fe09b12766d8b3dddd9f26f6c581e43f4c71ba0ee2c1048752f2ef30e3443 SHA512 5835c534ccb04b47216d3678b08d663a09a93e60fb651e9c0b489fb747ca5f32060c89da3dc0f44b45964ffbffbd8da32b75a842198c180a79179266565b204a WHIRLPOOL 6e2a2caaf7c29d4fa9a797c6eabb5d930124cf96c8bd7ac36dc989d1b9488dbfb58e21ecfaf610ce559db9b001210c93f08b37196747fff8287fa17afc183f63
AUX jemalloc-3.5.1_fix_html_install.patch 356 SHA256 e4b5f3d2cd085bc4584ef7cfbab05415be4d5b9953659e653c15975f1159fa1f SHA512 d5ad9e7c9b93f2b0311a43bdd963cea6f32f2e5a53a916ce52b89918d3d76e0306158239cf2a7b508f102607fa550374a9ec8463f2b3a064015cf7bb2ce852cd WHIRLPOOL a166c08abd0459f175fd366fd7c26cbdb2b026a6a72e4ff1b03a7de12317083a8cebca314826366807f19401c37e2be82eccc05bc3b688513c950fb8cff54c25
-AUX jemalloc-4.1-fix_stack_corruption.patch 2313 SHA256 8130ca02b70e89d84c9d278d3b81fc98b70803b7eb53d1915e749e1fcf2dedc2 SHA512 3c3f91c9906db1c562d6df5f43f4c24a2d842568875930a47f90a107bb6f71a2e6465c8ea9db07017a9268a39bcadf1c7c8f3317e1465a7be9ec41f53eadf909 WHIRLPOOL feedeac2118786b0247b9c55102eb8a13f6c0ccaaab852bbcdf900faaf9d61e3e6b1b3a3f7fa6e8ff3500010e683a1d084f75ebbfe0a4bb55a9d419f36129990
-AUX jemalloc-4.2-issue_399.patch 744 SHA256 9ac50a3e4e654fa61a9645aa8e1ab3c99962684a36a51da964c965780a8d7859 SHA512 a09fec3c779f25434d0824a892406aec7a1895515d33c36606a484a54bfc04aa35ef2610cf10bb0bf298eea3f89802e2e32dfbbb6c99bc50b8705523851c2468 WHIRLPOOL b6e355d49ad947101d3a88547eca52f78e44e2da18f715ee4abe71196b4e266b3164dd3f3c66c673be1630e3088a263fd151b438b4fe19db93693c4b3068cfb4
-AUX jemalloc-4.2-issue_443.patch 1595 SHA256 d98179f3f0d3544e5a2e51c311b97776fed0ef54fd43323152dfc7465bdd8248 SHA512 352086ddca04c321feab39212e6824a64a7f43bfbe3f9f4c34b2fc36b62dec1b84d2c6b6767e477be04b6e6c06a3083d01a15661b27fabab39b070a3f69ec159 WHIRLPOOL 1fc5f9136f1e6f7c825cb8af1386114b9b1f139b882899f663ca614e48b9c76149cfeac7a9841fd42bf6baeec1a421e019855b83cdc3017e46dfa31e69378f6e
AUX jemalloc-4.5.0-fix_html_install.patch 581 SHA256 6847526a2bf7c47bda7ac78f01c3aa5518918100b218278f6a501e48d51eecf2 SHA512 ce210e9c9394a9ba5a16b5524322f1e477a140e55c076543a1f4dcfb1c8491f7839cb49fba433088773b24d2656b821c3072e729c0c7e41cb90dc131ad6828ff WHIRLPOOL ccc503257220d8926b8feef095b2ad0bdcd7dad1cf78df97d5d6f04ceb0d1e8b24ec952f2bb91eb14be98b1b0e1fac136be7e3a72f77be6b4bc1ab829a535599
AUX jemalloc-4.5.0-strip-optimization.patch 880 SHA256 7e5a7b0ec1a1142495becbdbaba9fb9e23adc1f3a8cbd3cfbd948bad72a99faf SHA512 6c6dd0a99fe58ad0f6cb6306e14e2724dcd39d372e91c01540aebb31e8228b33d17ba0819e6a5c9cb7a3009eedb8f3a58319f0cde322cdf31c2c1cb47f98ff41 WHIRLPOOL 4a00120df62c7604b696794edd55207add7d5922cac84925e2ebb89d0fdc7413f7c893bd48b88c3c2a4fa9b7c919a4fae86b42f57d5ed9f9d71f373af6b61144
AUX jemalloc-5.0.1-strip-optimization.patch 685 SHA256 c07f2b9aba9548f5895f024e38bdf7bda3343968c8f0e8c0db86b18814214628 SHA512 dd4452feea0004b3f61d664a63da0751179a4be8095e76d94938034045114a68b32e0fe9872cb4810c2f3fc927963ef1b1886d210dc558b3c5a3f5eb9ef4240e WHIRLPOOL f4918e20eb81cbc3ece5f23e33ed0e6c197826fbfcc45f0346e2a65add78f1988a3e6afdf33146bb683d6ff8a26f199b1ce9c89516706c8577822b225a07b404
diff --git a/dev-libs/jemalloc/files/jemalloc-4.1-fix_stack_corruption.patch b/dev-libs/jemalloc/files/jemalloc-4.1-fix_stack_corruption.patch
deleted file mode 100644
index f36c188616e8..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-4.1-fix_stack_corruption.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 33184bf69813087bf1885b0993685f9d03320c69 Mon Sep 17 00:00:00 2001
-From: Dmitri Smirnov <dmitrism@microsoft.com>
-Date: Mon, 29 Feb 2016 14:30:19 -0800
-Subject: [PATCH] Fix stack corruption and uninitialized var warning
-
-Stack corruption happens in x64 bit
-
-This resolves #347.
----
- src/arena.c | 2 +-
- test/unit/hash.c | 13 +++++++------
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/src/arena.c b/src/arena.c
-index 99e20fd..965c0fe 100644
---- a/src/arena.c
-+++ b/src/arena.c
-@@ -2423,7 +2423,7 @@ arena_malloc_large(tsd_t *tsd, arena_t *arena, szind_t binind, bool zero)
- uintptr_t random_offset;
- arena_run_t *run;
- arena_chunk_map_misc_t *miscelm;
-- UNUSED bool idump;
-+ UNUSED bool idump JEMALLOC_CC_SILENCE_INIT(false);
-
- /* Large allocation. */
- usize = index2size(binind);
-diff --git a/test/unit/hash.c b/test/unit/hash.c
-index f50ba81..010c9d7 100644
---- a/test/unit/hash.c
-+++ b/test/unit/hash.c
-@@ -64,14 +64,15 @@ static void
- hash_variant_verify_key(hash_variant_t variant, uint8_t *key)
- {
- const int hashbytes = hash_variant_bits(variant) / 8;
-- VARIABLE_ARRAY(uint8_t, hashes, hashbytes * 256);
-+ const int hashes_size = hashbytes * 256;
-+ VARIABLE_ARRAY(uint8_t, hashes, hashes_size);
- VARIABLE_ARRAY(uint8_t, final, hashbytes);
- unsigned i;
- uint32_t computed, expected;
-
- memset(key, 0, KEY_SIZE);
-- memset(hashes, 0, sizeof(hashes));
-- memset(final, 0, sizeof(final));
-+ memset(hashes, 0, hashes_size);
-+ memset(final, 0, hashbytes);
-
- /*
- * Hash keys of the form {0}, {0,1}, {0,1,2}, ..., {0,1,...,255} as the
-@@ -102,17 +103,17 @@ hash_variant_verify_key(hash_variant_t variant, uint8_t *key)
- /* Hash the result array. */
- switch (variant) {
- case hash_variant_x86_32: {
-- uint32_t out = hash_x86_32(hashes, hashbytes*256, 0);
-+ uint32_t out = hash_x86_32(hashes, hashes_size, 0);
- memcpy(final, &out, sizeof(out));
- break;
- } case hash_variant_x86_128: {
- uint64_t out[2];
-- hash_x86_128(hashes, hashbytes*256, 0, out);
-+ hash_x86_128(hashes, hashes_size, 0, out);
- memcpy(final, out, sizeof(out));
- break;
- } case hash_variant_x64_128: {
- uint64_t out[2];
-- hash_x64_128(hashes, hashbytes*256, 0, out);
-+ hash_x64_128(hashes, hashes_size, 0, out);
- memcpy(final, out, sizeof(out));
- break;
- } default: not_reached();
diff --git a/dev-libs/jemalloc/files/jemalloc-4.2-issue_399.patch b/dev-libs/jemalloc/files/jemalloc-4.2-issue_399.patch
deleted file mode 100644
index da9f2d8ad771..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-4.2-issue_399.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c8c3e9e9b59b6e34a222816a05f0a01a68919b3 Mon Sep 17 00:00:00 2001
-From: Jason Evans <jasone@canonware.com>
-Date: Mon, 26 Sep 2016 15:55:40 -0700
-Subject: [PATCH] Close file descriptor after reading
- "/proc/sys/vm/overcommit_memory".
-
-This bug was introduced by c2f970c32b527660a33fa513a76d913c812dcf7c
-(Modify pages_map() to support mapping uncommitted virtual memory.).
-
-This resolves #399.
----
- src/pages.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/pages.c b/src/pages.c
-index 2a9b7e3..05b0d69 100644
---- a/src/pages.c
-+++ b/src/pages.c
-@@ -219,6 +219,7 @@ os_overcommits_proc(void)
- return (false); /* Error. */
-
- nread = read(fd, &buf, sizeof(buf));
-+ close(fd);
- if (nread < 1)
- return (false); /* Error. */
- /*
diff --git a/dev-libs/jemalloc/files/jemalloc-4.2-issue_443.patch b/dev-libs/jemalloc/files/jemalloc-4.2-issue_443.patch
deleted file mode 100644
index d2b065a3b6e0..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-4.2-issue_443.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From c443b67561891ae68d688daf5f8ce37820cdba2b Mon Sep 17 00:00:00 2001
-From: Jason Evans <jasone@canonware.com>
-Date: Sat, 29 Oct 2016 22:41:04 -0700
-Subject: [PATCH] Use syscall(2) rather than {open,read,close}(2) during boot.
-
-Some applications wrap various system calls, and if they call the
-allocator in their wrappers, unexpected reentry can result. This is not
-a general solution (many other syscalls are spread throughout the code),
-but this resolves a bootstrapping issue that is apparently common.
-
-This resolves #443.
----
- src/pages.c | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/src/pages.c b/src/pages.c
-index 05b0d69..84e2216 100644
---- a/src/pages.c
-+++ b/src/pages.c
-@@ -207,6 +207,11 @@ os_overcommits_sysctl(void)
- #endif
-
- #ifdef JEMALLOC_PROC_SYS_VM_OVERCOMMIT_MEMORY
-+/*
-+ * Use syscall(2) rather than {open,read,close}(2) when possible to avoid
-+ * reentry during bootstrapping if another library has interposed system call
-+ * wrappers.
-+ */
- static bool
- os_overcommits_proc(void)
- {
-@@ -214,12 +219,26 @@ os_overcommits_proc(void)
- char buf[1];
- ssize_t nread;
-
-+#ifdef SYS_open
-+ fd = (int)syscall(SYS_open, "/proc/sys/vm/overcommit_memory", O_RDONLY);
-+#else
- fd = open("/proc/sys/vm/overcommit_memory", O_RDONLY);
-+#endif
- if (fd == -1)
- return (false); /* Error. */
-
-+#ifdef SYS_read
-+ nread = (ssize_t)syscall(SYS_read, fd, &buf, sizeof(buf));
-+#else
- nread = read(fd, &buf, sizeof(buf));
-+#endif
-+
-+#ifdef SYS_close
-+ syscall(SYS_close, fd);
-+#else
- close(fd);
-+#endif
-+
- if (nread < 1)
- return (false); /* Error. */
- /*