[gentoo-commits] repo/gentoo:master commit in: dev-libs/jemalloc/files/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/jemalloc/files/

[Jory Pratt]

commit:     742d5110137c2031c6ff08faf1163aeed0f5e836
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Sep  3 16:00:06 2016 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 22:58:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742d5110

dev-libs/jemalloc: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/2230

Signed-off-by: Jory A. Pratt <anarchy <AT> gentoo.org>

 dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch | 59 ----------------------
 1 file changed, 59 deletions(-)

diff --git a/dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch b/dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch
deleted file mode 100644
index 6d81cda..00000000
--- a/dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 7481047..478becb 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -55,6 +55,8 @@ PIC_CFLAGS = @PIC_CFLAGS@
- CTARGET = @CTARGET@
- LDTARGET = @LDTARGET@
- MKLIB = @MKLIB@
-+AR = @AR@
-+ARFLAGS = crus
- CC_MM = @CC_MM@
- 
- ifeq (macho, $(ABI))
-@@ -185,7 +187,7 @@ $(objroot)lib/$(LIBJEMALLOC)_s.$(A) : $(COBJS)
- 
- $(STATIC_LIBS):
- 	@mkdir -p $(@D)
--	$(MKLIB) $+
-+	$(AR) $(ARFLAGS) $@ $+
- 
- $(objroot)test/bitmap$(EXE): $(objroot)src/bitmap.$(O)
- 
-diff --git a/configure.ac b/configure.ac
-index c270662..f4b4c21 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -226,9 +226,13 @@ PIC_CFLAGS='-fPIC -DPIC'
- CTARGET='-o $@'
- LDTARGET='-o $@'
- EXTRA_LDFLAGS=
--MKLIB='ar crus $@'
- CC_MM=1
- 
-+AN_MAKEVAR([AR], [AC_PROG_AR])
-+AN_PROGRAM([ar], [AC_PROG_AR])
-+AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
-+AC_PROG_AR
-+
- dnl Platform-specific settings.  abi and RPATH can probably be determined
- dnl programmatically, but doing so is error-prone, which makes it generally
- dnl not worth the trouble.
-@@ -310,7 +314,8 @@ case "${host}" in
- 	  EXTRA_LDFLAGS="-link -DEBUG"
- 	  CTARGET='-Fo$@'
- 	  LDTARGET='-Fe$@'
--	  MKLIB='lib -nologo -out:$@'
-+	  AR='lib'
-+	  ARFLAGS='-nologo -out:'
- 	  CC_MM=
-         else
- 	  importlib="${so}"
-@@ -403,7 +408,6 @@ AC_SUBST([enable_autogen])
- 
- AC_PROG_INSTALL
- AC_PROG_RANLIB
--AC_PATH_PROG([AR], [ar], [false], [$PATH])
- AC_PATH_PROG([LD], [ld], [false], [$PATH])
- AC_PATH_PROG([AUTOCONF], [autoconf], [false], [$PATH])
- 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/jemalloc/files/

[David Seifert]

commit:     95032e8183e621dd0f127bdf48ccb2b2f488fe67
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Nov 17 19:17:20 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 18:03:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95032e81

dev-libs/jemalloc: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/6215

 .../files/jemalloc-4.1-fix_stack_corruption.patch  | 70 ----------------------
 .../jemalloc/files/jemalloc-4.2-issue_399.patch    | 26 --------
 .../jemalloc/files/jemalloc-4.2-issue_443.patch    | 58 ------------------
 3 files changed, 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 f36c188616e..00000000000
--- 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 da9f2d8ad77..00000000000
--- 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 d2b065a3b6e..00000000000
--- 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. */
- 	/*