From: Takashi Yoshii Date: Mon, 14 Jun 2010 23:56:22 +0000 (-0700) Subject: [sh] Fix incorrect location of ifndef for __ASSUME_FUTEX_CLOCK_REALTIME. X-Git-Tag: glibc-2.11.3~56 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88731ee9162c68b851d94e2b8f3dcb1a5f88f11f;p=thirdparty%2Fglibc.git [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 08a55ee5c8a..dc3b4dcd270 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2010-06-01 Takashi Yoshii + + * sysdeps/unix/sysv/linux/sh/lowlevellock.S: Fix incorrect + location of ifndef __ASSUME_FUTEX_CLOCK_REALTIME. + 2009-11-27 Andreas Schwab * sysdeps/unix/sysv/linux/x86_64/cancellation.S: Reload diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S index 49b4e6d6e01..0d02083c46f 100644 --- 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