From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 13 Feb 2009 23:36:40 +0000 (+0000)
Subject: * sysdeps/unix/sysv/linux/sh/lowlevellock.S: Define
X-Git-Tag: upstream/2.30~13816
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c869eb67e0852e8026c9975bca5239adf6956d0;p=external%2Fglibc.git

* sysdeps/unix/sysv/linux/sh/lowlevellock.S: Define

	LOAD_FUTEX_WAIT_ABS even if (FUTEX_WAIT == 0).
---

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 5551d7a..530e710 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+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).
+
 2009-01-29  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/pthread/unwind-forcedunwind.c: Encrypt all function
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
index c051192..b80c369 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
@@ -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	; \