diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2010-06-24 15:01:34 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2010-06-24 15:01:34 +0000 |
| commit | 6d5d61ad6033044a890eeecdcc60427f5e52d03d (patch) | |
| tree | a44f28cb8ea13826ebf53e5db0b29ea56282128b /libc/nptl | |
| parent | 88e95b91302a82653053490ef1064fa903e75c27 (diff) | |
| download | eglibc2-6d5d61ad6033044a890eeecdcc60427f5e52d03d.tar.gz | |
Merge changes between r10687 and r10807 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@10808 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/nptl')
| -rw-r--r-- | libc/nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libc/nptl/ChangeLog b/libc/nptl/ChangeLog index e69e44f7c..49ead511b 100644 --- a/libc/nptl/ChangeLog +++ b/libc/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/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S index 49b4e6d6e..0d02083c4 100644 --- a/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S +++ b/libc/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 |