Skip to contentSkip to conversation

valgrind: add support for glibc 2.17 and 2.18

PATCH New Phil Eichinger 3 participants 3 messages Oct 28, 2013 – Oct 30, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 valgrind: add support for glibc 2.17 and 2.18

---
Changes from v1:
* added reference to upstream revisions in patch
* fixed commit log

 ...grind-add-support-for-glibc-2.17-and-2.18.patch |   50 ++++++++++++++++++++
 package/valgrind/valgrind.mk                       |    2 +-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 package/valgrind/valgrind-add-support-for-glibc-2.17-and-2.18.patch
package/valgrind/valgrind-add-support-for-glibc-2.17-and-2.18.patch new file +50 -0
new file mode 100644
index 0000000..c07dda2
@@ -0,0 +1,50 @@
+From bca21896dbdba12963aa7991d7f1b732b6a709a8 Mon Sep 17 00:00:00 2001
+From: Phil Eichinger <[email protected]>
+Date: Wed, 23 Oct 2013 18:28:15 +0200
+Subject: [PATCH 1/1] Add support for glibc 2.17 and 2.18.
+
+
+Signed-off-by: Phil Eichinger <[email protected]>
+---
+Status: fixed in upstream r13228 & r13504, not yet released.
+
+ configure.in |   16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 1da3a2c..ccc60a0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -906,6 +906,20 @@ case "${GLIBC_VERSION}" in
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.17)
++	AC_MSG_RESULT(2.17 family)
++	AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.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}"
++	;;
++     2.18)
++	AC_MSG_RESULT(2.18 family)
++	AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.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}"
++	;;
+      darwin)
+ 	AC_MSG_RESULT(Darwin)
+ 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
+@@ -919,7 +933,7 @@ case "${GLIBC_VERSION}" in
+ 
+      *)
+ 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16])
++	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.18])
+ 	AC_MSG_ERROR([or Darwin libc])
+ 	;;
+ esac
+-- 
+1.7.10.4
+
package/valgrind/valgrind.mk +1 -1
index f40784e..953f929 100644
@@ -9,7 +9,7 @@ VALGRIND_SITE    = http://valgrind.org/downloads/
 VALGRIND_SOURCE  = valgrind-$(VALGRIND_VERSION).tar.bz2
 VALGRIND_LICENSE = GPLv2 GFDLv1.2
 VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
-
+VALGRIND_AUTORECONF = YES
 VALGRIND_CONF_OPT = --disable-tls
 
 # On ARM, Valgrind only supports ARMv7, and uses the arch part of the
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v2 1/1 valgrind: add support for glibc 2.17 and 2.18

Quoted 3 lines · Phil Eichinger

(untested, but obviously correct and I assume Phil tested it)

Regards,
Arnout

Quoted 80 lines

---
Changes from v1:
* added reference to upstream revisions in patch
* fixed commit log

  ...grind-add-support-for-glibc-2.17-and-2.18.patch |   50 ++++++++++++++++++++
  package/valgrind/valgrind.mk                       |    2 +-
  2 files changed, 51 insertions(+), 1 deletion(-)

create mode 100644 package/valgrind/valgrind-add-support-for-glibc-2.17-and-2.18.patch

package/valgrind/valgrind-add-support-for-glibc-2.17-and-2.18.patch new file +50 -0
new file mode 100644
index 0000000..c07dda2
@@ -0,0 +1,50 @@
+From bca21896dbdba12963aa7991d7f1b732b6a709a8 Mon Sep 17 00:00:00 2001
+From: Phil Eichinger <[email protected]>
+Date: Wed, 23 Oct 2013 18:28:15 +0200
+Subject: [PATCH 1/1] Add support for glibc 2.17 and 2.18.
+
+
+Signed-off-by: Phil Eichinger <[email protected]>
+---
+Status: fixed in upstream r13228 & r13504, not yet released.
+
+ configure.in |   16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 1da3a2c..ccc60a0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -906,6 +906,20 @@ case "${GLIBC_VERSION}" in
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.17)
++	AC_MSG_RESULT(2.17 family)
++	AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.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}"
++	;;
++     2.18)
++	AC_MSG_RESULT(2.18 family)
++	AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.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}"
++	;;
+      darwin)
+ 	AC_MSG_RESULT(Darwin)
+ 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
+@@ -919,7 +933,7 @@ case "${GLIBC_VERSION}" in
+
+      *)
+ 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16])
++	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.18])
+ 	AC_MSG_ERROR([or Darwin libc])
+ 	;;
+ esac
+--
+1.7.10.4
+
package/valgrind/valgrind.mk +1 -1
index f40784e..953f929 100644
@@ -9,7 +9,7 @@ VALGRIND_SITE    = http://valgrind.org/downloads/
  VALGRIND_SOURCE  = valgrind-$(VALGRIND_VERSION).tar.bz2
  VALGRIND_LICENSE = GPLv2 GFDLv1.2
  VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
-
+VALGRIND_AUTORECONF = YES
  VALGRIND_CONF_OPT = --disable-tls
 
  # On ARM, Valgrind only supports ARMv7, and uses the arch part of the
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#2 lore raw

PATCH v2 1/1 valgrind: add support for glibc 2.17 and 2.18

In reply to Phil Eichinger

Dear Phil Eichinger,

Quoted 3 lines · Phil Eichinger

Applied to for-peter-2013.11, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com