bug fix for issue I1VAEU

This commit is contained in:
sdlzx 2020-09-22 21:57:51 +08:00
parent dd8fa9e4f6
commit 0507827a96
2 changed files with 52 additions and 1 deletions

View File

@ -0,0 +1,47 @@
From 2ab82df5d631f5da10da2ff73b515a8aa25fe819 Mon Sep 17 00:00:00 2001
From: sdlzx <hdu_sdlzx@163.com>
Date: Tue, 22 Sep 2020 20:38:53 +0800
Subject: [PATCH] enable-generic-dynamic-tls
---
configure.ac | 10 ++++++++++
src/base/basictypes.h | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 500f8be..b1b12f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -670,6 +670,16 @@ AS_IF([test "x$enable_aggressive_decommit_by_default" = xyes],
1,
[enable aggressive decommit by default])])
+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 --git a/src/base/basictypes.h b/src/base/basictypes.h
index 356b3d5..b737d47 100644
--- a/src/base/basictypes.h
+++ b/src/base/basictypes.h
@@ -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
--
1.8.3.1

View File

@ -1,11 +1,12 @@
Name: gperftools
Version: 2.8
Release: 1
Release: 2
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-generic-dynamic-tls.patch
Patch9000: issue-1122-fix-bus-error-on-aarch64.patch
BuildRequires: autoconf automake gcc-c++ gdb
@ -98,6 +99,9 @@ make
%{_mandir}/man1/*.1.gz
%changelog
* Tue Sep 22 2020 liuzixian <liuzixian4@huawei.com> - 2.8-2
- Type: bufgix
* Thu Jul 23 2020 jinzhimin <jinzhimin2@huawei.com> - 2.8-1
- update to 2.8