x32.patch

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