diff options
| author | Mark Wielaard <mark@klomp.org> | 2017-07-17 17:26:25 +0200 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2017-07-17 17:27:01 +0200 |
| commit | 1dd301b7c302b9df980946e2d04ca99748754991 (patch) | |
| tree | 4373953bb95cb27604b8166a1632a5a5e70b56f0 | |
| parent | d03be4f70c688a8c675935973663014c3c4bba76 (diff) | |
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>
| -rw-r--r-- | backends/ChangeLog | 4 | ||||
| -rw-r--r-- | backends/s390_initreg.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/backends/ChangeLog b/backends/ChangeLog index c5f61e85..d6282451 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 011305ce..23bf8edc 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_ |