1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
--- strace-4.8.orig/process.c 2013-05-18 00:22:19.000000000 +0200
+++ strace-4.8/process.c 2014-03-07 11:15:51.318966166 +0100
@@ -55,7 +55,7 @@
# endif
#endif
-#ifdef HAVE_LINUX_PTRACE_H
+#if defined(HAVE_LINUX_PTRACE_H) && defined(__GLIBC__)
# undef PTRACE_SYSCALL
# ifdef HAVE_STRUCT_IA64_FPREG
# define ia64_fpreg XXX_ia64_fpreg
@@ -104,6 +104,14 @@
# include <asm/rse.h>
#endif
+#ifdef __arm__
+#include <asm/ptrace.h>
+#endif
+
+#ifdef __microblaze__
+#include <asm/ptrace.h>
+#endif
+
#ifdef HAVE_PRCTL
# include <sys/prctl.h>
@@ -2472,7 +2480,7 @@ const struct xlat struct_user_offsets[]
#elif defined(TILE)
/* nothing */
#elif defined(MICROBLAZE)
- { sizeof(struct user), "sizeof(struct user)" },
+ /* nothing */
#elif defined(AVR32)
{ uoff(u_tsize), "offsetof(struct user, u_tsize)" },
{ uoff(u_dsize), "offsetof(struct user, u_dsize)" },
@@ -2857,7 +2865,7 @@ sys_sched_setscheduler(struct tcb *tcp)
if (umove(tcp, tcp->u_arg[2], &p) < 0)
tprintf(", %#lx", tcp->u_arg[2]);
else
- tprintf(", { %d }", p.__sched_priority);
+ tprintf(", { %d }", p.sched_priority);
}
return 0;
}
@@ -2872,7 +2880,7 @@ sys_sched_getparam(struct tcb *tcp)
if (umove(tcp, tcp->u_arg[1], &p) < 0)
tprintf("%#lx", tcp->u_arg[1]);
else
- tprintf("{ %d }", p.__sched_priority);
+ tprintf("{ %d }", p.sched_priority);
}
return 0;
}
@@ -2885,7 +2893,7 @@ sys_sched_setparam(struct tcb *tcp)
if (umove(tcp, tcp->u_arg[1], &p) < 0)
tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]);
else
- tprintf("%d, { %d }", (int) tcp->u_arg[0], p.__sched_priority);
+ tprintf("%d, { %d }", (int) tcp->u_arg[0], p.sched_priority);
}
return 0;
}
|
