glibc-sh-broken-nptl-lock-macros.patch

   1 2007-11-03  Mike Frysinger  <vapier@gentoo.org>
   2
   3         * sysdeps/unix/sysv/linux/sh/lowlevellock.S (LOAD_FUTEX_WAIT): Add
   4         missing line continuations.
   5         * sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S (LOAD_FUTEX_WAIT,
   6         LOAD_FUTEX_WAKE): Likewise.  Also add missing 3rd parameter.
   7
   8 Index: nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
   9 ===================================================================
  10 RCS file: /cvs/glibc/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S,v
  11 retrieving revision 1.14
  12 diff -u -p -r1.14 lowlevellock.S
  13 --- nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S      3 Aug 2007 15:44:15 -0000       1.14
  14 +++ nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S      4 Nov 2007 03:50:46 -0000
  15 @@ -76,7 +76,7 @@
  16         add     tmp2, tmp       ; \
  17         mov.l   @tmp, tmp2      ; \
  18         bra     98f             ; \
  19 -        mov    #FUTEX_PRIVATE_FLAG, tmp
  20 +        mov    #FUTEX_PRIVATE_FLAG, tmp ; \
  21  99:    .word   PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \
  22  98:    extu.b  tmp, tmp        ; \
  23         xor     tmp, reg        ; \
  24 @@ -88,7 +88,7 @@
  25         add     tmp2, tmp       ; \
  26         mov.l   @tmp, tmp2      ; \
  27         bra     98f             ; \
  28 -        mov    #FUTEX_PRIVATE_FLAG, tmp
  29 +        mov    #FUTEX_PRIVATE_FLAG, tmp ; \
  30  99:    .word   PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \
  31  98:    extu.b  tmp, tmp        ; \
  32         xor     tmp, reg        ; \
  33 @@ -96,13 +96,13 @@
  34         mov     #FUTEX_WAIT, tmp ; \
  35         or      tmp, reg
  36  # endif
  37 -# define LOAD_FUTEX_WAKE(reg,tmp) \
  38 +# define LOAD_FUTEX_WAKE(reg,tmp,tmp2) \
  39         stc     gbr, tmp        ; \
  40         mov.w   99f, tmp2       ; \
  41         add     tmp2, tmp       ; \
  42         mov.l   @tmp, tmp2      ; \
  43         bra     98f             ; \
  44 -        mov    #FUTEX_PRIVATE_FLAG, tmp
  45 +        mov    #FUTEX_PRIVATE_FLAG, tmp ; \
  46  99:    .word   PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \
  47  98:    extu.b  tmp, tmp        ; \
  48         xor     tmp, reg        ; \
  49 Index: nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
  50 ===================================================================
  51 RCS file: /cvs/glibc/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S,v
  52 retrieving revision 1.2
  53 diff -u -p -r1.2 lowlevelrobustlock.S
  54 --- nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S        3 Aug 2007 15:44:57 -0000       1.2
  55 +++ nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S        4 Nov 2007 03:50:46 -0000
  56 @@ -42,7 +42,7 @@
  57         add     tmp2, tmp       ; \
  58         mov.l   @tmp, tmp2      ; \
  59         bra     98f             ; \
  60 -        mov    #FUTEX_PRIVATE_FLAG, tmp
  61 +        mov    #FUTEX_PRIVATE_FLAG, tmp ; \
  62  99:    .word   PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \
  63  98:    extu.b  tmp, tmp        ; \
  64         xor     tmp, reg        ; \
  65 @@ -54,7 +54,7 @@
  66         add     tmp2, tmp       ; \
  67         mov.l   @tmp, tmp2      ; \
  68         bra     98f             ; \
  69 -        mov    #FUTEX_PRIVATE_FLAG, tmp
  70 +        mov    #FUTEX_PRIVATE_FLAG, tmp ; \
  71  99:    .word   PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \
  72  98:    extu.b  tmp, tmp        ; \
  73         xor     tmp, reg        ; \