This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH][sh] Fix incorrect location of ifndef for__ASSUME_FUTEX_CLOCK_REALTIME.
- From: Takashi Yoshii <takashi dot yoshii dot zj at renesas dot com>
- To: libc-alpha at sourceware dot org
- Date: Thu, 3 Jun 2010 11:04:11 +0900
- Subject: [PATCH][sh] Fix incorrect location of ifndef for__ASSUME_FUTEX_CLOCK_REALTIME.
An miss-placed ifndef __ASSUME_FUTEX_CLOCK_REALTIME in
nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S results undefined
reference to `__have_futex_clock_realtime' compile-time error, when it is set
(by configuring it with --enable-kernel >= 2.6.29).
Compilation check passed both with --enable-kernel=2.6.9 and 2.6.30.
/yoshii
---
2010-06-01 Takashi Yoshii <takashi.yoshii.zj@renesas.com>
* nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S: Fix incorrect
location of ifndef __ASSUME_FUTEX_CLOCK_REALTIME.
---
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
index 49b4e6d..0d02083 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