This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [SH][PATCH] fix nptl asm code
- From: Kaz Kojima <kkojima at rr dot iij4u dot or dot jp>
- To: sugioka at itonet dot co dot jp
- Cc: libc-alpha at sourceware dot org
- Date: Sat, 14 Feb 2009 08:06:29 +0900 (JST)
- Subject: Re: [SH][PATCH] fix nptl asm code
- References: <4.2.0.58.J.20090214054544.02bc7f28@router.itonet.co.jp>
SUGIOKA Toshinobu <sugioka@itonet.co.jp> wrote:
> Following patch fixes simple mistake in sh asm code for nptl.
>
> 2009-02-14 SUGIOKA Toshinobu <sugioka@itonet.co.jp>
>
> nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S: define
> LOAD_FUTEX_WAIT_ABS even if (FUTEX_WAIT == 0).
I thought that I've tested it with the old kernel too, but
clearly haven't. Thanks for pointing this out. Although
the patch does the right thing for non __ASSUME_PRIVATE_FUTEX
case, it has an indentation issue and the ChangeLog entry
doesn't look ok as the nptl patch. I'd like to modified them
as the attached one.
Uli, could you please approve this?
Regards,
kaz
--
2009-02-14 SUGIOKA Toshinobu <sugioka@itonet.co.jp>
* sysdeps/unix/sysv/linux/sh/lowlevellock.S: Define
LOAD_FUTEX_WAIT_ABS even if (FUTEX_WAIT == 0).
--- ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S 2009-01-14 10:49:59.000000000 +0900
+++ LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S 2009-02-14 07:32:34.000000000 +0900
@@ -103,7 +103,8 @@
and tmp2, reg ; \
mov #FUTEX_WAIT, tmp ; \
or tmp, reg
-# define LOAD_FUTEX_WAIT_ABS(reg,tmp,tmp2) \
+# endif
+# define LOAD_FUTEX_WAIT_ABS(reg,tmp,tmp2) \
stc gbr, tmp ; \
mov.w 99f, tmp2 ; \
add tmp2, tmp ; \
@@ -119,7 +120,6 @@
swap.b tmp2, tmp2; \
or tmp2, tmp; \
or tmp, reg
-# endif
# define LOAD_FUTEX_WAKE(reg,tmp,tmp2) \
stc gbr, tmp ; \
mov.w 99f, tmp2 ; \