diff --git a/Disable-large-allocation-report-by-default.patch b/Disable-large-allocation-report-by-default.patch index 7463b39768e506e1ba37cb69b484477d3e25867b..e70c553128d380d3bd6a8a3f1d382421d8e52fdc 100644 --- a/Disable-large-allocation-report-by-default.patch +++ b/Disable-large-allocation-report-by-default.patch @@ -1,4 +1,4 @@ -From 99d4b81d3fcedb7c912acbd813573a89d32ade22 Mon Sep 17 00:00:00 2001 +From fe87ffb7ea5a7c6ce4dea45222331716907ddbf4 Mon Sep 17 00:00:00 2001 From: Junhao Li Date: Sun, 20 May 2018 13:45:32 -0400 Subject: [PATCH] Disable large allocation report by default @@ -14,12 +14,12 @@ Signed-off-by: Aliaksey Kandratsenka 2 files changed, 13 insertions(+) diff --git a/configure.ac b/configure.ac -index fa03f1a..f874e19 100644 +index 497103e..7b5e710 100644 --- a/configure.ac +++ b/configure.ac -@@ -663,6 +663,15 @@ AS_IF([test "x$enable_generic_dynamic_tls" = xyes], - [AC_DEFINE([ENABLE_GENERIC_DYNAMIC_TLS], 1, - [Use the generic dynamic TLS model])]) +@@ -653,6 +653,15 @@ AC_COMPILE_IFELSE( + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])]) +# Disable large allocation report by default. +AC_ARG_ENABLE([large-alloc-report], diff --git a/gperftools-2.6.1-disable-generic-dynamic-tls.patch b/gperftools-2.6.1-disable-generic-dynamic-tls.patch deleted file mode 100644 index ae87e5db968c8a4806a098baa63b22bdba39063c..0000000000000000000000000000000000000000 --- a/gperftools-2.6.1-disable-generic-dynamic-tls.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up ./configure.ac.dynload ./configure.ac ---- ./configure.ac.dynload 2017-08-24 15:23:01.126622099 -0400 -+++ ./configure.ac 2017-08-24 15:29:46.332132222 -0400 -@@ -614,6 +614,16 @@ AC_COMPILE_IFELSE( - AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no])]) - -+default_enable_generic_dynamic_tls=yes -+AC_ARG_ENABLE([general-dynamic-tls], -+ [AS_HELP_STRING([--disable-general-dynamic-tls], -+ [Do not use the general dynamic TLS model])], -+ [], -+ [enable_generic_dynamic_tls="$default_enable_generic_dynamic_tls"]) -+AS_IF([test "x$enable_generic_dynamic_tls" = xyes], -+ [AC_DEFINE([ENABLE_GENERIC_DYNAMIC_TLS], 1, -+ [Use the generic dynamic TLS model])]) -+ - # Write generated configuration file - AC_CONFIG_FILES([Makefile - src/gperftools/tcmalloc.h src/windows/gperftools/tcmalloc.h]) -diff -up ./src/base/basictypes.h.dynload ./src/base/basictypes.h ---- ./src/base/basictypes.h.dynload 2017-08-24 15:30:30.210996293 -0400 -+++ ./src/base/basictypes.h 2017-08-24 15:31:01.889176214 -0400 -@@ -200,7 +200,7 @@ struct CompileAssert { - # define ATTRIBUTE_UNUSED - #endif - --#if defined(HAVE___ATTRIBUTE__) && defined(HAVE_TLS) -+#if defined(HAVE___ATTRIBUTE__) && defined(HAVE_TLS) && defined(ENABLE_GENERIC_DYNAMIC_TLS) - #define ATTR_INITIAL_EXEC __attribute__ ((tls_model ("initial-exec"))) - #else - #define ATTR_INITIAL_EXEC diff --git a/gperftools.spec b/gperftools.spec index c5bff35717930062b0171457ff558ec6511d2c0d..db9717fed593d33d331c45e13ee73cb13c622e80 100644 --- a/gperftools.spec +++ b/gperftools.spec @@ -1,25 +1,24 @@ Name: gperftools Version: 2.7 -Release: 5 +Release: 6 Summary: high-performance malloc and performance analysis tools License: BSD URL: https://github.com/gperftools/gperftools Source0: https://github.com/gperftools/gperftools/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz -Patch1: gperftools-2.6.1-disable-generic-dynamic-tls.patch -Patch2: Disable-large-allocation-report-by-default.patch -Patch3: Fix-uninitialized-memory-use-in-sampler_test.patch -Patch4: benchmark-use-angle-brackets-to-include-ucontext.h.patch -Patch5: Format-and-fix-out-of-bound-access-in-CpuProfilerSwi.patch -Patch6: Fix-incompatible-aliasing-warnings.patch -Patch7: Use-standard-conforming-alignof-in-debugallocation.c.patch -Patch8: Fix-page_heap_test-flakiness.patch -Patch9: Avoid-static-initialization-of-pprof-path-for-symbol.patch -Patch10: Fix-mmap-region-iteration-while-no-regions-are-recor.patch -Patch11: Drop-not-very-portable-and-not-very-useful-unwind-be.patch -Patch12: undef-mmap64-function.patch -Patch13: Use-initial-exec-TLS-model-for-all-thread-local-vari.patch -Patch14: don-t-try-to-mark-rsp-as-clobbered-in-linux-syscall-.patch +Patch1: Disable-large-allocation-report-by-default.patch +Patch2: Fix-uninitialized-memory-use-in-sampler_test.patch +Patch3: benchmark-use-angle-brackets-to-include-ucontext.h.patch +Patch4: Format-and-fix-out-of-bound-access-in-CpuProfilerSwi.patch +Patch5: Fix-incompatible-aliasing-warnings.patch +Patch6: Use-standard-conforming-alignof-in-debugallocation.c.patch +Patch7: Fix-page_heap_test-flakiness.patch +Patch8: Avoid-static-initialization-of-pprof-path-for-symbol.patch +Patch9: Fix-mmap-region-iteration-while-no-regions-are-recor.patch +Patch10: Drop-not-very-portable-and-not-very-useful-unwind-be.patch +Patch11: undef-mmap64-function.patch +Patch12: Use-initial-exec-TLS-model-for-all-thread-local-vari.patch +Patch13: don-t-try-to-mark-rsp-as-clobbered-in-linux-syscall-.patch Patch9000: issue-1122-fix-bus-error-on-aarch64.patch @@ -112,6 +111,9 @@ make %{_mandir}/man1/*.1.gz %changelog +* Fri Jan 10 2020 wuxu_wu - 2.7-6 +- delete useless patch + * Thu Aug 29 2019 luochunsheng - 2.7-5 - fix spelling errors