patch-process_c 1.7 KB

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