qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[sh] Fix incorrect location of ifndef for __ASSUME_FUTEX_CLOCK_REALTIME.

This commit is contained in:
Takashi Yoshii 2010-06-14 16:56:22 -07:00 committed by Ulrich Drepper
parent caa78cf824
commit 4bc93b3033
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nptl/ChangeLog
View File

@ -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> 2010-04-09 Ulrich Drepper <drepper@redhat.com>
[BZ #11390] [BZ #11390]

4
nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
View File

@ -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. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -282,6 +282,7 @@ __lll_timedlock_wait:
rts rts
mov.l @r15+, r12 mov.l @r15+, r12
# ifndef __ASSUME_FUTEX_CLOCK_REALTIME
.align 2 .align 2
# ifdef PIC # ifdef PIC
.Lgot: .Lgot:
@ -293,7 +294,6 @@ __lll_timedlock_wait:
.long __have_futex_clock_realtime .long __have_futex_clock_realtime
# endif # endif
# ifndef __ASSUME_FUTEX_CLOCK_REALTIME
.Lreltmo: .Lreltmo:
/* Check for a valid timeout value. */ /* Check for a valid timeout value. */
mov.l @(4,r6), r1 mov.l @(4,r6), r1