libaio-0.3.109-x32.patch 2.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364
  1. http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=f5c071d93c9e6f57930bce56b1e4f009c160a826
  2. Upstream-Status: Pending
  3. Properly load arguments 5 an 6 for x86-64 syscall
  4. Use asm ("r10") and asm ("r8") to load arguments 5 an 6 for x86-64
  5. syscall so that it works with both x32 and x86-64.
  6. Received this patch from H.J. Lu <hjl.tools@gmail.com>
  7. Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
  8. 2011/12/02
  9. --- libaio-0.3.109/src/syscall-x86_64.h.x32 2009-10-09 11:17:02.000000000 -0700
  10. +++ libaio-0.3.109/src/syscall-x86_64.h 2011-12-02 09:09:07.537603224 -0800
  11. @@ -1,8 +1,18 @@
  12. +#ifndef __NR_io_setup
  13. #define __NR_io_setup 206
  14. +#endif
  15. +#ifndef __NR_io_destroy
  16. #define __NR_io_destroy 207
  17. +#endif
  18. +#ifndef __NR_io_getevents
  19. #define __NR_io_getevents 208
  20. +#endif
  21. +#ifndef __NR_io_submit
  22. #define __NR_io_submit 209
  23. +#endif
  24. +#ifndef __NR_io_cancel
  25. #define __NR_io_cancel 210
  26. +#endif
  27. #define __syscall_clobber "r11","rcx","memory"
  28. #define __syscall "syscall"
  29. @@ -42,10 +52,11 @@ return __res; \
  30. type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
  31. { \
  32. long __res; \
  33. -__asm__ volatile ("movq %5,%%r10 ;" __syscall \
  34. +register long __a4 asm ("r10") = (long) arg4; \
  35. +__asm__ volatile (__syscall \
  36. : "=a" (__res) \
  37. : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \
  38. - "d" ((long)(arg3)),"g" ((long)(arg4)) : __syscall_clobber,"r10" ); \
  39. + "d" ((long)(arg3)),"r" (__a4)); \
  40. return __res; \
  41. }
  42. @@ -54,10 +65,11 @@ return __res; \
  43. type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
  44. { \
  45. long __res; \
  46. -__asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; " __syscall \
  47. +register long __a4 asm ("r10") = (long) arg4; \
  48. +register long __a5 asm ("r8") = (long) arg5; \
  49. +__asm__ volatile ( __syscall \
  50. : "=a" (__res) \
  51. : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \
  52. - "d" ((long)(arg3)),"g" ((long)(arg4)),"g" ((long)(arg5)) : \
  53. - __syscall_clobber,"r8","r10" ); \
  54. + "d" ((long)(arg3)),"r" (__a4),"r" (__a5)); \
  55. return __res; \
  56. }