|
From: <sv...@va...> - 2014-11-23 12:10:31
|
Author: sewardj
Date: Sun Nov 23 12:10:22 2014
New Revision: 14748
Log:
Merge from trunk, r14565
14565 Glibc versions prior to 2.5 do not define PTRACE_GETSIGINFO
Modified:
branches/VALGRIND_3_10_BRANCH/ (props changed)
branches/VALGRIND_3_10_BRANCH/coregrind/vgdb-invoker-ptrace.c
Modified: branches/VALGRIND_3_10_BRANCH/coregrind/vgdb-invoker-ptrace.c
==============================================================================
--- branches/VALGRIND_3_10_BRANCH/coregrind/vgdb-invoker-ptrace.c (original)
+++ branches/VALGRIND_3_10_BRANCH/coregrind/vgdb-invoker-ptrace.c Sun Nov 23 12:10:22 2014
@@ -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
|