diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-06-15 10:07:36 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-06-15 10:09:30 +0200 |
| commit | 7314e378e3b0b2a6ea2f0bd7e77cd43a59e38a88 (patch) | |
| tree | abe81dc7c6f5cb9b3ed94c84159d180c1bcb5431 /nptl | |
| parent | 16552c01a66633c9e412984d9d92616bd4e5303c (diff) | |
| parent | 765ade4b29d9fcc4b236b4f3ae5bfd1174978442 (diff) | |
| download | glibc-7314e378e3b0b2a6ea2f0bd7e77cd43a59e38a88.tar glibc-7314e378e3b0b2a6ea2f0bd7e77cd43a59e38a88.tar.gz glibc-7314e378e3b0b2a6ea2f0bd7e77cd43a59e38a88.tar.bz2 glibc-7314e378e3b0b2a6ea2f0bd7e77cd43a59e38a88.zip | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'nptl')
| -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 ed574205ed..bb0008620d 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. + 2010-05-27 Andreas Schwab <schwab@redhat.com> * Makefile ($(objpfx)tst-_res1): Depend on 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 |