[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r8343 - in /fsf/trunk/libc: ./ localedata/ localedata/locales/ nptl/ stdio-common/ sysdeps/sh/sh4/
- To: commits@xxxxxxxxxx
- Subject: [commits] r8343 - in /fsf/trunk/libc: ./ localedata/ localedata/locales/ nptl/ stdio-common/ sysdeps/sh/sh4/
- From: eglibc@xxxxxxxxxx
- Date: Thu, 23 Apr 2009 07:04:44 -0000
Author: eglibc
Date: Thu Apr 23 00:04:41 2009
New Revision: 8343
Log:
Import glibc-mainline for 2009-04-23
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/localedata/ChangeLog
fsf/trunk/libc/localedata/locales/en_PH
fsf/trunk/libc/localedata/locales/es_CL
fsf/trunk/libc/localedata/locales/es_CO
fsf/trunk/libc/localedata/locales/es_MX
fsf/trunk/libc/localedata/locales/es_US
fsf/trunk/libc/localedata/locales/es_VE
fsf/trunk/libc/localedata/locales/fil_PH
fsf/trunk/libc/localedata/locales/ik_CA
fsf/trunk/libc/localedata/locales/iu_CA
fsf/trunk/libc/localedata/locales/tl_PH
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/nptl/pthread_attr_setschedparam.c
fsf/trunk/libc/stdio-common/printf.h
fsf/trunk/libc/stdio-common/reg-modifier.c
fsf/trunk/libc/sysdeps/sh/sh4/setjmp.S
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Apr 23 00:04:41 2009
@@ -1,3 +1,13 @@
+2009-04-22 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * stdio-common/printf.h: Add missing const to register_printf_modifier.
+ * stdio-common/reg-modifier.c: Likewise.
+
+2009-04-22 Andrew Stubbs <ams@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/sh/sh4/setjmp.S (__sigsetjmp): Adjust JB_SIZE when there
+ is no FPU.
+
2009-04-20 Ulrich Drepper <drepper@xxxxxxxxxx>
[BZ #10086]
Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Thu Apr 23 00:04:41 2009
@@ -1,3 +1,17 @@
+2009-04-22 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #9963]
+ * locales/en_PH: Fix LC_PAPER.
+ * locales/es_CL: Likewise.
+ * locales/es_CO: Likewise.
+ * locales/es_MX: Likewise.
+ * locales/es_US: Likewise.
+ * locales/es_VE: Likewise.
+ * locales/fil_PH: Likewise.
+ * locales/ik_CA: Likewise.
+ * locales/iu_CA: Likewise.
+ * locales/tl_PH: Likewise.
+
2009-04-18 Ulrich Drepper <drepper@xxxxxxxxxx>
* SUPPORTED: Add ks_IN.
Modified: fsf/trunk/libc/localedata/locales/en_PH
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_PH (original)
+++ fsf/trunk/libc/localedata/locales/en_PH Thu Apr 23 00:04:41 2009
@@ -166,11 +166,7 @@
LC_PAPER
-% This is the ISO_IEC TR14652 Locale definition for the LC_PAPER category
-% generated by IBM Basic CountryPack Transformer.
-height 297
-width 210
-
+copy "tl_PH"
END LC_PAPER
Modified: fsf/trunk/libc/localedata/locales/es_CL
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_CL (original)
+++ fsf/trunk/libc/localedata/locales/es_CL Thu Apr 23 00:04:41 2009
@@ -125,10 +125,8 @@
END LC_TIME
LC_PAPER
-% FIXME
-height 297
-% FIXME
-width 210
+height 279
+width 216
END LC_PAPER
LC_TELEPHONE
Modified: fsf/trunk/libc/localedata/locales/es_CO
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_CO (original)
+++ fsf/trunk/libc/localedata/locales/es_CO Thu Apr 23 00:04:41 2009
@@ -125,10 +125,8 @@
END LC_TIME
LC_PAPER
-% FIXME
-height 297
-% FIXME
-width 210
+height 279
+width 216
END LC_PAPER
LC_TELEPHONE
Modified: fsf/trunk/libc/localedata/locales/es_MX
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_MX (original)
+++ fsf/trunk/libc/localedata/locales/es_MX Thu Apr 23 00:04:41 2009
@@ -125,10 +125,8 @@
END LC_TIME
LC_PAPER
-% FIXME
-height 297
-% FIXME
-width 210
+height 279
+width 216
END LC_PAPER
LC_TELEPHONE
Modified: fsf/trunk/libc/localedata/locales/es_US
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_US (original)
+++ fsf/trunk/libc/localedata/locales/es_US Thu Apr 23 00:04:41 2009
@@ -177,8 +177,7 @@
END LC_TIME
LC_PAPER
-height 279
-width 216
+copy "en_US"
END LC_PAPER
LC_TELEPHONE
Modified: fsf/trunk/libc/localedata/locales/es_VE
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_VE (original)
+++ fsf/trunk/libc/localedata/locales/es_VE Thu Apr 23 00:04:41 2009
@@ -126,10 +126,8 @@
END LC_TIME
LC_PAPER
-% FIXME
-height 297
-% FIXME
-width 210
+height 279
+width 216
END LC_PAPER
LC_TELEPHONE
Modified: fsf/trunk/libc/localedata/locales/fil_PH
==============================================================================
--- fsf/trunk/libc/localedata/locales/fil_PH (original)
+++ fsf/trunk/libc/localedata/locales/fil_PH Thu Apr 23 00:04:41 2009
@@ -150,8 +150,7 @@
END LC_MESSAGES
LC_PAPER
-height 297
-width 210
+copy "tl_PH"
END LC_PAPER
LC_MEASUREMENT
Modified: fsf/trunk/libc/localedata/locales/ik_CA
==============================================================================
--- fsf/trunk/libc/localedata/locales/ik_CA (original)
+++ fsf/trunk/libc/localedata/locales/ik_CA Thu Apr 23 00:04:41 2009
@@ -207,10 +207,8 @@
noexpr "<U005B><U006E><U004E><U0071><U0051><U005D><U002E><U002A>"
END LC_MESSAGES
-% Default paper: A4
LC_PAPER
-height 297
-width 210
+copy "en_CA"
END LC_PAPER
% Metric System (ISO 1000)
Modified: fsf/trunk/libc/localedata/locales/iu_CA
==============================================================================
--- fsf/trunk/libc/localedata/locales/iu_CA (original)
+++ fsf/trunk/libc/localedata/locales/iu_CA Thu Apr 23 00:04:41 2009
@@ -119,10 +119,8 @@
noexpr "<U005B><U006E><U004E><U005D><U002E><U002A>"
END LC_MESSAGES
-% Default paper: A4
LC_PAPER
-height 297
-width 210
+copy "en_CA"
END LC_PAPER
% FIXME
Modified: fsf/trunk/libc/localedata/locales/tl_PH
==============================================================================
--- fsf/trunk/libc/localedata/locales/tl_PH (original)
+++ fsf/trunk/libc/localedata/locales/tl_PH Thu Apr 23 00:04:41 2009
@@ -144,8 +144,8 @@
END LC_MESSAGES
LC_PAPER
-height 297
-width 210
+height 279
+width 216
END LC_PAPER
LC_MEASUREMENT
Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Thu Apr 23 00:04:41 2009
@@ -1,3 +1,10 @@
+2009-04-22 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #10090]
+ * pthread_attr_setschedparam.c (__pthread_attr_setschedparam):
+ Check policy and priority for validity.
+ Patch mostly by Zhang Xiliang <zhangxiliang@xxxxxxxxxxxxxx>.
+
2009-03-15 Ulrich Drepper <drepper@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
Modified: fsf/trunk/libc/nptl/pthread_attr_setschedparam.c
==============================================================================
--- fsf/trunk/libc/nptl/pthread_attr_setschedparam.c (original)
+++ fsf/trunk/libc/nptl/pthread_attr_setschedparam.c Thu Apr 23 00:04:41 2009
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2004, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
@@ -31,6 +31,12 @@
assert (sizeof (*attr) >= sizeof (struct pthread_attr));
struct pthread_attr *iattr = (struct pthread_attr *) attr;
+ int min = sched_get_priority_min (iattr->schedpolicy);
+ int max = sched_get_priority_max (iattr->schedpolicy);
+ if (min == -1 || max == -1
+ || param->sched_priority > max || param->sched_priority < min)
+ return EINVAL;
+
/* Copy the new values. */
memcpy (&iattr->schedparam, param, sizeof (struct sched_param));
Modified: fsf/trunk/libc/stdio-common/printf.h
==============================================================================
--- fsf/trunk/libc/stdio-common/printf.h (original)
+++ fsf/trunk/libc/stdio-common/printf.h Thu Apr 23 00:04:41 2009
@@ -113,7 +113,7 @@
it returns a positive value representing the bit set in the USER
field in 'struct printf_info'. */
-extern int register_printf_modifier (wchar_t *__str) __wur __THROW;
+extern int register_printf_modifier (__const wchar_t *__str) __wur __THROW;
/* Register variable argument handler for user type. The return value
Modified: fsf/trunk/libc/stdio-common/reg-modifier.c
==============================================================================
--- fsf/trunk/libc/stdio-common/reg-modifier.c (original)
+++ fsf/trunk/libc/stdio-common/reg-modifier.c Thu Apr 23 00:04:41 2009
@@ -39,7 +39,7 @@
int
-__register_printf_modifier (wchar_t *str)
+__register_printf_modifier (const wchar_t *str)
{
if (str[0] == L'\0')
{
@@ -48,7 +48,7 @@
return -1;
}
- wchar_t *wc = str;
+ const wchar_t *wc = str;
while (*wc != L'\0')
if (*wc < 0 || *wc > (wchar_t) UCHAR_MAX)
goto einval;
Modified: fsf/trunk/libc/sysdeps/sh/sh4/setjmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/sh/sh4/setjmp.S (original)
+++ fsf/trunk/libc/sysdeps/sh/sh4/setjmp.S Thu Apr 23 00:04:41 2009
@@ -22,13 +22,15 @@
ENTRY (__sigsetjmp)
/* Save registers */
+#ifdef __SH_FPU_ANY__
add #JB_SIZE, r4
-#ifdef __SH_FPU_ANY__
fmov.s fr15, @-r4
fmov.s fr14, @-r4
fmov.s fr13, @-r4
fmov.s fr12, @-r4
sts.l fpscr, @-r4
+#else
+ add #(JB_SIZE - 4 * 5), r4
#endif /* __SH_FPU_ANY__ */
stc.l gbr, @-r4
#ifdef PTR_MANGLE