From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Fri, 17 Feb 2023 21:25:41 +0000 (+0100)
Subject: DRD aarch64: Add some suppressions for DRD libstdc++
X-Git-Tag: VALGRIND_3_21_0~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a92995a8524a406857d599666cfc49869141bc2;p=thirdparty%2Fvalgrind.git

DRD aarch64: Add some suppressions for DRD libstdc++

Also fix building drd/tests/std_mutex, needs -pthread.
---

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index e3366a18a0..7ea83cbf7e 100755
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -621,6 +621,7 @@ std_list_CXXFLAGS           = $(AM_CXXFLAGS) -std=c++0x @FLAG_W_NO_SIGN_COMPARE@
 
 std_mutex_SOURCES           = std_mutex.cpp
 std_mutex_CXXFLAGS          = $(AM_CXXFLAGS) -std=c++0x @FLAG_W_NO_SIGN_COMPARE@
+std_mutex_LDFLAGS           = -pthread
 
 std_string_SOURCES          = std_string.cpp
 std_string_CXXFLAGS         = $(AM_CXXFLAGS) -std=c++0x @FLAG_W_NO_SIGN_COMPARE@
diff --git a/glibc-2.X-drd.supp.in b/glibc-2.X-drd.supp.in
index b8c8ac0ad5..4c6bdb6a1a 100644
--- a/glibc-2.X-drd.supp.in
+++ b/glibc-2.X-drd.supp.in
@@ -79,7 +79,21 @@
    ...
    fun:_ZNSo9_M_insertIlEERSoT_
 }
-
+{
+   drd-libstdc++-std::~__shared_count()
+   drd:ConflictingAccess
+   fun:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED1Ev
+}
+{
+   drd-libstdc++-std::thread::~_Impl_base()
+   drd:ConflictingAccess
+   fun:_ZNSt6thread10_Impl_baseD1Ev
+}
+{
+   drd-libstdc++-std::thread::~_Impl()
+   drd:ConflictingAccess
+   fun:_ZNSt6thread5_ImplISt12_Bind_simpleIFZ4mainEUlvE_vEEED1Ev
+}
 
 #
 # Suppression patterns for libpthread.