diff options
| author | Mark Wielaard <mark@klomp.org> | 2018-02-15 14:44:18 +0100 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2018-02-15 14:55:39 +0100 |
| commit | 4482d0009a99b1773f2426479b666b08f57af9d5 (patch) | |
| tree | 675c48a48a3156da1d2f7c9a0db46c985691e73f /backends | |
| parent | 212b4e3d431449056aed316331ee654611671513 (diff) | |
Include sys/ptrace.h as early as possible.
On some systems, at least on Fedora 27 ppc64le with glibc 2.26-24 and
kernel 4.14.18-300, including sys/ptrace.h late (after signal.h or
sys/wait.h for example) will cause issues and produce errors like:
In file included from /usr/include/asm/sigcontext.h:12:0,
from /usr/include/bits/sigcontext.h:30,
from /usr/include/signal.h:287,
from /usr/include/sys/wait.h:36,
from linux-pid-attach.c:38:
/usr/include/sys/ptrace.h:73:3: error: expected identifier before numeric constant
PTRACE_GETREGS = 12,
^
Swapping the include order fixes these issues.
Signed-off-by: Mark Wielaard <mark@klomp.org>
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/ChangeLog | 4 | ||||
| -rw-r--r-- | backends/ppc_initreg.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/backends/ChangeLog b/backends/ChangeLog index 098bed76..b5258013 100644 --- a/backends/ChangeLog +++ b/backends/ChangeLog @@ -1,3 +1,7 @@ +2018-02-15 Mark Wielaard <mark@klomp.org> + + * ppc_initreg.c: Include ptrace.h before system.h and sys/user.h. + 2018-02-09 Joshua Watt <JPEWhacker@gmail.com> * aarch64_retval.c (aarch64_return_value_location): Use FALLTHROUGH diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c index 69d623b9..3e4432f6 100644 --- a/backends/ppc_initreg.c +++ b/backends/ppc_initreg.c @@ -30,13 +30,14 @@ # include <config.h> #endif -#include "system.h" #include <stdlib.h> #if defined(__powerpc__) && defined(__linux__) -# include <sys/user.h> # include <sys/ptrace.h> +# include <sys/user.h> #endif +#include "system.h" + #define BACKEND ppc_ #include "libebl_CPU.h" |