glibc 2.26 changed the sys/ptrace.h header so that it cannot be included
after asm/ptrace.h. We still need to include the kernel asm/ptrace.h for
the ptrace_area definition. Including it after sys/ptrace.h works against
both old and new glibc.
Signed-off-by: Mark Wielaard <m...@klomp.org>
---
backends/ChangeLog | 4 ++++
backends/s390_initreg.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/backends/ChangeLog b/backends/ChangeLog
index c5f61e8..d628245 100644
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-17 Mark Wielaard <m...@klomp.org>
+
+ * s390_initreg.c: Swap sys/ptrace.h and asm/ptrace.h include order.
+
2017-06-15 Andreas Schwab <sch...@linux-m68k.org>
* ppc_symbol.c (ppc_machine_flag_check): New function.
diff --git a/backends/s390_initreg.c b/backends/s390_initreg.c
index 011305c..23bf8ed 100644
--- a/backends/s390_initreg.c
+++ b/backends/s390_initreg.c
@@ -34,8 +34,8 @@
#include <assert.h>
#if defined(__s390__) && defined(__linux__)
# include <sys/user.h>
-# include <asm/ptrace.h>
# include <sys/ptrace.h>
+# include <asm/ptrace.h>
#endif
#define BACKEND s390_
--
1.8.3.1
