Skip to content

Commit

Permalink
[sh] Fix incorrect location of ifndef for __ASSUME_FUTEX_CLOCK_REALTIME.
Browse files Browse the repository at this point in the history
(cherry picked from commit 4bc93b3)
  • Loading branch information
Takashi Yoshii authored and Andreas Schwab committed Jun 15, 2010
1 parent cea9bac commit edf8365
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions nptl/ChangeLog
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
4 changes: 2 additions & 2 deletions nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -282,6 +282,7 @@ __lll_timedlock_wait:
rts
mov.l @r15+, r12

# ifndef __ASSUME_FUTEX_CLOCK_REALTIME
.align 2
# ifdef PIC
.Lgot:
Expand All @@ -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
Expand Down

0 comments on commit edf8365

Please sign in to comment.