diff options
| author | Takashi Yoshii <takashi.yoshii.zj@renesas.com> | 2010-06-14 16:56:22 -0700 |
|---|---|---|
| committer | Petr Baudis <pasky@suse.cz> | 2010-11-01 22:04:01 +0100 |
| commit | 88731ee9162c68b851d94e2b8f3dcb1a5f88f11f (patch) | |
| tree | 22408487e06f49455030c1c99d03861f5ae45ece | |
| parent | a4c0656f24f9a969060104beed261f5b6fb5cc80 (diff) | |
| download | glibc-88731ee9162c68b851d94e2b8f3dcb1a5f88f11f.tar.gz glibc-88731ee9162c68b851d94e2b8f3dcb1a5f88f11f.tar.xz glibc-88731ee9162c68b851d94e2b8f3dcb1a5f88f11f.zip | |
[sh] Fix incorrect location of ifndef for __ASSUME_FUTEX_CLOCK_REALTIME.
(cherry picked from commit 4bc93b30337482a0ad1758b4ba069704d09c39da)
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 08a55ee5c8..dc3b4dcd27 100644 --- 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. + 2009-11-27 Andreas Schwab <schwab@redhat.com> * 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 49b4e6d6e0..0d02083c46 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 |