From: Mark Wielaard <mark@klomp.org>
Date: Mon, 17 Jul 2017 15:26:25 +0000 (+0200)
Subject: backends: Swap sys/ptrace.h and asm/ptrace.h include order on s390.
X-Git-Tag: elfutils-0.170~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dd301b7c302b9df980946e2d04ca99748754991;p=thirdparty%2Felfutils.git

backends: Swap sys/ptrace.h and asm/ptrace.h include order on s390.

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 <mark@klomp.org>
---

diff --git a/backends/ChangeLog b/backends/ChangeLog
index c5f61e85a..d62824513 100644
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-17  Mark Wielaard  <mark@klomp.org>
+
+	* s390_initreg.c: Swap sys/ptrace.h and asm/ptrace.h include order.
+
 2017-06-15  Andreas Schwab  <schwab@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 011305cea..23bf8edcc 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_