[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r21742 - in /fsf/trunk/libc: ./ elf/ iconv/ libio/ localedata/ localedata/locales/ scripts/ stdio-common/ sysdeps/ieee754/ld...
- To: commits@xxxxxxxxxx
- Subject: [Commits] r21742 - in /fsf/trunk/libc: ./ elf/ iconv/ libio/ localedata/ localedata/locales/ scripts/ stdio-common/ sysdeps/ieee754/ld...
- From: eglibc@xxxxxxxxxx
- Date: Sat, 17 Nov 2012 00:01:50 -0000
Author: eglibc
Date: Sat Nov 17 00:01:49 2012
New Revision: 21742
Log:
Import glibc-mainline for 2012-11-17
Added:
fsf/trunk/libc/localedata/locales/ayc_PE
fsf/trunk/libc/localedata/locales/nhn_MX
fsf/trunk/libc/localedata/locales/szl_PL
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/NEWS
fsf/trunk/libc/elf/tst-array1.c
fsf/trunk/libc/elf/tst-array2dep.c
fsf/trunk/libc/iconv/iconv_prog.c
fsf/trunk/libc/libio/fileops.c
fsf/trunk/libc/libio/iopadn.c
fsf/trunk/libc/libio/iowpadn.c
fsf/trunk/libc/libio/libioP.h
fsf/trunk/libc/localedata/ChangeLog
fsf/trunk/libc/localedata/SUPPORTED
fsf/trunk/libc/scripts/check-local-headers.sh
fsf/trunk/libc/stdio-common/tst-put-error.c
fsf/trunk/libc/stdio-common/vfprintf.c
fsf/trunk/libc/sysdeps/ieee754/ldbl-128/s_log1pl.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Nov 17 00:01:49 2012
@@ -1,3 +1,44 @@
+2012-11-16 Pino Toscano <toscano.pino@xxxxxxxxxx>
+
+ * scripts/check-local-headers.sh: Ignore 'mach' headers.
+
+2012-11-16 Andrej Lajovic <natrij@xxxxxxxxx>
+
+ [BZ #14672]
+ * iconv/iconv_prog.c (main): Fix -c handling of '/'.
+
+2012-11-16 David S. Miller <davem@xxxxxxxxxxxxx>
+
+ * sysdeps/ieee754/ldbl-128/s_log1pl.c (__log1pl): If xm1 is
+ smaller than LDBL_EPSILON/2.0L, just return xm1.
+
+2012-11-16 H.J. Lu <hongjiu.lu@xxxxxxxxx>
+
+ * elf/tst-array1.c (init): Set constructor priority to 1000.
+ (fini): Set destructor priority to 1000.
+ * elf/tst-array2dep.c: Likewise.
+
+2012-11-16 Siddhesh Poyarekar <siddhesh@xxxxxxxxxx>
+
+ [BZ #11741]
+ * libio/fileops.c (_IO_new_file_write): Correctly return error.
+ (_IO_new_file_xsputn): Also return EOF if none of the input
+ data was written when overflow failed.
+ * libio/iopadn.c (_IO_padn): Likewise.
+ * libio/iowpadn.c (_IO_wpadn): Likewise.
+ * stdio-common/tst-put-error.c: Add copyright notice.
+ (do_test): Add case for printing padded string.
+ * stdio-common/vfprintf [!COMPILE_WPRINTF] (PAD): Flag error if
+ _IO_padn returned error.
+ [COMPILE_WPRINTF] (PAD): Flag error if _IO_wpadn returned error.
+ * libio/libioP.h (_IO_xsputn_t): Note in comment that xsputn can
+ return EOF.
+
+2012-11-16 Siddhesh Poyarekar <siddhesh@xxxxxxxxxx>
+
+ * libio/libioP.h: Add comment note that the references to C++
+ bits are now obsolete.
+
2012-11-15 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
* math/libm-test.inc (check_complex): Use asprintf.
Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Sat Nov 17 00:01:49 2012
@@ -10,17 +10,17 @@
* The following bugs are resolved with this release:
1349, 3439, 3479, 3665, 5044, 5246, 5298, 5400, 6530, 6778, 6808, 9685,
- 9914, 10014, 10038, 10631, 10873, 11438, 11607, 11638, 12140, 13412,
- 13542, 13601, 13603, 13604, 13629, 13679, 13696, 13698, 13717, 13741,
- 13939, 13950, 13952, 13966, 14042, 14047, 14090, 14150, 14151, 14152,
- 14154, 14157, 14166, 14173, 14195, 14237, 14251, 14252, 14283, 14298,
- 14303, 14307, 14328, 14331, 14336, 14337, 14347, 14349, 14376, 14417,
- 14459, 14476, 14477, 14505, 14510, 14516, 14518, 14519, 14530, 14532,
- 14538, 14543, 14544, 14545, 14557, 14562, 14568, 14576, 14579, 14583,
- 14587, 14595, 14602, 14610, 14621, 14638, 14645, 14648, 14652, 14660,
- 14661, 14669, 14683, 14694, 14716, 14743, 14767, 14783, 14784, 14785,
- 14793, 14796, 14797, 14801, 14805, 14807, 14809, 14811, 14815, 14821,
- 14824, 14831, 14838.
+ 9914, 10014, 10038, 10631, 10873, 11438, 11607, 11638, 11741, 12140,
+ 13412, 13542, 13601, 13603, 13604, 13629, 13679, 13696, 13698, 13717,
+ 13741, 13939, 13950, 13952, 13966, 14042, 14047, 14090, 14150, 14151,
+ 14152, 14154, 14157, 14166, 14173, 14195, 14237, 14251, 14252, 14283,
+ 14298, 14303, 14307, 14328, 14331, 14336, 14337, 14347, 14349, 14368,
+ 14376, 14417, 14459, 14476, 14477, 14501, 14505, 14510, 14516, 14518,
+ 14519, 14530, 14532, 14538, 14543, 14544, 14545, 14557, 14562, 14568,
+ 14576, 14579, 14583, 14587, 14595, 14602, 14610, 14621, 14638, 14645,
+ 14648, 14652, 14660, 14661, 14669, 14672, 14683, 14694, 14716, 14743,
+ 14767, 14783, 14784, 14785, 14793, 14796, 14797, 14801, 14805, 14807,
+ 14809, 14811, 14815, 14821, 14824, 14828, 14831, 14838.
* Port to ARM AArch64 contributed by Linaro.
Modified: fsf/trunk/libc/elf/tst-array1.c
==============================================================================
--- fsf/trunk/libc/elf/tst-array1.c (original)
+++ fsf/trunk/libc/elf/tst-array1.c Sat Nov 17 00:01:49 2012
@@ -1,6 +1,7 @@
#include <unistd.h>
-static void init (void) __attribute__ ((constructor));
+/* Give init non-default priority so that it runs before init_array. */
+static void init (void) __attribute__ ((constructor (1000)));
static void
init (void)
@@ -8,7 +9,8 @@
write (STDOUT_FILENO, "init\n", 5);
}
-static void fini (void) __attribute__ ((destructor));
+/* Give fini the same priority as init. */
+static void fini (void) __attribute__ ((destructor (1000)));
static void
fini (void)
Modified: fsf/trunk/libc/elf/tst-array2dep.c
==============================================================================
--- fsf/trunk/libc/elf/tst-array2dep.c (original)
+++ fsf/trunk/libc/elf/tst-array2dep.c Sat Nov 17 00:01:49 2012
@@ -1,6 +1,7 @@
#include <unistd.h>
-static void init (void) __attribute__ ((constructor));
+/* Give init non-default priority so that it runs before init_array. */
+static void init (void) __attribute__ ((constructor (1000)));
static void
init (void)
@@ -8,7 +9,8 @@
write (STDOUT_FILENO, "DSO init\n", 9);
}
-static void fini (void) __attribute__ ((destructor));
+/* Give fini the same priority as init. */
+static void fini (void) __attribute__ ((destructor (1000)));
static void
fini (void)
Modified: fsf/trunk/libc/iconv/iconv_prog.c
==============================================================================
--- fsf/trunk/libc/iconv/iconv_prog.c (original)
+++ fsf/trunk/libc/iconv/iconv_prog.c Sat Nov 17 00:01:49 2012
@@ -1,5 +1,5 @@
/* Convert text in given files from the specified from-set to the to-set.
- Copyright (C) 1998-2011, 2012 Free Software Foundation, Inc.
+ Copyright (C) 1998-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
@@ -155,7 +155,7 @@
if (*errhand == '/')
{
--nslash;
- errhand = strchrnul (errhand, '/');
+ errhand = strchrnul (errhand + 1, '/');
if (*errhand == '/')
{
Modified: fsf/trunk/libc/libio/fileops.c
==============================================================================
--- fsf/trunk/libc/libio/fileops.c (original)
+++ fsf/trunk/libc/libio/fileops.c Sat Nov 17 00:01:49 2012
@@ -1253,12 +1253,13 @@
_IO_ssize_t n;
{
_IO_ssize_t to_do = n;
+ _IO_ssize_t count = 0;
while (to_do > 0)
{
- _IO_ssize_t count = (__builtin_expect (f->_flags2
- & _IO_FLAGS2_NOTCANCEL, 0)
- ? write_not_cancel (f->_fileno, data, to_do)
- : write (f->_fileno, data, to_do));
+ count = (__builtin_expect (f->_flags2
+ & _IO_FLAGS2_NOTCANCEL, 0)
+ ? write_not_cancel (f->_fileno, data, to_do)
+ : write (f->_fileno, data, to_do));
if (count < 0)
{
f->_flags |= _IO_ERR_SEEN;
@@ -1270,7 +1271,7 @@
n -= to_do;
if (f->_offset >= 0)
f->_offset += n;
- return n;
+ return count < 0 ? count : n;
}
_IO_size_t
@@ -1330,9 +1331,10 @@
_IO_size_t block_size, do_write;
/* Next flush the (full) buffer. */
if (_IO_OVERFLOW (f, EOF) == EOF)
- /* If nothing else has to be written we must not signal the
- caller that everything has been written. */
- return to_do == 0 ? EOF : n - to_do;
+ /* If nothing else has to be written or nothing has been written, we
+ must not signal the caller that the call was even partially
+ successful. */
+ return (to_do == 0 || to_do == n) ? EOF : n - to_do;
/* Try to maintain alignment: write a whole number of blocks.
dont_write is what gets left over. */
Modified: fsf/trunk/libc/libio/iopadn.c
==============================================================================
--- fsf/trunk/libc/libio/iopadn.c (original)
+++ fsf/trunk/libc/libio/iopadn.c Sat Nov 17 00:01:49 2012
@@ -59,7 +59,7 @@
w = _IO_sputn (fp, padptr, PADSIZE);
written += w;
if (w != PADSIZE)
- return written;
+ return w == EOF ? w : written;
}
if (i > 0)
Modified: fsf/trunk/libc/libio/iowpadn.c
==============================================================================
--- fsf/trunk/libc/libio/iowpadn.c (original)
+++ fsf/trunk/libc/libio/iowpadn.c Sat Nov 17 00:01:49 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -65,7 +65,7 @@
w = _IO_sputn (fp, (char *) padptr, PADSIZE);
written += w;
if (w != PADSIZE)
- return written;
+ return w == EOF ? w : written;
}
if (i > 0)
Modified: fsf/trunk/libc/libio/libioP.h
==============================================================================
--- fsf/trunk/libc/libio/libioP.h (original)
+++ fsf/trunk/libc/libio/libioP.h Sat Nov 17 00:01:49 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1997-2003,2004,2005,2006,2007,2012
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -24,6 +23,14 @@
might be covered by the GNU Lesser General Public License.
This exception applies to code released by its copyright holders
in files containing the exception. */
+
+/* NOTE: libio is now exclusively used only by glibc since libstdc++ has its
+ own implementation. As a result, functions that were implemented for C++
+ (like *sputn) may no longer have C++ semantics. This is of course only
+ relevant for internal callers of these functions since these functions are
+ not intended for external use otherwise.
+
+ FIXME: All of the C++ cruft eventually needs to go away. */
#include <errno.h>
#ifndef __set_errno
@@ -159,7 +166,7 @@
#define _IO_WPBACKFAIL(FP, CH) WJUMP1 (__pbackfail, FP, CH)
/* The 'xsputn' hook writes upto N characters from buffer DATA.
- Returns the number of character actually written.
+ Returns EOF or the number of character actually written.
It matches the streambuf::xsputn virtual function. */
typedef _IO_size_t (*_IO_xsputn_t) (_IO_FILE *FP, const void *DATA,
_IO_size_t N);
Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Sat Nov 17 00:01:49 2012
@@ -1,3 +1,21 @@
+2012-11-16 Andreas Jaeger <aj@xxxxxxx>
+
+ [BZ #14368]
+ * locales/szl_PL: New Silesian Language Locale for Poland.
+ Contributed by Przemyslaw Buczkowski <przemub@xxxxxxxx>.
+ * localedata/SUPPORTED (SUPPORTED-LOCALES): Add szl_PL.
+
+ [BZ # 14828]
+ * locales/ayc_PE: Add Aymara locale for Peru
+ contributed by Chris Leonard <cjl@xxxxxxxxxxxxx> and
+ Amos Batto <amosbatto@xxxxxxxxx>.
+ * SUPPORTED (SUPPORTED-LOCALES): Add ayc_PE.
+
+ [BZ # 14501]
+ * locales/nhn_MX: Add Central Nahuatl locale for Mexico,
+ contributed by Jorge Becerril <jrbecster@xxxxxxxxx>.
+ * SUPPORTED (SUPPORTED-LOCALES): Add nhn_MX.
+
2012-11-15 Chris Leonard <cjlhomeaddress@xxxxxxxxx>
[BZ #13952]
Modified: fsf/trunk/libc/localedata/SUPPORTED
==============================================================================
--- fsf/trunk/libc/localedata/SUPPORTED (original)
+++ fsf/trunk/libc/localedata/SUPPORTED Sat Nov 17 00:01:49 2012
@@ -46,6 +46,7 @@
ar_TN/ISO-8859-6 \
ar_YE.UTF-8/UTF-8 \
ar_YE/ISO-8859-6 \
+ayc_PE/UFT-8 \
az_AZ/UTF-8 \
as_IN/UTF-8 \
ast_ES.UTF-8/UTF-8 \
@@ -310,6 +311,7 @@
nds_DE/UTF-8 \
nds_NL/UTF-8 \
ne_NP/UTF-8 \
+nhn_MX/UTF-8 \
nl_AW/UTF-8 \
nl_BE.UTF-8/UTF-8 \
nl_BE/ISO-8859-1 \
@@ -383,6 +385,7 @@
sv_SE/ISO-8859-1 \
sw_KE/UTF-8 \
sw_TZ/UTF-8 \
+szl_PL/UTF-8 \
ta_IN/UTF-8 \
ta_LK/UTF-8 \
te_IN/UTF-8 \
Added: fsf/trunk/libc/localedata/locales/ayc_PE
==============================================================================
--- fsf/trunk/libc/localedata/locales/ayc_PE (added)
+++ fsf/trunk/libc/localedata/locales/ayc_PE Sat Nov 17 00:01:49 2012
@@ -1,0 +1,194 @@
+comment_char %
+escape_char /
+% Charset: UTF-8
+% WARNING: This file has been autogenerated by the Locale Helper application
+% Check it carefully before using it in production.
+LC_IDENTIFICATION
+title "Aymara (ayc) locale for Peru"
+source "runasimipi.org"
+address ""
+contact ""
+email "libc-alpha@xxxxxxxxxxxxxx"
+tel ""
+fax ""
+language "Aymara"
+territory "Peru"
+revision "1.0"
+date "2011-11-13"
+%
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Aymara, Southern (ayc) language locale for Peru
+%
+% Charset: ISO-8859-1
+%
+% Aymara terms provided by Edgar Quispe Chambi <equispe7@xxxxxxxxx> and
+% Amos Batto <amosbatto@xxxxxxxxx>
+%
+% Prepared and contributed to glibc by Chris Leonard <cjl@xxxxxxxxxxxxx> and
+% Amos Batto <amosbatto@xxxxxxxxx>
+%
+% This locale data has been developed in collaboration between:
+% Sugar Labs, http://www.sugarlabs.org/
+% One Laptop Per Child, http://one.laptop.org/
+% Runasimipi Quespiqa Software, http://runasimipi.org/
+% Somos AzÃÂcar. http://somosazucar.org/
+%
+% Los autores desean agradecer a los desafÃÂos de la clasificaciÃÂn de las lenguas andinas
+% con los cÃÂdigos ISO-639 disponibles en la actualidad y su disposiciÃÂn a trabajar con
+% todos los interesados ÃÂÂÃÂÂen mejorar la representaciÃÂn de todas las lenguas andinas.
+%
+%
+% build with: localedef -f ISO-8859-1 -i ayc_PE ayc_PE
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
+category "ayc_PE:2011";LC_IDENTIFICATION
+category "ayc_PE:2011";LC_CTYPE
+category "ayc_PE:2011";LC_COLLATE
+category "ayc_PE:2011";LC_TIME
+category "ayc_PE:2011";LC_NUMERIC
+category "ayc_PE:2011";LC_MONETARY
+category "ayc_PE:2011";LC_PAPER
+category "ayc_PE:2011";LC_MEASUREMENT
+category "ayc_PE:2011";LC_MESSAGES
+category "ayc_PE:2011";LC_NAME
+category "ayc_PE:2011";LC_ADDRESS
+category "ayc_PE:2011";LC_TELEPHONE
+END LC_IDENTIFICATION
+
+LC_CTYPE
+copy "es_ES"
+END LC_CTYPE
+
+LC_COLLATE
+copy "iso14651_t1"
+END LC_COLLATE
+
+% LC_TIME: Use Aymara transliteration of Spanish day and month names
+
+LC_TIME
+% inÃÂru, phiwriru, marsu, awrila, mayu, junyu, julyu, awustu, sitimri, uktuwri, nuwimri, risimri
+mon "<U0069><U006E><U00EF><U0072><U0075>";/
+ "<U0070><U0068><U0069><U0077><U0072><U0069><U0072><U0075>";/
+ "<U006D><U0061><U0072><U0073><U0075>";/
+ "<U0061><U0077><U0072><U0069><U006C><U0061>";/
+ "<U006D><U0061><U0079><U0075>";/
+ "<U006A><U0075><U006E><U0079><U0075>";/
+ "<U006A><U0075><U006C><U0079><U0075>";/
+ "<U0061><U0077><U0075><U0073><U0074><U0075>";/
+ "<U0073><U0069><U0074><U0069><U006D><U0072><U0069>";/
+ "<U0075><U006B><U0074><U0075><U0077><U0072><U0069>";/
+ "<U006E><U0075><U0077><U0069><U006D><U0072><U0069>";/
+ "<U0072><U0069><U0073><U0069><U006D><U0072><U0069>"
+% ini, phi, mar, awr ,may, jun, jul, awu, sit, ukt, nuw, ris
+abmon "<U0069><U006E><U0069>";/
+ "<U0070><U0068><U0069>";/
+ "<U006D><U0061><U0072>";/
+ "<U0061><U0077><U0072>";/
+ "<U006D><U0061><U0079>";/
+ "<U006A><U0075><U006E>";/
+ "<U006A><U0075><U006C>";/
+ "<U0061><U0077><U0075>";/
+ "<U0073><U0069><U0074>";/
+ "<U0075><U006B><U0074>";/
+ "<U006E><U0075><U0077>";/
+ "<U0072><U0069><U0073>"
+% tuminku, lunisa, martisa, mirkulisa, juywisa, wirnisa, sawÃÂru
+day "<U0074><U0075><U006D><U0069><U006E><U006B><U0075>";/
+ "<U006C><U0075><U006E><U0069><U0073><U0061>";/
+ "<U006D><U0061><U0072><U0074><U0069><U0073><U0061>";/
+ "<U006D><U0069><U0072><U006B><U0075><U006C><U0069><U0073><U0061>";/
+ "<U006A><U0075><U0079><U0077><U0069><U0073><U0061>";/
+ "<U0077><U0069><U0072><U006E><U0069><U0073><U0061>";/
+ "<U0073><U0061><U0077><U00E4><U0072><U0075>"
+% tum, lun, mar, mir, juy, wir, saw
+abday "<U0074><U0075><U006D>";/
+ "<U006C><U0075><U006E>";/
+ "<U006D><U0061><U0072>";/
+ "<U006D><U0069><U0072>";/
+ "<U006A><U0075><U0079>";/
+ "<U0077><U0069><U0072>";/
+ "<U0073><U0061><U0077>"
+% Abbreviated date and time representation to be referenced by the "%c" field descriptor -
+%
+% "%a" (short weekday name),
+% "%d" (day of month as a decimal number),
+% "%b" (short month name),
+% "%Y" (year with century as a decimal number),
+% "%T" (24-hour clock time in format HH:MM:SS),
+% "%Z" (Time zone name)
+% %a %d %b %Y %T %Z
+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+
+% Date representation to be referenced by the "%x" field descriptor -
+% "%d/%m/%Y", day/month/year as decimal numbers (01/01/2000).
+d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
+
+% Time representation to be referenced by the "%X" field descriptor -
+% "%T" (24-hour clock time in format HH:MM:SS)
+t_fmt "<U0025><U0054>"
+
+% Define representation of ante meridian and post maritime strings -
+% The "" mean 'default to "AM" and "PM".
+am_pm "<U0056><U004D>";"<U004E><U004D>"
+
+% %I:%M:%S %p
+t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070>"
+
+% Date representation not described in ISO/IEC 14652. Comes out as -
+% "%a %b %e %H:%M:%S %Z %Y" which is default "date" command output
+%
+% %a - abbreviated weekday name,
+% %b - abbreviated month name,
+% %e - day of month as a decimal number with leading space (1 to 31),
+% %H - hour (24-hour clock) as a decimal number (00 to 23),
+% %M - minute as a decimal number (00 to 59),
+% %S - seconds as a decimal number (00 to 59),
+% %Z - time-zone name,
+% %Y - year with century as a decimal number,e.g. 2001.
+date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0025><U005A><U0020><U0025><U0059>"
+END LC_TIME
+
+LC_NUMERIC
+copy "es_PE"
+END LC_NUMERIC
+
+LC_MONETARY
+copy "es_PE"
+END LC_MONETARY
+
+LC_PAPER
+copy "es_PE"
+END LC_PAPER
+
+LC_MEASUREMENT
+measurement 1
+END LC_MEASUREMENT
+
+LC_MESSAGES
+% ^[uUsSyY].*
+yesexpr "<U005E><U005B><U0075><U0055><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
+% ^[jJnN].*
+noexpr "<U005E><U005B><U006A><U004A><U006E><U004E><U005D><U002E><U002A>"
+% Ukhamawa
+yesstr "<U0055><U006B><U0068><U0061><U006D><U0061><U0077><U0061>"
+% Janiwa
+nostr "<U004A><U0061><U006E><U0069><U0077><U0061>"
+END LC_MESSAGES
+
+LC_NAME
+copy "es_PE"
+END LC_NAME
+
+LC_ADDRESS
+copy "es_PE"
+END LC_ADDRESS
+
+LC_TELEPHONE
+copy "es_PE"
+END LC_TELEPHONE
Added: fsf/trunk/libc/localedata/locales/nhn_MX
==============================================================================
--- fsf/trunk/libc/localedata/locales/nhn_MX (added)
+++ fsf/trunk/libc/localedata/locales/nhn_MX Sat Nov 17 00:01:49 2012
@@ -1,0 +1,144 @@
+comment_char %
+escape_char /
+%
+% Central Nahuatl locale for Mexico
+% Source: RAP
+% Address: Texcoco/Estado de Mexico, Mexico
+% Contact: Jorge Becerril
+% Email: jrbecster@xxxxxxxxx
+% Tel:
+% Language: nhn
+% Territory: MX
+% Revision: 1.0
+% Date: 2012-08-19
+% Application: general
+% Users: general
+% Reportoiremap: mnemonics.ds
+% Charset: UTF-8
+% This file is distributed under the same license as the glibc package.
+
+LC_IDENTIFICATION
+title "Central Nahuatl for Mexico"
+source "RAP"
+address ""
+contact ""
+email "libc-alpha@xxxxxxxxxxxxxx"
+tel ""
+fax ""
+language "Central Nahuatl"
+territory "Mexico"
+revision "1.0"
+date "2012-08-19"
+%
+category "nhn_MX:2012";LC_IDENTIFICATION
+category "nhn_MX:2012";LC_CTYPE
+category "nhn_MX:2012";LC_COLLATE
+category "nhn_MX:2012";LC_TIME
+category "nhn_MX:2012";LC_NUMERIC
+category "nhn_MX:2012";LC_MONETARY
+category "nhn_MX:2012";LC_MEASUREMENT
+category "nhn_MX:2012";LC_MESSAGES
+category "nhn_MX:2012";LC_PAPER
+category "nhn_MX:2012";LC_NAME
+category "nhn_MX:2012";LC_ADDRESS
+category "nhn_MX:2012";LC_TELEPHONE
+
+END LC_IDENTIFICATION
+
+LC_COLLATE
+% Copy the template from ISO/IEC 14651
+copy "iso14651_t1"
+END LC_COLLATE
+
+LC_CTYPE
+copy "i18n"
+
+translit_start
+include "translit_combining";""
+translit_end
+END LC_CTYPE
+
+LC_MESSAGES
+% ^[sSqQyY].*
+yesexpr "<U005E><U005B><U0073><U0053><U0071><U0051><U0079><U0059><U005D><U002E><U002A>"
+% ^[nNaA].*
+noexpr "<U005E><U005B><U006E><U004E><U0061><U0041><U005D><U002E><U002A>"
+
+% quema
+yesstr "<U0071><U0075><U0065><U006D><U0061>"
+% ahmo
+nostr "<U0061><U0068><U006D><U006F>"
+END LC_MESSAGES
+
+LC_MONETARY
+copy "es_MX"
+END LC_MONETARY
+
+LC_NUMERIC
+copy "es_MX"
+END LC_NUMERIC
+
+LC_TIME
+% teo; cei; ome; yei; nau; mac; chi
+abday "<U0074><U0065><U006F>";"<U0063><U0065><U0069>";/
+ "<U006F><U006D><U0065>";"<U0079><U0065><U0069>";/
+ "<U006E><U0061><U0075>";"<U006D><U0061><U0063>";/
+ "<U0063><U0068><U0069>"
+% teoilhuitl; ceilhuitl; omeilhuitl; yeilhuitl; nahuilhuitl; macuililhuitl; chicuaceilhuitl
+day "<U0074><U0065><U006F><U0069><U006C><U0068><U0075><U0069><U0074><U006C>";/
+ "<U0063><U0065><U0069><U006C><U0068><U0075><U0069><U0074><U006C>";/
+ "<U006F><U006D><U0065><U0069><U006C><U0068><U0075><U0069><U0074><U006C>";/
+ "<U0079><U0065><U0069><U006C><U0068><U0075><U0069><U0074><U006C>";/
+ "<U006E><U0061><U0068><U0075><U0069><U006C><U0068><U0075><U0069><U0074><U006C>";/
+ "<U006D><U0061><U0063><U0075><U0069><U006C><U0069><U006C><U0068><U0075><U0069><U0074><U006C>";/
+ "<U0063><U0068><U0069><U0063><U0075><U0061><U0063><U0065><U0069><U006C><U0068><U0075><U0069><U0074><U006C>"
+% ene; feb; mar; abr; may; jun; jul; ago; sep; oct; nov; dic
+abmon "<U0065><U006E><U0065>";"<U0066><U0065><U0062>";/
+ "<U006D><U0061><U0072>";"<U0061><U0062><U0072>";/
+ "<U006D><U0061><U0079>";"<U006A><U0075><U006E>";/
+ "<U006A><U0075><U006C>";"<U0061><U0067><U006F>";/
+ "<U0073><U0065><U0070>";"<U006F><U0063><U0074>";/
+ "<U006E><U006F><U0076>";"<U0064><U0069><U0063>"
+% enero; febrero; marzo; abril; mayo; junio; julio; agosto; septiembre; octubre; noviembre; diciembre
+mon "<U0065><U006E><U0065><U0072><U006F>";/
+ "<U0066><U0065><U0062><U0072><U0065><U0072><U006F>";/
+ "<U006D><U0061><U0072><U007A><U006F>";/
+ "<U0061><U0062><U0072><U0069><U006C>";/
+ "<U006D><U0061><U0079><U006F>";/
+ "<U006A><U0075><U006E><U0069><U006F>";/
+ "<U006A><U0075><U006C><U0069><U006F>";/
+ "<U0061><U0067><U006F><U0073><U0074><U006F>";/
+ "<U0073><U0065><U0070><U0074><U0069><U0065><U006D><U0062><U0072><U0065>";/
+ "<U006F><U0063><U0074><U0075><U0062><U0072><U0065>";/
+ "<U006E><U006F><U0076><U0069><U0065><U006D><U0062><U0072><U0065>";/
+ "<U0064><U0069><U0063><U0069><U0065><U006D><U0062><U0072><U0065>"
+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
+t_fmt "<U0025><U0054>"
+am_pm "";""
+t_fmt_ampm ""
+date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0025><U005A><U0020><U0025><U0059>"
+END LC_TIME
+
+LC_PAPER
+height 279
+width 216
+END LC_PAPER
+
+LC_TELEPHONE
+copy "es_MX"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+measurement 1
+END LC_MEASUREMENT
+
+LC_NAME
+copy "es_MX"
+END LC_NAME
+
+LC_ADDRESS
+copy "es_MX"
+END LC_ADDRESS
Added: fsf/trunk/libc/localedata/locales/szl_PL
==============================================================================
--- fsf/trunk/libc/localedata/locales/szl_PL (added)
+++ fsf/trunk/libc/localedata/locales/szl_PL Sat Nov 17 00:01:49 2012
@@ -1,0 +1,211 @@
+comment_char %
+escape_char /
+%
+% Silesian Language Locale for Poland
+% Source: szl_PL locale
+% Contact: Przemyslaw Buczkowski
+% Email: przemub@xxxxxxxx
+% Tel: +48669757937
+% Fax: none
+% Language: szl
+% Territory: PL
+% Revision: 1.0
+% Date: 2012-07-22
+% Application: general
+% Users: general
+% Charset: UTF-8
+% Distribution and use is free, also
+% for commercial purposes.
+
+LC_IDENTIFICATION
+title "Silesian locale for Poland"
+source "szl_PL locale"
+address ""
+contact "Przemyslaw Buczkowski"
+email "libc-alpha@xxxxxxxxxxxxxx"
+tel ""
+fax ""
+language "Silesian"
+territory "Poland"
+revision "1.0"
+date "2012-07-17"
+audience "general"
+application "GNU locale"
+abbreviation ""
+%
+category "szl_PL:2000";LC_IDENTIFICATION
+category "szl_PL:2000";LC_CTYPE
+category "szl_PL:2000";LC_COLLATE
+category "szl_PL:2000";LC_TIME
+category "szl_PL:2000";LC_NUMERIC
+category "szl_PL:2000";LC_MONETARY
+category "szl_PL:2000";LC_MEASUREMENT
+category "szl_PL:2000";LC_MESSAGES
+category "szl_PL:2000";LC_PAPER
+category "szl_PL:2000";LC_NAME
+category "szl_PL:2000";LC_ADDRESS
+category "szl_PL:2000";LC_TELEPHONE
+
+END LC_IDENTIFICATION
+
+LC_CTYPE
+copy "pl_PL"
+END LC_CTYPE
+
+LC_COLLATE
+copy "iso14651_t1"
+
+collating-symbol <atilde>
+collating-symbol <cacute>
+collating-symbol <lstroke>
+collating-symbol <nacute>
+collating-symbol <otilde>
+collating-symbol <omacron>
+collating-symbol <ocircumflex>
+collating-symbol <U014F>
+collating-symbol <zacute>
+collating-symbol <zdot>
+
+reorder-after <a>
+<atilde>
+
+reorder-after <c>
+<cacute>
+
+reorder-after <l>
+<lstroke>
+
+reorder-after <n>
+<nacute>
+
+reorder-after <o>
+<otilde>
+<omacron>
+<ocircumflex>
+<U014F>
+
+reorder-after <s>
+<sacute>
+
+reorder-after <z>
+<zacute>
+<zdot>
+
+reorder-after <U0061>
+<U00E3> <atilde>;<BAS>;<MIN>;IGNORE
+<U00C3> <atilde>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U0063>
+<U0107> <cacute>;<BAS>;<MIN>;IGNORE
+<U0106> <cacute>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U006C>
+<U0142> <lstroke>;<BAS>;<MIN>;IGNORE
+<U0141> <lstroke>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U006E>
+<U0144> <nacute>;<BAS>;<MIN>;IGNORE
+<U0143> <nacute>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U006F>
+<U00F5> <otilde>;<BAS>;<MIN>;IGNORE
+<U00D5> <otilde>;<BAS>;<CAP>;IGNORE
+<U014D> <omacron>;<BAS>;<MIN>;IGNORE
+<U013D> <omacron>;<BAS>;<CAP>;IGNORE
+<U00F4> <ocircumflex>;<BAS>;<MIN>;IGNORE
+<U00D4> <ocircumflex>;<BAS>;<CAP>;IGNORE
+<U014F> <U014F>;<BAS>;<MIN>;IGNORE
+<U014F> <U014F>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U0073>
+<U015B> <sacute>;<BAS>;<MIN>;IGNORE
+<U015A> <sacute>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U007A>
+<U017A> <zacute>;<BAS>;<MIN>;IGNORE
+<U0179> <zacute>;<BAS>;<CAP>;IGNORE
+<U017C> <zdot>;<BAS>;<MIN>;IGNORE
+<U017B> <zdot>;<BAS>;<CAP>;IGNORE
+
+reorder-end
+
+END LC_COLLATE
+
+LC_MESSAGES
+yesexpr "<U005E><U005B><U004A><U006A><U0054><U0074><U0059><U0079><U005D><U002E><U002A>"
+noexpr "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
+
+END LC_MESSAGES
+
+LC_MONETARY
+copy "pl_PL"
+END LC_MONETARY
+
+LC_NUMERIC
+copy "pl_PL"
+END LC_NUMERIC
+
+LC_TIME
+abday "<U006E><U0069><U0079>";"<U0070><U0079><U0144>";/
+ "<U0077><U0074><U014F>";"<U0073><U0074><U0072>";/
+ "<U0073><U007A><U0074>";"<U0070><U006A><U014D>";/
+ "<U0073><U006F><U0062>"
+day "<U006E><U0069><U0079><U0064><U007A><U0069><U0065><U006C><U0061>";/
+ "<U0070><U0079><U0144><U0064><U007A><U0069><U014F><U0065><U006B>";/
+ "<U0077><U0074><U014F><U0072><U0065><U006B>";/
+ "<U0073><U0074><U0072><U007A><U014F><U0064><U0061>";/
+ "<U0073><U007A><U0074><U0077><U006F><U0072><U0074><U0065><U006B>";/
+ "<U0070><U006A><U014D><U006E><U0074><U0065><U006B>";/
+ "<U0073><U006F><U0062><U014F><U0074><U0061>"
+abmon "<U0073><U0074><U0079>";"<U006C><U0075><U0074>";/
+ "<U006D><U0065><U0072>";"<U006B><U0077><U006A>";/
+ "<U006D><U006F><U006A>";"<U0063><U007A><U0079>";/
+ "<U006C><U0069><U0070>";"<U0073><U0069><U0079>";/
+ "<U0077><U0072><U007A>";"<U0070><U0061><U017A>";/
+ "<U006C><U0069><U0073>";"<U0067><U0072><U0075>"
+mon "<U0073><U0074><U0079><U0063><U007A><U0079><U0144>";/
+ "<U006C><U0075><U0074><U0079>";/
+ "<U006D><U0065><U0072><U0063>";/
+ "<U006B><U0077><U006A><U0065><U0063><U0069><U0079><U0144>";/
+ "<U006D><U006F><U006A>";/
+ "<U0063><U007A><U0079><U0072><U0077><U006A><U0079><U0144>";/
+ "<U006C><U0069><U0070><U006A><U0079><U0144>";/
+ "<U0073><U0069><U0079><U0072><U0070><U006A><U0079><U0144>";/
+ "<U0077><U0072><U007A><U0065><U0073><U0069><U0079><U0144>";/
+ "<U0070><U0061><U017A><U0064><U007A><U0069><U0065><U0072><U006E><U0069><U006B>";/
+ "<U006C><U0069><U0073><U0074><U006F><U0070><U0061><U0064>";/
+ "<U0067><U0072><U0075><U0064><U007A><U0069><U0079><U0144>"
+d_t_fmt "<U0025><U0061><U002C><U0020>/
+<U0025><U002D><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U002C><U0020>/
+<U0025><U0054>"
+d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059>"
+t_fmt "<U0025><U0054>"
+am_pm "";""
+t_fmt_ampm ""
+date_fmt "<U0025><U0061><U002C><U0020>/
+<U0025><U002D><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U002C><U0020>/
+<U0025><U0054><U0020><U0025><U005A>"
+week 7;19971130;4
+first_weekday 2
+first_workday 2
+END LC_TIME
+
+LC_PAPER
+copy "pl_PL"
+END LC_PAPER
+
+LC_TELEPHONE
+copy "pl_PL"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+copy "pl_PL"
+END LC_MEASUREMENT
+
+LC_NAME
+copy "pl_PL"
+END LC_NAME
+
+LC_ADDRESS
+copy "pl_PL"
+END LC_ADDRESS
Modified: fsf/trunk/libc/scripts/check-local-headers.sh
==============================================================================
--- fsf/trunk/libc/scripts/check-local-headers.sh (original)
+++ fsf/trunk/libc/scripts/check-local-headers.sh Sat Nov 17 00:01:49 2012
@@ -27,12 +27,13 @@
# Search all dependency files for file names in the include directory.
# There are a few system headers we are known to use.
-# These include Linux kernel headers (asm*, arch, and linux).
+# These include Linux kernel headers (asm*, arch, and linux),
+# and Mach kernel headers (mach).
exec ${AWK} -v includedir="$includedir" '
BEGIN {
status = 0
exclude = "^" includedir \
- "/(.*-.*-.*/|)(asm[-/]|arch|linux/|selinux/|gd|nss3/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h)"
+ "/(.*-.*-.*/|)(asm[-/]|arch|linux/|selinux/|mach/|gd|nss3/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h)"
}
/^[^ ]/ && $1 ~ /.*:/ { obj = $1 }
{
Modified: fsf/trunk/libc/stdio-common/tst-put-error.c
==============================================================================
--- fsf/trunk/libc/stdio-common/tst-put-error.c (original)
+++ fsf/trunk/libc/stdio-common/tst-put-error.c Sat Nov 17 00:01:49 2012
@@ -1,3 +1,22 @@
+/* Verify that print functions return error when there is an I/O error.
+
+ Copyright (C) 2005-2012 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
#include <errno.h>
#include <error.h>
#include <stdio.h>
@@ -26,6 +45,13 @@
printf ("fprintf = %d\n", n);
if (n >= 0)
error (EXIT_FAILURE, 0, "second fprintf succeeded");
+
+ /* Padded printing takes a different code path. */
+ n = fprintf (fp, "%10000s", "foo");
+ printf ("fprintf = %d\n", n);
+ if (n >= 0)
+ error (EXIT_FAILURE, 0, "padded fprintf succeeded");
+
return 0;
}
Modified: fsf/trunk/libc/stdio-common/vfprintf.c
==============================================================================
--- fsf/trunk/libc/stdio-common/vfprintf.c (original)
+++ fsf/trunk/libc/stdio-common/vfprintf.c Sat Nov 17 00:01:49 2012
@@ -87,8 +87,18 @@
# define PUT(F, S, N) _IO_sputn ((F), (S), (N))
# define PAD(Padchar) \
- if (width > 0) \
- done_add (_IO_padn (s, (Padchar), width))
+ do { \
+ if (width > 0) \
+ { \
+ unsigned int d = _IO_padn (s, (Padchar), width); \
+ if (__builtin_expect (d == EOF, 0)) \
+ { \
+ done = -1; \
+ goto all_done; \
+ } \
+ done_add (d); \
+ } \
+ } while (0)
# define PUTC(C, F) _IO_putc_unlocked (C, F)
# define ORIENT if (_IO_vtable_offset (s) == 0 && _IO_fwide (s, -1) != -1)\
return -1
@@ -106,8 +116,18 @@
# define PUT(F, S, N) _IO_sputn ((F), (S), (N))
# define PAD(Padchar) \
- if (width > 0) \
- done_add (_IO_wpadn (s, (Padchar), width))
+ do { \
+ if (width > 0) \
+ { \
+ unsigned int d = _IO_wpadn (s, (Padchar), width); \
+ if (__builtin_expect (d == EOF, 0)) \
+ { \
+ done = -1; \
+ goto all_done; \
+ } \
+ done_add (d); \
+ } \
+ } while (0)
# define PUTC(C, F) _IO_putwc_unlocked (C, F)
# define ORIENT if (_IO_fwide (s, 1) != 1) return -1
Modified: fsf/trunk/libc/sysdeps/ieee754/ldbl-128/s_log1pl.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/ldbl-128/s_log1pl.c (original)
+++ fsf/trunk/libc/sysdeps/ieee754/ldbl-128/s_log1pl.c Sat Nov 17 00:01:49 2012
@@ -137,6 +137,12 @@
if (((hx & 0x7fffffff) == 0)
&& (u.parts32.w1 | u.parts32.w2 | u.parts32.w3) == 0)
return xm1;
+
+ if ((hx & 0x7fffffff) < 0x3f8e0000)
+ {
+ if ((int) xm1 == 0)
+ return xm1;
+ }
x = xm1 + 1.0L;
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits