From 3c00a779b10bf6c3346c8d6303df9c327d11698e Mon Sep 17 00:00:00 2001
From: Julian Seward <jseward@acm.org>
Date: Sun, 1 Feb 2009 21:46:28 +0000
Subject: [PATCH] merge revs:    9096  Add support for glibc-2.10 (when it
 eventually appears).    9097  Suppression update (Helgrind)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_4_BRANCH@9098
---
 configure.in                     | 19 ++++++++++++++++-
 glibc-2.34567-NPTL-helgrind.supp | 35 +++++++++++++++++++++-----------
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/configure.in b/configure.in
index 0787cb3e97..e00b44d8b3 100644
--- a/configure.in
+++ b/configure.in
@@ -528,6 +528,16 @@ AC_EGREP_CPP([GLIBC_29], [
 ],
 GLIBC_VERSION="2.9")
 
+AC_EGREP_CPP([GLIBC_210], [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 10)
+  GLIBC_210
+ #endif
+#endif
+],
+GLIBC_VERSION="2.10")
+
 AC_EGREP_CPP([AIX5_LIBC], [
 #include <standards.h>
 #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
@@ -598,6 +608,13 @@ case "${GLIBC_VERSION}" in
 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
 	;;
+     2.10)
+	AC_MSG_RESULT(2.10 family)
+	AC_DEFINE([GLIBC_2_10], 1, [Define to 1 if you're using glibc 2.10.x])
+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+	;;
      aix5)
 	AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
 	AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
@@ -606,7 +623,7 @@ case "${GLIBC_VERSION}" in
 
      *)
 	AC_MSG_RESULT(unsupported version)
-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.9])
+	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.10])
 	AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
 	;;
 esac
diff --git a/glibc-2.34567-NPTL-helgrind.supp b/glibc-2.34567-NPTL-helgrind.supp
index 307d299156..eb90f2acd5 100644
--- a/glibc-2.34567-NPTL-helgrind.supp
+++ b/glibc-2.34567-NPTL-helgrind.supp
@@ -50,12 +50,7 @@
 
 # helgrind-glibc2X-007 was merged into helgrind-glibc2X-001
 
-{
-   helgrind-glibc2X-008
-   Helgrind:Race
-   obj:/lib*/libpthread-2.*so*
-   obj:/lib*/libc-2.*so*
-}
+# helgrind-glibc2X-008 was merged into helgrind-glibc2X-004
 
 # helgrind-glibc2X-009 was merged into helgrind-glibc2X-004
 
@@ -71,12 +66,7 @@
 
 # helgrind-glibc2X-015 was merged into helgrind-glibc2X-004
 
-{
-   helgrind-glibc2X-016
-   Helgrind:Race
-   obj:/lib*/libpthread-2.*so*
-   obj:/lib*/ld-2.*so*
-}
+# helgrind-glibc2X-016 was merged into helgrind-glibc2X-004
 
 # These are very ugly.  They are needed to suppress errors inside (eg)
 # NPTL's pthread_cond_signal.  Why only one stack frame -- at least we
@@ -257,3 +247,24 @@
 #
 # helgrind---ld.so-...-dlsym was merged into helgrind-glibc2X-001
 
+
+####################################################
+# To do with GNU libgomp
+#
+{
+   helgrind---libgomp43-1
+   Helgrind:Race
+   fun:gomp_ordered_sync
+}
+
+{
+   helgrind---libgomp43-1
+   Helgrind:Race
+   fun:gomp_ordered_next
+}
+
+{
+   helgrind---libgomp43-1
+   Helgrind:Race
+   fun:gomp_ordered_last
+}
-- 
2.47.2