summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS17
-rw-r--r--configure.ac6
-rw-r--r--src/windows/config.h4
-rw-r--r--src/windows/gperftools/tcmalloc.h4
4 files changed, 24 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index 9c9dd3d..ec5b2bb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+== 9 July 2017 ==
+
+gperftools 2.6.1 is out! This is mostly bug-fixes release.
+
+* issue #901: build issue on OSX introduced in last-time commit in 2.6
+ was fixed (contributed by Francis Ricci)
+
+* tcmalloc_minimal now works on 32-bit ABI of mips64. This is issue
+ #845. Much thanks to Adhemerval Zanella and github user mtone.
+
+* Romain Geissler contributed build fix for -std=c++17. This is pull
+ request #897.
+
+* As part of fixing issue #904, tcmalloc atfork handler is now
+ installed early. This should fix slight chance of hitting deadlocks
+ at fork in some cases.
+
== 4 July 2017 ==
gperftools 2.6 is out!
diff --git a/configure.ac b/configure.ac
index 3e79e58..b42fea3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,11 +4,11 @@
# make sure we're interpreted by some minimal autoconf
AC_PREREQ([2.59])
-AC_INIT([gperftools],[2.6],[gperftools@googlegroups.com])
+AC_INIT([gperftools],[2.6.1],[gperftools@googlegroups.com])
# Update this value for every release! (A:B:C will map to foo.so.(A-C).C.B)
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-TCMALLOC_SO_VERSION=8:4:4
-PROFILER_SO_VERSION=4:13:4
+TCMALLOC_SO_VERSION=8:5:4
+PROFILER_SO_VERSION=4:14:4
AC_SUBST(TCMALLOC_SO_VERSION)
AC_SUBST(PROFILER_SO_VERSION)
diff --git a/src/windows/config.h b/src/windows/config.h
index 06c4fd3..c1be17b 100644
--- a/src/windows/config.h
+++ b/src/windows/config.h
@@ -236,7 +236,7 @@
#define PACKAGE_NAME "gperftools"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gperftools 2.6"
+#define PACKAGE_STRING "gperftools 2.6.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gperftools"
@@ -245,7 +245,7 @@
#undef PACKAGE_URL
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.6"
+#define PACKAGE_VERSION "2.6.1"
/* How to access the PC from a struct ucontext */
#undef PC_FROM_UCONTEXT
diff --git a/src/windows/gperftools/tcmalloc.h b/src/windows/gperftools/tcmalloc.h
index 1309c7d..588ea34 100644
--- a/src/windows/gperftools/tcmalloc.h
+++ b/src/windows/gperftools/tcmalloc.h
@@ -41,8 +41,8 @@
/* Define the version number so folks can check against it */
#define TC_VERSION_MAJOR 2
#define TC_VERSION_MINOR 6
-#define TC_VERSION_PATCH ""
-#define TC_VERSION_STRING "gperftools 2.6"
+#define TC_VERSION_PATCH ".1"
+#define TC_VERSION_STRING "gperftools 2.6.1"
#ifndef PERFTOOLS_NOTHROW