[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r4416 - in /fsf/trunk/libc: localedata/ localedata/locales/ nptl/ nptl/sysdeps/unix/sysv/linux/sh/
- To: commits@xxxxxxxxxx
- Subject: [commits] r4416 - in /fsf/trunk/libc: localedata/ localedata/locales/ nptl/ nptl/sysdeps/unix/sysv/linux/sh/
- From: eglibc@xxxxxxxxxx
- Date: Wed, 05 Dec 2007 08:04:18 -0000
Author: eglibc
Date: Wed Dec 5 00:04:17 2007
New Revision: 4416
Log:
Import glibc-mainline for 2007-12-05
Modified:
fsf/trunk/libc/localedata/ChangeLog
fsf/trunk/libc/localedata/locales/as_IN
fsf/trunk/libc/localedata/locales/si_LK
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Wed Dec 5 00:04:17 2007
@@ -1,3 +1,8 @@
+2007-12-04 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * locales/si_LK (mon): Fix February and November spelling.
+ Patch by Danishka Navin <snavin@xxxxxxxxxx>.
+
2007-11-07 Ulrich Drepper <drepper@xxxxxxxxxx>
[BZ #5238]
Modified: fsf/trunk/libc/localedata/locales/as_IN
==============================================================================
--- fsf/trunk/libc/localedata/locales/as_IN (original)
+++ fsf/trunk/libc/localedata/locales/as_IN Wed Dec 5 00:04:17 2007
@@ -2,13 +2,12 @@
escape_char /
% Assamese locale for India.
-% Contributed by Masahide Washizawa <washi at jp ibm com>
%%%%%%%%%%%%%
LC_IDENTIFICATION
title "Assamese language locale for India"
-source "IBM AP Linux Technology Center, Yamato Software Laboratory"
-address "1623-14, Shimotsuruma, Yamato-shi, Kanagawa-ken, 242-8502, Japan"
+source "Amitakhya Phukan, Red Hat"
+address ""
contact ""
email "bug-glibc@xxxxxxx"
tel ""
@@ -678,7 +677,7 @@
t_fmt "<U0025><U0049><U002E><U0025><U004D><U002E><U0025><U0053><U0020><U0025><U0070>"
% d_t_fmt"%e %B, %Y %I.%M.%S %p %Z"
d_t_fmt "<U0025><U0065><U0020><U0025><U0042><U002C><U0020><U0025><U0059><U0020><U0025><U0049><U002E><U0025><U004D><U002E><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
-am_pm "<U09AA><U09C2><U09F0><U09CD><U09AC><U09CD><U09AC><U09BE><U09B9><U09CD><U09A8>";"<U0985><U09AA><U09F0><U09BE><U09B9><U09CD><U09A8>"
+am_pm "<U09AA><U09C2><U09F0><U09CD><U09AC><U09CD><U09AC><U09BE><U09B9><U09CD><U09A8>";"<U0985><U09AA><U09F0><U09BE><U09B9><U09CD><U09A8>"
% t_fmt_ampm "%I.%M.%S %p"
t_fmt_ampm "<U0025><U0049><U002E><U0025><U004D><U002E><U0025><U0053><U0020><U0025><U0070>"
END LC_TIME
Modified: fsf/trunk/libc/localedata/locales/si_LK
==============================================================================
--- fsf/trunk/libc/localedata/locales/si_LK (original)
+++ fsf/trunk/libc/localedata/locales/si_LK Wed Dec 5 00:04:17 2007
@@ -114,7 +114,7 @@
%
% Full month names (%B)
mon "<U0DA2><U0DB1><U0DC0><U0DCF><U0DBB><U0DD2>";/
- "<U0DB4><U0DD9><U0DB6><U0DBB><U0DC0><U0DCF><U0DBD><U0DD2>";/
+ "<U0DB4><U0DD9><U0DB6><U0DBB><U0DC0><U0DCF><U0DBB><U0DD2>";/
"<U0DB8><U0DCF><U0DBB><U0DCA><U0DAD><U0DD4>";/
"<U0D85><U0DB4><U0DCA><U200D><U0DBB><U0DD2><U0DBA><U0DD9><U0DBD><U0DCA>";/
"<U0DB8><U0DD0><U0DBA><U0DD2>";/
@@ -123,7 +123,7 @@
"<U0D85><U0D9C><U0DDD><U0DC3><U0DCA><U0DAD><U0DD4>";/
"<U0DC3><U0DD0><U0DB4><U0DCA><U0DAD><U0DD0><U0DB8><U0DCA><U0DB6><U0DBB><U0DCA>";/
"<U0D94><U0D9A><U0DCA><U0DAD><U0DDD><U0DB6><U0DBB><U0DCA>";/
- "<U0DB1><U0DD9><U0DC0><U0DD0><U0DB8><U0DCA><U0DB6><U0DBB><U0DCA>";/
+ "<U0DB1><U0DDC><U0DC0><U0DD0><U0DB8><U0DCA><U0DB6><U0DBB><U0DCA>";/
"<U0DAF><U0DD9><U0DC3><U0DD0><U0DB8><U0DCA><U0DB6><U0DBB><U0DCA>"
%
% Equivalent of AM PM
Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Wed Dec 5 00:04:17 2007
@@ -1,3 +1,8 @@
+2007-12-04 Kaz Kojima <kkojima@xxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/sh/lowlevellock.S (__lll_timedlock_wait):
+ Store 2 before returning ETIMEDOUT.
+
2007-11-23 Ulrich Drepper <drepper@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S (__lll_timedlock_wait):
Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S Wed Dec 5 00:04:17 2007
@@ -225,6 +225,12 @@
add #-8, r15
cfi_adjust_cfa_offset(8)
+ mov #2, r2
+ XCHG (r2, @r8, r3)
+
+ tst r3, r3
+ bt 6f
+
1:
/* Get current time. */
mov r15, r4
@@ -250,16 +256,10 @@
add #-1, r2
4:
cmp/pz r2
- bf 5f /* Time is already up. */
+ bf 2f /* Time is already up. */
mov.l r2, @r15 /* Store relative timeout. */
mov.l r3, @(4,r15)
-
- mov #1, r3
- mov #2, r4
- CMPXCHG (r3, @r8, r4, r2)
- tst r2, r2
- bt 8f
mov r8, r4
mov r11, r5
@@ -272,39 +272,29 @@
SYSCALL_INST_PAD
mov r0, r5
-8:
- mov #0, r3
- mov #2, r4
- CMPXCHG (r3, @r8, r4, r2)
- bf/s 7f
- mov #0, r0
+ mov #2, r2
+ XCHG (r2, @r8, r3)
+
+ tst r3, r3
+ bt/s 6f
+ mov #-ETIMEDOUT, r1
+ cmp/eq r5, r1
+ bf 1b
+
+2: mov #ETIMEDOUT, r3
6:
+ mov r3, r0
add #8, r15
mov.l @r15+, r8
mov.l @r15+, r9
mov.l @r15+, r10
rts
mov.l @r15+, r11
-7:
- /* Check whether the time expired. */
- mov #-ETIMEDOUT, r1
- cmp/eq r5, r1
- bt 5f
-
- /* Make sure the current holder knows we are going to sleep. */
- XCHG (r2, @r8, r3)
- tst r3, r3
- bt/s 6b
- mov #0, r0
- bra 1b
- nop
+
3:
rts
mov #EINVAL, r0
-5:
- bra 6b
- mov #ETIMEDOUT, r0
cfi_endproc
.L1k: