aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer
diff options
context:
space:
mode:
authorYvan Roux <yvan.roux@linaro.org>2017-09-13 22:08:01 +0200
committerYvan Roux <yvan.roux@linaro.org>2017-09-13 22:08:01 +0200
commitc9ea5a776f51a9c5c5a7acabd054d0f2c1d49b66 (patch)
treecb3c91ed24da10b24f0cbbfad54c3aaf2efa2762 /libsanitizer
parentb637432f10f34af6d5680363f853f929d0472652 (diff)
Merge branches/gcc-7-branch rev 252337.
Change-Id: Iea4913cc1bf65480f6d85f4cc97252e9e59c3631
Diffstat (limited to 'libsanitizer')
-rw-r--r--libsanitizer/ChangeLog7
-rw-r--r--libsanitizer/include/system/sys/ptrace.h7
2 files changed, 14 insertions, 0 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index d4c9d4b1536..7aa9d287804 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,10 @@
+2017-09-07 Jakub Jelinek <jakub@redhat.com>
+
+ Backported from mainline
+ 2017-08-07 Jakub Jelinek <jakub@redhat.com>
+
+ * include/system/sys/ptrace.h: New file.
+
2017-08-14 Release Manager
* GCC 7.2.0 released.
diff --git a/libsanitizer/include/system/sys/ptrace.h b/libsanitizer/include/system/sys/ptrace.h
new file mode 100644
index 00000000000..1cfe4ce96e0
--- /dev/null
+++ b/libsanitizer/include/system/sys/ptrace.h
@@ -0,0 +1,7 @@
+#include_next <sys/ptrace.h>
+#ifndef PTRACE_GETREGSET
+/* glibc before
+ https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=cbff0d9689c4d68578b6a4f0a17807232506ea27
+ doesn't define PTRACE_GETREGSET. */
+#define PTRACE_GETREGSET 0x4204
+#endif