[Xen-devel] Gentoo/glibc-2.3.5 tls patch: Need HELP

["B.G. Bruce" <bgb@xxxxxxxxx>]

I'm trying to patch gentoo/glibc-2.3.5 with the tls patch from the wiki.


What I have so far (for sysdeps/unix/sysv/linux/i386/sysdeps.h):
0:SETUP_PIC_REG (dx);                                                  \
  addl $_GLOBAL_OFFSET_TABLE_, %edx;                                   \
  movl %gs:0, %ecx;                                                    \
  addl SYSCALL_ERROR_ERRNO@GOTNTPOFF(%edx), %ecx;                      \
  xorl %edx, %edx;                                                     \
  subl %eax, %edx;                                                     \

---------------------------------------------------------------------------

It's the last lines of the original patch  that I don't know how to apply:
-  movl %edx, %gs:0(%ecx);                                             \
+  movl %edx, (%ecx);                                                  \

They belong somewhere in the following snippet:

  SYSCALL_ERROR_HANDLER_TLS_STORE (%edx, %ecx);                        \
  orl $-1, %eax;                                                       \
  jmp L(pseudo_end);
#   ifndef NO_TLS_DIRECT_SEG_REFS
#    define SYSCALL_ERROR_HANDLER_TLS_STORE(src, destoff)              \
  movl src, %gs:(destoff)
#   else
#    define SYSCALL_ERROR_HANDLER_TLS_STORE(src, destoff)              \
  addl %gs:0, destoff;                                                 \
  movl src, (destoff)
#   endif

Any help is greatly appreciated.

Brian.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel