summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2017-11-17 20:17:20 +0100
committerDavid Seifert <soap@gentoo.org>2017-11-18 19:03:01 +0100
commit95032e8183e621dd0f127bdf48ccb2b2f488fe67 (patch)
treefedcaa3489f6d2868d2f79943d4547932078b8fd /dev-libs/jemalloc
parentapp-text/wgetpaste: remove unused file (diff)
downloadgentoo-95032e8183e621dd0f127bdf48ccb2b2f488fe67.tar.gz
gentoo-95032e8183e621dd0f127bdf48ccb2b2f488fe67.tar.bz2
gentoo-95032e8183e621dd0f127bdf48ccb2b2f488fe67.zip
dev-libs/jemalloc: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/6215
Diffstat (limited to 'dev-libs/jemalloc')
-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
3 files changed, 0 insertions, 154 deletions
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. */
- /*