Merge from trunk, r14565

14565  Glibc versions prior to 2.5 do not define PTRACE_GETSIGINFO

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_10_BRANCH@14748

diff --git a/coregrind/vgdb-invoker-ptrace.c b/coregrind/vgdb-invoker-ptrace.c
index 295c79a50610e3df32de9bb072632ae18deb6655..1d43390bad17be441d8d4779183ba7828aaceac8 100644 (file)
--- 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