From: Florian Krohm <florian@eich-krohm.de>
Date: Wed, 24 Sep 2014 19:13:01 +0000 (+0000)
Subject: Glibc versions prior to 2.5 do not define PTRACE_GETSIGINFO
X-Git-Tag: svn/VALGRIND_3_11_0~968
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b865506dd8be905263c6cde425541a2ca937e888;p=thirdparty%2Fvalgrind.git

Glibc versions prior to 2.5 do not define PTRACE_GETSIGINFO
(determined by Patrick J. LoPresti).
Tweak the ifdeffery.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14565
---

diff --git a/NEWS b/NEWS
index cfd5e62818..1079c24a12 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,7 @@ where XXXXXX is the bug number as listed below.
 339020 ppc64: memcheck/tests/ppc64/power_ISA2_05 failing in nightly build
 339156 - gdbsrv not called for fatal signal
 n-i-bz Old STABS code is still being compiled, but never used. Remove it.
+n-i-bz Fix compilation on distros with glibc < 2.5
 
 
 Release 3.10.0 (10 September 2014)
diff --git a/coregrind/vgdb-invoker-ptrace.c b/coregrind/vgdb-invoker-ptrace.c
index 295c79a506..1d43390bad 100644
--- a/coregrind/vgdb-invoker-ptrace.c
+++ b/coregrind/vgdb-invoker-ptrace.c
@@ -64,8 +64,9 @@
 
 #include <sys/procfs.h>
 
-#if defined(VGA_s390x)
-/* RHEL 5 uses glibc 2.3.4 which does not define PTRACE_GETSIGINFO */
+// glibc versions prior to 2.5 do not define PTRACE_GETSIGINFO on
+// the platforms we support.
+#if !((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 5))
 #   ifndef PTRACE_GETSIGINFO
 #   define PTRACE_GETSIGINFO 0x4202
 #   endif