From 0106d362dc1bc2371e9dac81246234a95b41a80f Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@fedoraproject.org>
Date: Feb 13 2020 18:02:15 +0000
Subject: 3.15.0-17 - Add valgrind-3.15.0-glibc-dtv-supp.patch


---

diff --git a/valgrind-3.15.0-glibc-dtv-supp.patch b/valgrind-3.15.0-glibc-dtv-supp.patch
new file mode 100644
index 0000000..cb862f8
--- /dev/null
+++ b/valgrind-3.15.0-glibc-dtv-supp.patch
@@ -0,0 +1,42 @@
+diff --git a/glibc-2.X.supp.in b/glibc-2.X.supp.in
+index 126e8b338..eeefa3935 100644
+--- a/glibc-2.X.supp.in
++++ b/glibc-2.X.supp.in
+@@ -248,3 +248,37 @@
+    Memcheck:Cond
+    fun:_dl_runtime_resolve_avx_slow
+ }
++
++# The main thread dynamic thread vector, DTV, which contains pointers
++# to thread local variables, isn't freed.  There are a couple of call
++# patterns that can cause it to be extended.
++{
++  dtv-addr-tail
++  Memcheck:Leak
++  match-leak-kinds: possible,reachable
++  fun:malloc
++  fun:tls_get_addr_tail*
++  fun:__tls_get_addr
++}
++
++{
++  dtv-addr-resize
++  Memcheck:Leak
++  match-leak-kinds: possible,reachable
++  fun:malloc
++  fun:_dl_resize_dtv
++  fun:_dl_update_slotinfo
++  fun:update_get_addr
++  fun:__tls_get_addr
++}
++
++{
++  dtv-addr-init
++  Memcheck:Leak
++  match-leak-kinds: possible,reachable
++  fun:malloc
++  fun:allocate_dtv_entry
++  fun:allocate_and_init
++  fun:tls_get_addr_tail*
++  fun:__tls_get_addr
++}
diff --git a/valgrind.spec b/valgrind.spec
index e3b2491..ed29184 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.15.0
-Release: 16%{?dist}
+Release: 17%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -152,6 +152,9 @@ Patch24: valgrind-3.15.0-s390x-compare-and-signal.patch
 # KDE#417452 s390_insn_store_emit: dst->tag for HRcVec128
 Patch25: valgrind-3.15.0-s390x-HRcVec128.patch
 
+# KDE#417578 - Add suppressions for glibc DTV leaks
+Patch26: valgrind-3.15.0-glibc-dtv-supp.patch
+
 BuildRequires: glibc-devel
 
 %if %{build_openmpi}
@@ -317,6 +320,7 @@ Valgrind User Manual for details.
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
 
 %build
 
@@ -537,6 +541,9 @@ fi
 %endif
 
 %changelog
+* Thu Feb 13 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-17
+- Add valgrind-3.15.0-glibc-dtv-supp.patch
+
 * Wed Jan 29 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-16
 - Add valgrind-3.15.0-s390x-HRcVec128.patch