[sh] Fix incorrect location of ifndef for __ASSUME_FUTEX_CLOCK_REALTIME.

(cherry picked from commit 4bc93b30337482a0ad1758b4ba069704d09c39da)

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index e69e44f7cd46bc472cdb21c2d1a0e65da377cac4..49ead511b2178d4e831ee7092370266a6f38badb 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-01  Takashi Yoshii  <takashi.yoshii.zj@renesas.com>
+
+       * sysdeps/unix/sysv/linux/sh/lowlevellock.S: Fix incorrect
+       location of ifndef __ASSUME_FUTEX_CLOCK_REALTIME.
+
 2010-04-09  Ulrich Drepper  <drepper@redhat.com>
 
        [BZ #11390]

diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
index 49b4e6d6e01eb10c8737ef19d84ca889659de91c..0d02083c46fea53f9a942733925284234c36f9ed 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009
+/* Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -282,6 +282,7 @@ __lll_timedlock_wait:
        rts
         mov.l  @r15+, r12
 
+# ifndef __ASSUME_FUTEX_CLOCK_REALTIME
        .align  2
 # ifdef PIC
 .Lgot:
@@ -293,7 +294,6 @@ __lll_timedlock_wait:
        .long   __have_futex_clock_realtime
 # endif
 
-# ifndef __ASSUME_FUTEX_CLOCK_REALTIME
 .Lreltmo:
        /* Check for a valid timeout value.  */
        mov.l   @(4,r6), r1