|
 |
c6d234 |
commit cab91f947a6059907a314a91f4c90abcccfb0262
|
|
|
c6d234 |
Author: Dmitry V. Levin <ldv@altlinux.org>
|
|
|
c6d234 |
Date: Sun Jul 23 23:22:53 2017 +0000
|
|
|
c6d234 |
|
|
|
c6d234 |
S390: fix sys/ptrace.h to make it includible again after asm/ptrace.h
|
|
|
c6d234 |
|
|
|
c6d234 |
sys/ptrace.h on S390 used to be includible both before and after
|
|
|
c6d234 |
asm/ptrace.h, until commit b08a6a0dea63742313ed3d9577c1e2d83436b196
|
|
|
c6d234 |
among other changes introduced PTRACE_SINGLEBLOCK enum constant which
|
|
|
c6d234 |
is also defined in asm/ptrace.h as a macro, making sys/ptrace.h fail
|
|
|
c6d234 |
to compile when included after asm/ptrace.h.
|
|
|
c6d234 |
|
|
|
c6d234 |
* sysdeps/unix/sysv/linux/s390/sys/ptrace.h [_LINUX_PTRACE_H ||
|
|
|
c6d234 |
_S390_PTRACE_H]: Undefine all PTRACE_* macro constants defined
|
|
|
c6d234 |
later as enum constants, except PTRACE_PEEKUSER, PTRACE_POKEUSER,
|
|
|
c6d234 |
and PTRACE_SEIZE_DEVEL that are not defined by Linux headers.
|
|
|
c6d234 |
|
|
|
c6d234 |
diff --git a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
|
|
|
c6d234 |
index 88079fc..e913647 100644
|
|
|
c6d234 |
--- a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
|
|
|
c6d234 |
+++ b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
|
|
|
c6d234 |
@@ -24,24 +24,60 @@
|
|
|
c6d234 |
#include <bits/types.h>
|
|
|
c6d234 |
|
|
|
c6d234 |
__BEGIN_DECLS
|
|
|
c6d234 |
-#ifdef _LINUX_PTRACE_H
|
|
|
c6d234 |
+#if defined _LINUX_PTRACE_H || defined _S390_PTRACE_H
|
|
|
c6d234 |
/* Kludge to stop stuff gdb & strace compiles from getting upset
|
|
|
c6d234 |
*/
|
|
|
c6d234 |
-#undef PTRACE_TRACEME
|
|
|
c6d234 |
-#undef PTRACE_PEEKTEXT
|
|
|
c6d234 |
-#undef PTRACE_PEEKDATA
|
|
|
c6d234 |
-#undef PTRACE_PEEKUSR
|
|
|
c6d234 |
-#undef PTRACE_POKETEXT
|
|
|
c6d234 |
-#undef PTRACE_POKEDATA
|
|
|
c6d234 |
-#undef PTRACE_POKEUSR
|
|
|
c6d234 |
-#undef PTRACE_CONT
|
|
|
c6d234 |
-#undef PTRACE_KILL
|
|
|
c6d234 |
-#undef PTRACE_SINGLESTEP
|
|
|
c6d234 |
-
|
|
|
c6d234 |
-#undef PTRACE_ATTACH
|
|
|
c6d234 |
-#undef PTRACE_DETACH
|
|
|
c6d234 |
-
|
|
|
c6d234 |
-#undef PTRACE_SYSCALL
|
|
|
c6d234 |
+# undef PTRACE_TRACEME
|
|
|
c6d234 |
+# undef PTRACE_PEEKTEXT
|
|
|
c6d234 |
+# undef PTRACE_PEEKDATA
|
|
|
c6d234 |
+# undef PTRACE_POKETEXT
|
|
|
c6d234 |
+# undef PTRACE_POKEDATA
|
|
|
c6d234 |
+# undef PTRACE_CONT
|
|
|
c6d234 |
+# undef PTRACE_KILL
|
|
|
c6d234 |
+# undef PTRACE_SINGLESTEP
|
|
|
c6d234 |
+# undef PTRACE_SINGLEBLOCK
|
|
|
c6d234 |
+# undef PTRACE_ATTACH
|
|
|
c6d234 |
+# undef PTRACE_DETACH
|
|
|
c6d234 |
+# undef PTRACE_SYSCALL
|
|
|
c6d234 |
+# undef PTRACE_SETOPTIONS
|
|
|
c6d234 |
+# undef PTRACE_GETEVENTMSG
|
|
|
c6d234 |
+# undef PTRACE_GETSIGINFO
|
|
|
c6d234 |
+# undef PTRACE_SETSIGINFO
|
|
|
c6d234 |
+# undef PTRACE_GETREGSET
|
|
|
c6d234 |
+# undef PTRACE_SETREGSET
|
|
|
c6d234 |
+# undef PTRACE_SEIZE
|
|
|
c6d234 |
+# undef PTRACE_INTERRUPT
|
|
|
c6d234 |
+# undef PTRACE_LISTEN
|
|
|
c6d234 |
+# undef PTRACE_PEEKSIGINFO
|
|
|
c6d234 |
+# undef PTRACE_GETSIGMASK
|
|
|
c6d234 |
+# undef PTRACE_SETSIGMASK
|
|
|
c6d234 |
+# undef PTRACE_SECCOMP_GET_FILTER
|
|
|
c6d234 |
+# undef PTRACE_PEEKUSR_AREA
|
|
|
c6d234 |
+# undef PTRACE_POKEUSR_AREA
|
|
|
c6d234 |
+# undef PTRACE_GET_LAST_BREAK
|
|
|
c6d234 |
+# undef PTRACE_ENABLE_TE
|
|
|
c6d234 |
+# undef PTRACE_DISABLE_TE
|
|
|
c6d234 |
+# undef PTRACE_TE_ABORT_RAND
|
|
|
c6d234 |
+# undef PTRACE_O_TRACESYSGOOD
|
|
|
c6d234 |
+# undef PTRACE_O_TRACEFORK
|
|
|
c6d234 |
+# undef PTRACE_O_TRACEVFORK
|
|
|
c6d234 |
+# undef PTRACE_O_TRACECLONE
|
|
|
c6d234 |
+# undef PTRACE_O_TRACEEXEC
|
|
|
c6d234 |
+# undef PTRACE_O_TRACEVFORKDONE
|
|
|
c6d234 |
+# undef PTRACE_O_TRACEEXIT
|
|
|
c6d234 |
+# undef PTRACE_O_TRACESECCOMP
|
|
|
c6d234 |
+# undef PTRACE_O_EXITKILL
|
|
|
c6d234 |
+# undef PTRACE_O_SUSPEND_SECCOMP
|
|
|
c6d234 |
+# undef PTRACE_O_MASK
|
|
|
c6d234 |
+# undef PTRACE_EVENT_FORK
|
|
|
c6d234 |
+# undef PTRACE_EVENT_VFORK
|
|
|
c6d234 |
+# undef PTRACE_EVENT_CLONE
|
|
|
c6d234 |
+# undef PTRACE_EVENT_EXEC
|
|
|
c6d234 |
+# undef PTRACE_EVENT_VFORK_DONE
|
|
|
c6d234 |
+# undef PTRACE_EVENT_EXIT
|
|
|
c6d234 |
+# undef PTRACE_EVENT_SECCOMP
|
|
|
c6d234 |
+# undef PTRACE_EVENT_STOP
|
|
|
c6d234 |
+# undef PTRACE_PEEKSIGINFO_SHARED
|
|
|
c6d234 |
#endif
|
|
|
c6d234 |
/* Type of the REQUEST argument to `ptrace.' */
|
|
|
c6d234 |
enum __ptrace_request
|