From: Julian Seward Date: Sun, 23 Nov 2014 12:10:22 +0000 (+0000) Subject: Merge from trunk, r14565 X-Git-Tag: svn/VALGRIND_3_10_1~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0f7334212d78d6a3ce7907a7ee819177f1aaaab;p=thirdparty%2Fvalgrind.git 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 295c79a506..1d43390bad 100644 --- a/coregrind/vgdb-invoker-ptrace.c +++ b/coregrind/vgdb-invoker-ptrace.c @@ -64,8 +64,9 @@ #include -#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