| 1 |
commit: 1acb385cb85c2f5df0f6e9ca2a73132afb77e210 |
| 2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 27 03:25:22 2017 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 27 03:25:22 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=1acb385c |
| 7 |
|
| 8 |
dev-libs/jemalloc - Remove obsolete files from filesdir |
| 9 |
|
| 10 |
.../jemalloc/files/jemalloc-3.5.1-no-pprof.patch | 25 -------- |
| 11 |
.../files/jemalloc-4.1-fix_stack_corruption.patch | 70 ---------------------- |
| 12 |
2 files changed, 95 deletions(-) |
| 13 |
|
| 14 |
diff --git a/dev-libs/jemalloc/files/jemalloc-3.5.1-no-pprof.patch b/dev-libs/jemalloc/files/jemalloc-3.5.1-no-pprof.patch |
| 15 |
deleted file mode 100644 |
| 16 |
index 30cbd50..0000000 |
| 17 |
--- a/dev-libs/jemalloc/files/jemalloc-3.5.1-no-pprof.patch |
| 18 |
+++ /dev/null |
| 19 |
@@ -1,25 +0,0 @@ |
| 20 |
-diff -urN a/Makefile.in b/Makefile.in |
| 21 |
---- a/Makefile.in 2014-02-25 18:49:15.000000000 -0600 |
| 22 |
-+++ b/Makefile.in 2014-03-07 18:24:10.978141932 -0600 |
| 23 |
-@@ -73,7 +73,6 @@ |
| 24 |
- LIBJEMALLOC := $(LIBPREFIX)jemalloc$(install_suffix) |
| 25 |
- |
| 26 |
- # Lists of files. |
| 27 |
--BINS := $(srcroot)bin/pprof $(objroot)bin/jemalloc.sh |
| 28 |
- C_HDRS := $(objroot)include/jemalloc/jemalloc$(install_suffix).h |
| 29 |
- C_SRCS := $(srcroot)src/jemalloc.c $(srcroot)src/arena.c \ |
| 30 |
- $(srcroot)src/atomic.c $(srcroot)src/base.c $(srcroot)src/bitmap.c \ |
| 31 |
-@@ -273,13 +272,6 @@ |
| 32 |
- build_lib_static: $(STATIC_LIBS) |
| 33 |
- build_lib: build_lib_shared build_lib_static |
| 34 |
- |
| 35 |
--install_bin: |
| 36 |
-- install -d $(BINDIR) |
| 37 |
-- @for b in $(BINS); do \ |
| 38 |
-- echo "install -m 755 $$b $(BINDIR)"; \ |
| 39 |
-- install -m 755 $$b $(BINDIR); \ |
| 40 |
--done |
| 41 |
-- |
| 42 |
- install_include: |
| 43 |
- install -d $(INCLUDEDIR)/jemalloc |
| 44 |
- @for h in $(C_HDRS); do \ |
| 45 |
|
| 46 |
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 |
| 47 |
deleted file mode 100644 |
| 48 |
index f36c188..0000000 |
| 49 |
--- a/dev-libs/jemalloc/files/jemalloc-4.1-fix_stack_corruption.patch |
| 50 |
+++ /dev/null |
| 51 |
@@ -1,70 +0,0 @@ |
| 52 |
-From 33184bf69813087bf1885b0993685f9d03320c69 Mon Sep 17 00:00:00 2001 |
| 53 |
-From: Dmitri Smirnov <dmitrism@×××××××××.com> |
| 54 |
-Date: Mon, 29 Feb 2016 14:30:19 -0800 |
| 55 |
-Subject: [PATCH] Fix stack corruption and uninitialized var warning |
| 56 |
- |
| 57 |
-Stack corruption happens in x64 bit |
| 58 |
- |
| 59 |
-This resolves #347. |
| 60 |
---- |
| 61 |
- src/arena.c | 2 +- |
| 62 |
- test/unit/hash.c | 13 +++++++------ |
| 63 |
- 2 files changed, 8 insertions(+), 7 deletions(-) |
| 64 |
- |
| 65 |
-diff --git a/src/arena.c b/src/arena.c |
| 66 |
-index 99e20fd..965c0fe 100644 |
| 67 |
---- a/src/arena.c |
| 68 |
-+++ b/src/arena.c |
| 69 |
-@@ -2423,7 +2423,7 @@ arena_malloc_large(tsd_t *tsd, arena_t *arena, szind_t binind, bool zero) |
| 70 |
- uintptr_t random_offset; |
| 71 |
- arena_run_t *run; |
| 72 |
- arena_chunk_map_misc_t *miscelm; |
| 73 |
-- UNUSED bool idump; |
| 74 |
-+ UNUSED bool idump JEMALLOC_CC_SILENCE_INIT(false); |
| 75 |
- |
| 76 |
- /* Large allocation. */ |
| 77 |
- usize = index2size(binind); |
| 78 |
-diff --git a/test/unit/hash.c b/test/unit/hash.c |
| 79 |
-index f50ba81..010c9d7 100644 |
| 80 |
---- a/test/unit/hash.c |
| 81 |
-+++ b/test/unit/hash.c |
| 82 |
-@@ -64,14 +64,15 @@ static void |
| 83 |
- hash_variant_verify_key(hash_variant_t variant, uint8_t *key) |
| 84 |
- { |
| 85 |
- const int hashbytes = hash_variant_bits(variant) / 8; |
| 86 |
-- VARIABLE_ARRAY(uint8_t, hashes, hashbytes * 256); |
| 87 |
-+ const int hashes_size = hashbytes * 256; |
| 88 |
-+ VARIABLE_ARRAY(uint8_t, hashes, hashes_size); |
| 89 |
- VARIABLE_ARRAY(uint8_t, final, hashbytes); |
| 90 |
- unsigned i; |
| 91 |
- uint32_t computed, expected; |
| 92 |
- |
| 93 |
- memset(key, 0, KEY_SIZE); |
| 94 |
-- memset(hashes, 0, sizeof(hashes)); |
| 95 |
-- memset(final, 0, sizeof(final)); |
| 96 |
-+ memset(hashes, 0, hashes_size); |
| 97 |
-+ memset(final, 0, hashbytes); |
| 98 |
- |
| 99 |
- /* |
| 100 |
- * Hash keys of the form {0}, {0,1}, {0,1,2}, ..., {0,1,...,255} as the |
| 101 |
-@@ -102,17 +103,17 @@ hash_variant_verify_key(hash_variant_t variant, uint8_t *key) |
| 102 |
- /* Hash the result array. */ |
| 103 |
- switch (variant) { |
| 104 |
- case hash_variant_x86_32: { |
| 105 |
-- uint32_t out = hash_x86_32(hashes, hashbytes*256, 0); |
| 106 |
-+ uint32_t out = hash_x86_32(hashes, hashes_size, 0); |
| 107 |
- memcpy(final, &out, sizeof(out)); |
| 108 |
- break; |
| 109 |
- } case hash_variant_x86_128: { |
| 110 |
- uint64_t out[2]; |
| 111 |
-- hash_x86_128(hashes, hashbytes*256, 0, out); |
| 112 |
-+ hash_x86_128(hashes, hashes_size, 0, out); |
| 113 |
- memcpy(final, out, sizeof(out)); |
| 114 |
- break; |
| 115 |
- } case hash_variant_x64_128: { |
| 116 |
- uint64_t out[2]; |
| 117 |
-- hash_x64_128(hashes, hashbytes*256, 0, out); |
| 118 |
-+ hash_x64_128(hashes, hashes_size, 0, out); |
| 119 |
- memcpy(final, out, sizeof(out)); |
| 120 |
- break; |
| 121 |
- } default: not_reached(); |
Archives