[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commits] r16321 - in /fsf/trunk/libc: ./ locale/ localedata/ localedata/locales/ malloc/ math/ nptl/ nptl/sysdeps/unix/sysv/linux/ sy...



Author: eglibc
Date: Thu Dec 22 19:03:04 2011
New Revision: 16321

Log:
Import glibc-mainline for 2011-12-22

Added:
    fsf/trunk/libc/localedata/locales/bho_IN
    fsf/trunk/libc/localedata/locales/brx_IN
    fsf/trunk/libc/localedata/locales/es_CU
    fsf/trunk/libc/localedata/locales/unm_US
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/locale/iso-639.def
    fsf/trunk/libc/localedata/ChangeLog
    fsf/trunk/libc/localedata/SUPPORTED
    fsf/trunk/libc/localedata/locales/nl_BE
    fsf/trunk/libc/malloc/mtrace.c
    fsf/trunk/libc/math/s_cacosh.c
    fsf/trunk/libc/math/s_cacoshf.c
    fsf/trunk/libc/math/s_cacoshl.c
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_getname.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/Makefile
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/Makefile
    fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/Makefile
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/Makefile
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sys/epoll.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/epoll.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/Makefile
    fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h
    fsf/trunk/libc/sysdeps/x86_64/fpu/bits/fenv.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Dec 22 19:03:04 2011
@@ -1,3 +1,62 @@
+2011-12-22  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/Makefile (syscall-list-variants)
+	(syscall-list-default-options, syscall-list-default-condition)
+	(syscall-list-includes): Define.
+	($(objpfx)syscall-%.h $(objpfx)syscall-%.d): Support arbitrary
+	list of ABIs and options and #if conditions for each ABI.  Do not
+	handle common syscalls between ABIs specially.
+	* sysdeps/unix/sysv/linux/powerpc/Makefile (64bit-predefine):
+	Remove.
+	(syscall-list-variants, syscall-list-32bit-options)
+	(syscall-list-32bit-condition, syscall-list-64bit-options)
+	(syscall-list-64bit-condition): Define.
+	* sysdeps/unix/sysv/linux/s390/Makefile (64bit-predefine): Remove.
+	(syscall-list-variants, syscall-list-32bit-options)
+	(syscall-list-32bit-condition, syscall-list-64bit-options)
+	(syscall-list-64bit-condition): Define.
+	* sysdeps/unix/sysv/linux/sparc/Makefile (64bit-predefine):
+	Remove.
+	(syscall-list-variants, syscall-list-32bit-options)
+	(syscall-list-32bit-condition, syscall-list-64bit-options)
+	(syscall-list-64bit-condition): Define.
+	* sysdeps/unix/sysv/linux/x86_64/Makefile (64bit-predefine):
+	Remove.
+	(syscall-list-variants, syscall-list-32bit-options)
+	(syscall-list-32bit-condition, syscall-list-64bit-options)
+	(syscall-list-64bit-condition): Define.
+
+2011-12-22  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* locale/iso-639.def: Add brx entry.
+
+	[BZ #13328]
+	* malloc/mtrace.c (tr_freehook): Avoid unnecessary unlock/lock.
+	Proposed by Mariusz_Cukr <marcukr@xxxxx>.
+
+	* sysdeps/x86_64/fpu/bits/fenv.h: Use __REDIRECT_NTH for
+	__feraiseexcept_renamed.
+
+2011-12-21  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	[BZ #13538]
+	* sysdeps/unix/sysv/linux/sys/epoll.h: Initialize EPOLLONESHOT and
+	EPOLLET with unsigned values.
+	* sysdeps/unix/sysv/linux/x86_64/sys/epoll.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sys/epoll.h: Likewise.
+
+	* math/s_cacosh.c: Use Kahan's formula if the subtraction could lead
+	to large cancellation.
+	* math/s_cacoshf.c: Likewise.
+	* math/s_cacoshl.c: Likewise.
+
+2011-11-18  Richard B. Kreckel  <kreckel@xxxxxxxx>
+
+	[BZ #13305]
+	* math/s_cacosh.c: Fix rare miscomputation in cacosh().
+	* math/s_cacoshf.c: Likewise.
+	* math/s_cacoshl.c: Likewise.
+
 2011-12-21  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	[BZ #13439]

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Thu Dec 22 19:03:04 2011
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2011-12-21
+GNU C Library NEWS -- history of user-visible changes.  2011-12-22
 Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -12,8 +12,9 @@
   6779, 6783, 9696, 10103, 10709, 11589, 12403, 12847, 12868, 12852, 12874,
   12885, 12892, 12907, 12922, 12935, 13007, 13021, 13067, 13068, 13090,
   13092, 13114, 13118, 13123, 13134, 13138, 13147, 13150, 13179, 13192,
-  13268, 13276, 13291, 13335, 13337, 13344, 13358, 13367, 13439, 13446,
-  13472, 13484, 13506, 13524
+  13268, 13276, 13282, 13291, 13305, 13328, 13335, 13337, 13344, 13358,
+  13367, 13413, 13416, 13423, 13439, 13446, 13472, 13484, 13506, 13515,
+  13523, 13524, 13538
 
 * New program pldd to list loaded object of a process
   Implemented by Ulrich Drepper.
@@ -64,6 +65,8 @@
 
 * Optimized nearbyint and strcasecmp for PPC.
   Implemented by Adhemerval Zanella.
+
+* New locales: bho_IN, unm_US, es_CU
 
 Version 2.14
 

Modified: fsf/trunk/libc/locale/iso-639.def
==============================================================================
--- fsf/trunk/libc/locale/iso-639.def (original)
+++ fsf/trunk/libc/locale/iso-639.def Thu Dec 22 19:03:04 2011
@@ -70,6 +70,7 @@
 DEFINE_LANGUAGE_CODE3 ("Bini", bin, bin)
 DEFINE_LANGUAGE_CODE ("Bislama", bi, bis, bis)
 DEFINE_LANGUAGE_CODE3 ("Blin; Bilin", byn, byn)
+DEFINE_LANGUAGE_CODE3 ("Bodo", brx, brx)
 DEFINE_LANGUAGE_CODE ("Bosnian", bs, bos, bos)
 DEFINE_LANGUAGE_CODE3 ("Braj", bra, bra)
 DEFINE_LANGUAGE_CODE ("Breton", br, bre, bre)

Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Thu Dec 22 19:03:04 2011
@@ -1,3 +1,24 @@
+2011-12-22  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	[BZ #13282]
+	* locales/brx_IN: New file.
+	* SUPPORTED (SUPPORTED-LOCALES): Add appropriate entry
+
+	[BZ #13413]
+	* locales/nl_BE: Use LC_MONETARY from nl_NL.
+
+	[BZ #13416]
+	* locales/es_CU: New file.
+	* SUPPORTED (SUPPORTED-LOCALES): Add appropriate entry
+
+	[BZ #13423]
+	* locales/unm_US: New file.
+	* SUPPORTED (SUPPORTED-LOCALES): Add appropriate entry
+
+	[BZ #13523]
+	* locales/bho_IN: New file.
+	* SUPPORTED (SUPPORTED-LOCALES): Add appropriate entry
+
 2011-11-17  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* Makefile (charmaps): Not need to filter out any of the VC

Modified: fsf/trunk/libc/localedata/SUPPORTED
==============================================================================
--- fsf/trunk/libc/localedata/SUPPORTED (original)
+++ fsf/trunk/libc/localedata/SUPPORTED Thu Dec 22 19:03:04 2011
@@ -58,6 +58,7 @@
 ber_MA/UTF-8 \
 bg_BG.UTF-8/UTF-8 \
 bg_BG/CP1251 \
+bho_IN/UTF-8 \
 bn_BD/UTF-8 \
 bn_IN/UTF-8 \
 bo_CN/UTF-8 \
@@ -65,6 +66,7 @@
 br_FR.UTF-8/UTF-8 \
 br_FR/ISO-8859-1 \
 br_FR@euro/ISO-8859-15 \
+brx_IN/UTF-8 \
 bs_BA.UTF-8/UTF-8 \
 bs_BA/ISO-8859-2 \
 byn_ER/UTF-8 \
@@ -147,6 +149,7 @@
 es_CO/ISO-8859-1 \
 es_CR.UTF-8/UTF-8 \
 es_CR/ISO-8859-1 \
+es_CU/UTF-8 \
 es_DO.UTF-8/UTF-8 \
 es_DO/ISO-8859-1 \
 es_EC.UTF-8/UTF-8 \
@@ -399,6 +402,7 @@
 ug_CN/UTF-8 \
 uk_UA.UTF-8/UTF-8 \
 uk_UA/KOI8-U \
+unm_US/UTF-8 \
 ur_PK/UTF-8 \
 uz_UZ/ISO-8859-1 \
 uz_UZ@cyrillic/UTF-8 \

Added: fsf/trunk/libc/localedata/locales/bho_IN
==============================================================================
--- fsf/trunk/libc/localedata/locales/bho_IN (added)
+++ fsf/trunk/libc/localedata/locales/bho_IN Thu Dec 22 19:03:04 2011
@@ -1,0 +1,164 @@
+comment_char    %
+escape_char     /
+% Bhojpuri language locale for India.
+% Contributed by Alok Ranjan <ranjan_aalok@xxxxxxxxx>,
+% Dr.Chandra Mohan <cmkumar1@xxxxxxxxxxxxxx>,
+% Rajesh Ranjan <rajeshkajha@xxxxxxxxx> and Pravin Satpute <psatpute@xxxxxxxxxx>
+
+LC_IDENTIFICATION
+title      "Bhojpuri language locale for India"
+source     ""
+address    ""
+contact    ""
+email      "bhashaghar@xxxxxxxxxxxxxxxx"
+tel        ""
+fax        ""
+language   "Bhojpuri"
+territory  "India"
+revision   "0.1"
+date       "2011-12-20"
+%
+category  "bho_IN:2011";LC_IDENTIFICATION
+category  "bho_IN:2011";LC_CTYPE
+category  "bho_IN:2011";LC_COLLATE
+category  "bho_IN:2011";LC_TIME
+category  "bho_IN:2011";LC_NUMERIC
+category  "bho_IN:2011";LC_MONETARY
+category  "bho_IN:2011";LC_MESSAGES
+category  "bho_IN:2011";LC_PAPER
+category  "bho_IN:2011";LC_NAME
+category  "bho_IN:2011";LC_ADDRESS
+category  "bho_IN:2011";LC_TELEPHONE
+
+END LC_IDENTIFICATION
+
+LC_CTYPE
+copy "hi_IN"
+END LC_CTYPE
+
+LC_COLLATE
+copy "hi_IN"
+END LC_COLLATE
+
+LC_MONETARY
+copy "hi_IN"
+END LC_MONETARY
+
+
+LC_NUMERIC
+copy "hi_IN"
+END LC_NUMERIC
+
+
+LC_TIME
+% This is the POSIX Locale definition for the LC_TIME category.
+% These are generated based on XML base Locale definition file
+% for IBM Class for Unicode/Java
+%
+% Abbreviated weekday names (%a)
+abday       "<U0930><U0935><U093F><U0020>";/
+	    "<U0938><U094B><U092E><U0020>";/
+	    "<U092E><U0902><U0917><U0932><U0020>";/
+	    "<U092C><U0941><U0927><U0020>";/
+	    "<U0917><U0941><U0930><U0941><U0020>";/
+	    "<U0936><U0941><U0915><U094D><U0930><U0020>";/
+	    "<U0936><U0928><U093F><U0020>"
+%
+% Full weekday names (%A)
+day         "<U0930><U0935><U093F><U0935><U093E><U0930><U0020>";/
+	    "<U0938><U094B><U092E><U0935><U093E><U0930><U0020>";/
+	    "<U092E><U0902><U0917><U0932><U0935><U093E><U0930><U0020>";/
+	    "<U092C><U0941><U0927><U0935><U093E><U0930><U0020>";/
+	    "<U0917><U0941><U0930><U0941><U0935><U093E><U0930><U0020>";/
+	    "<U0936><U0941><U0915><U094D><U0930><U0935><U093E><U0930><U0020>";/
+	    "<U0936><U0928><U093F><U0935><U093E><U0930><U0020>"
+%
+% Abbreviated month names (%b)
+abmon       "<U091C><U0928><U0935><U0930><U0940>";/
+	    "<U092B><U0930><U0935><U0930><U0940>";/
+	    "<U092E><U093E><U0930><U094D><U091A>";/
+	    "<U0905><U092A><U094D><U0930><U0948><U0932>";/
+	    "<U092E><U0908>";"<U091C><U0942><U0928>";/
+	    "<U091C><U0941><U0932><U093E><U0908>";/
+	    "<U0905><U0917><U0938><U094D><U0924>";/
+	    "<U0938><U093F><U0924><U092E><U094D><U092C><U0930>";/
+	    "<U0905><U0915><U094D><U091F><U0942><U092C><U0930>";/
+	    "<U0928><U0935><U092E><U094D><U092C><U0930>";/
+	    "<U0926><U093F><U0938><U092E><U094D><U092C><U0930>"%
+% Full month names (%B)
+mon         "<U091C><U0928><U0935><U0930><U0940>";/
+	    "<U092B><U0930><U0935><U0930><U0940>";/
+	    "<U092E><U093E><U0930><U094D><U091A>";/
+	    "<U0905><U092A><U094D><U0930><U0948><U0932>";/
+	    "<U092E><U0908>";"<U091C><U0942><U0928>";/
+	    "<U091C><U0941><U0932><U093E><U0908>";/
+	    "<U0905><U0917><U0938><U094D><U0924>";/
+	    "<U0938><U093F><U0924><U092E><U094D><U092C><U0930>";/
+	    "<U0905><U0915><U094D><U091F><U0942><U092C><U0930>";/
+	    "<U0928><U0935><U092E><U094D><U092C><U0930>";/
+	    "<U0926><U093F><U0938><U092E><U094D><U092C><U0930>"%
+%
+% Equivalent of AM PM
+am_pm       "<U092A><U0942><U0930><U094D><U0935><U093E><U0939><U094D><U0928>";/
+	    "<U0905><U092A><U0930><U093E><U0939><U094D><U0928>"
+%
+% Appropriate date and time representation
+% %A %d %b %Y%I:%M:%S  %Z
+d_t_fmt     "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0062>/
+<U0020><U0025><U0059><U0020><U0025><U0049><U003A><U0025><U004D><U003A>/
+<U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
+%
+% Appropriate date representation
+% %A %d %b %Y
+d_fmt       "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0062>/
+<U0020><U0025><U0059>"
+%
+% Appropriate time representation
+% %I:%M:%S  %Z
+t_fmt       "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053>/
+<U0020><U0020><U0025><U005A>"
+%
+% Appropriate 12 h time representation (%r)
+t_fmt_ampm  "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053>/
+<U0020><U0025><U0070><U0020><U0025><U005A>"
+%
+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_MESSAGES
+copy "hi_IN"
+END LC_MESSAGES
+
+
+LC_PAPER
+copy "hi_IN"
+END LC_PAPER
+
+
+LC_NAME
+name_fmt    "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074>/
+<U0025><U0067>"
+name_gen    ""
+name_mr     "<U0936><U094D><U0930><U0940>"
+name_mrs    "<U0936><U094D><U0930><U0940><U092E><U0924><U0940>"
+name_miss   "<U0915><U0941><U092E><U093E><U0930><U0940>"
+name_ms     "<U0915><U0941><U092E><U093E><U0930>"
+END LC_NAME
+
+
+LC_ADDRESS
+copy "hi_IN"
+END LC_ADDRESS
+
+
+LC_TELEPHONE
+copy "hi_IN"
+END LC_TELEPHONE
+
+
+LC_MEASUREMENT
+copy "hi_IN"
+END LC_MEASUREMENT

Added: fsf/trunk/libc/localedata/locales/brx_IN
==============================================================================
--- fsf/trunk/libc/localedata/locales/brx_IN (added)
+++ fsf/trunk/libc/localedata/locales/brx_IN Thu Dec 22 19:03:04 2011
@@ -1,0 +1,185 @@
+comment_char    %
+escape_char     /
+% Bodo language locale for India.
+% Contributed by Pravin Satpute <psatpute@xxxxxxxxxx> and Sanjib Narzary <alayaran@xxxxxxxxx>
+% Reference http://www.unicode.org/cldr/trac/browser/trunk/common/main/brx.xml
+
+LC_IDENTIFICATION
+title      "Bodo language locale for India"
+source     "Red Hat Pune"
+address    "Level 1, Tower X, Cybercity, Magarpatta City, Hadapsar, Pune-411013 "
+contact    ""
+email      "bug-glibc-locales@xxxxxxx"
+tel        ""
+fax        ""
+language   "Bodo"
+territory  "India"
+revision   "1.0"
+date       "2011-10-17"
+%
+category  "brx_IN:2011";LC_IDENTIFICATION
+category  "brx_IN:2011";LC_CTYPE
+category  "brx_IN:2011";LC_COLLATE
+category  "brx_IN:2011";LC_TIME
+category  "brx_IN:2011";LC_NUMERIC
+category  "brx_IN:2011";LC_MONETARY
+category  "brx_IN:2011";LC_MESSAGES
+category  "brx_IN:2011";LC_PAPER
+category  "brx_IN:2011";LC_NAME
+category  "brx_IN:2011";LC_ADDRESS
+category  "brx_IN:2011";LC_TELEPHONE
+
+END LC_IDENTIFICATION
+
+LC_CTYPE
+copy "hi_IN"
+END LC_CTYPE
+
+LC_COLLATE
+copy "hi_IN"
+END LC_COLLATE
+
+LC_MONETARY
+copy "hi_IN"
+END LC_MONETARY
+
+
+LC_NUMERIC
+copy "hi_IN"
+END LC_NUMERIC
+
+
+LC_TIME
+% This is the POSIX Locale definition for the LC_TIME category
+% generated by IBM Basic CountryPack Transformer.
+% These are generated based on XML base Locale definition file
+% for IBM Class for Unicode.
+%
+% Abbreviated weekday names (%a)
+abday       "<U0930><U092C><U093F>";"<U0938><U092E>";/
+            "<U092E><U0902><U0917><U0932>";"<U092C><U0941><U0926>";/
+            "<U092C><U093F><U0938><U0925><U093F>";/
+            "<U0938><U0941><U0916><U0941><U0930>";"<U0938><U0941><U0928><U093F>"
+%
+
+% Full weekday names (%A)
+day         "<U0930><U092C><U093F><U092C><U093E><U0930>";/
+            "<U0938><U094B><U092C><U093E><U0930>";/
+            "<U092E><U0902><U0917><U0932><U092C><U093E><U0930>";/
+            "<U092C><U0941><U0926><U092C><U093E><U0930>";/
+            "<U092C><U093F><U0938><U0925><U093F><U092C><U093E><U0930>";/
+            "<U0938><U0941><U0916><U0941><U0930><U092C><U093E><U0930>";/
+            "<U0938><U0941><U0928><U093F><U092C><U093E><U0930>"
+%
+% Abbreviated month names (%b)
+abmon         "<U091C><U093E><U0928><U0941><U0935><U093E><U0930><U0940>";/
+            "<U092B><U0947><U092C><U094D><U0930><U0941><U0935><U093E><U0930><U0940>";/
+            "<U092E><U093E><U0930><U094D><U0938>";/
+            "<U090F><U092A><U094D><U0930><U093F><U0932>";/
+            "<U092E><U0947>";/
+            "<U091C><U0941><U0928>";/
+            "<U091C><U0941><U0932><U093E><U0907>";/
+            "<U0906><U0917><U0938><U094D><U0925>";/
+            "<U0938><U0947><U092C><U0925><U0947><U091C><U094D><U092C><U093C><U0930>";/
+            "<U0905><U0916><U0925><U092C><U0930>";/
+            "<U0928><U092C><U0947><U091C><U094D><U092C><U093C><U0930>";/
+            "<U0926><U093F><U0938><U0947><U091C><U094D><U092C><U093C><U0930>"
+%
+
+% Full month names (%B)
+mon         "<U091C><U093E><U0928><U0941><U0935><U093E><U0930><U0940>";/
+            "<U092B><U0947><U092C><U094D><U0930><U0941><U0935><U093E><U0930><U0940>";/
+            "<U092E><U093E><U0930><U094D><U0938>";/
+            "<U090F><U092A><U094D><U0930><U093F><U0932>";/
+            "<U092E><U0947>";/
+            "<U091C><U0941><U0928>";/
+            "<U091C><U0941><U0932><U093E><U0907>";/
+            "<U0906><U0917><U0938><U094D><U0925>";/
+            "<U0938><U0947><U092C><U0925><U0947><U091C><U094D><U092C><U093C><U0930>";/
+            "<U0905><U0916><U0925><U092C><U0930>";/
+            "<U0928><U092C><U0947><U091C><U094D><U092C><U093C><U0930>";/
+            "<U0926><U093F><U0938><U0947><U091C><U094D><U092C><U093C><U0930>"
+%
+% Equivalent of AM PM
+
+am_pm       "<U092B><U0941><U0902><U002E>";/
+            "<U092C><U0947><U0932><U093E><U0938><U0947><U002E>"
+%
+% Appropriate date and time representation
+% %A %d %b %Y%I:%M:%S  %Z
+d_t_fmt     "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0062>/
+<U0020><U0025><U0059><U0020><U0025><U0049><U003A><U0025><U004D><U003A>/
+<U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
+%
+% Appropriate date representation
+% %A %d %b %Y
+d_fmt       "<U0025><U0041><U0020><U0025><U0064><U0020><U0025><U0062>/
+<U0020><U0025><U0059>"
+%
+% Appropriate time representation
+% %I:%M:%S  %Z
+t_fmt       "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053>/
+<U0020><U0020><U0025><U005A>"
+%
+% Appropriate 12 h time representation (%r)
+t_fmt_ampm  "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053>/
+<U0020><U0025><U0070><U0020><U0025><U005A>"
+%
+% Appropriate date representation (date(1))   "%a %b %e %H:%M:%S %Z %Y"
+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_MESSAGES
+% This is the POSIX Locale definition for the LC_MESSAGES category
+% generated by IBM Basic CountryPack Transformer.
+% These are generated based on XML base Locale definition file
+% for IBM Class for Unicode.
+%
+% ^(Yes|[yY])
+yesexpr     "<U005E><U0028><U0928><U0902><U0917><U094C><U007C><U005B><U0079>/
+<U0059><U005D><U0029>"
+%
+% ^(No|[nN])
+noexpr      "<U005E><U0028><U0928><U0919><U093E><U007C><U005B><U006E><U004E>/
+<U005D><U0029>"
+%
+END LC_MESSAGES
+
+
+LC_PAPER
+copy "hi_IN"
+END LC_PAPER
+
+
+LC_NAME
+% This is the ISO_IEC TR14652 Locale definition for the LC_NAME category
+% generated by IBM Basic CountryPack Transformer.
+%
+%
+name_fmt    "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074>/
+<U0025><U0067>"
+name_gen    ""
+name_mr     "<U004D><U0072><U002E>"
+name_mrs    "<U004D><U0072><U0073><U002E>"
+name_miss   "<U004D><U0069><U0073><U0073><U002E>"
+name_ms     "<U004D><U0073><U002E>"
+
+END LC_NAME
+
+
+LC_ADDRESS
+copy "hi_IN"
+END LC_ADDRESS
+
+
+LC_TELEPHONE
+copy "hi_IN"
+END LC_TELEPHONE
+
+
+LC_MEASUREMENT
+copy "hi_IN"
+END LC_MEASUREMENT

Added: fsf/trunk/libc/localedata/locales/es_CU
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_CU (added)
+++ fsf/trunk/libc/localedata/locales/es_CU Thu Dec 22 19:03:04 2011
@@ -1,0 +1,122 @@
+comment_char %
+escape_char  /
+%
+% Spanish Language Locale for Cuba
+% Address: San Antonio de los Ba<U00F8>os Highway, Kilometer 1 1/2,
+%          University of Informatic Sciences
+% Contact: Rosniel Arian Montanet
+% Email: ramontanet@xxxxxxxxxxxxxxxxxx
+% Tel: +45 - 837-2531
+% Fax: +45 - 0000000
+% Language: es
+% Territory: CU
+% Revision: 0.1
+% Date: 2011-10-19
+% Application: general
+% Users: general
+% Distribution and use is free, also
+% for commercial purposes.
+
+LC_IDENTIFICATION
+title      "Spanish locale for Cuba"
+source     ""
+address    "San Antonio de los Ba<U00F8>os Highway, Kilometer 1 1/2, University of Informatic Sciences "
+contact    ""
+email      "bug-glibc-locales@xxxxxxx"
+tel        ""
+fax        ""
+language   "Spanish"
+territory  "Cuba"
+revision   "0.1"
+date       "2011-10-19"
+%
+category  "es_CU:2000";LC_IDENTIFICATION
+category  "es_CU:2000";LC_CTYPE
+category  "es_CU:2000";LC_COLLATE
+category  "es_CU:2000";LC_TIME
+category  "es_CU:2000";LC_NUMERIC
+category  "es_CU:2000";LC_MONETARY
+category  "es_CU:2000";LC_MESSAGES
+category  "es_CU:2000";LC_PAPER
+category  "es_CU:2000";LC_NAME
+category  "es_CU:2000";LC_ADDRESS
+category  "es_CU:2000";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
+copy "es_ES"
+END LC_MESSAGES
+
+LC_MONETARY
+int_curr_symbol      "<U0043><U0055><U0050><U0020>"
+currency_symbol      "<U0024>"
+mon_decimal_point    "<U002C>"
+mon_thousands_sep    "<U0020>"
+mon_grouping         3;3
+positive_sign        ""
+negative_sign        "<U002D>"
+int_frac_digits      2
+frac_digits          2
+p_cs_precedes        0
+p_sep_by_space       1
+n_cs_precedes        0
+n_sep_by_space       1
+p_sign_posn          1
+n_sign_posn          1
+END LC_MONETARY
+
+LC_NUMERIC
+decimal_point        "<U002C>"
+thousands_sep        ""
+grouping             0;0
+END LC_NUMERIC
+
+LC_TIME
+copy "es_ES"
+END LC_TIME
+
+LC_PAPER
+height   297
+width    210
+END LC_PAPER
+
+LC_TELEPHONE
+tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
+<U006C>"
+int_prefix     "<U0035><U0033>"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+% FIXME
+measurement    1
+END LC_MEASUREMENT
+
+LC_NAME
+name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+<U0025><U006D><U0025><U0074><U0025><U0066>"
+END LC_NAME
+
+LC_ADDRESS
+postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
+<U004E><U0025><U0063><U0025><U004E>"
+country_ab2   "<U0043><U0055>"
+country_ab3   "<U0043><U0055><U0042>"
+country_num   192
+END LC_ADDRESS

Modified: fsf/trunk/libc/localedata/locales/nl_BE
==============================================================================
--- fsf/trunk/libc/localedata/locales/nl_BE (original)
+++ fsf/trunk/libc/localedata/locales/nl_BE Thu Dec 22 19:03:04 2011
@@ -59,7 +59,7 @@
 END LC_MESSAGES
 
 LC_MONETARY
-copy "fr_BE"
+copy "nl_NL"
 END LC_MONETARY
 
 LC_NUMERIC

Added: fsf/trunk/libc/localedata/locales/unm_US
==============================================================================
--- fsf/trunk/libc/localedata/locales/unm_US (added)
+++ fsf/trunk/libc/localedata/locales/unm_US Thu Dec 22 19:03:04 2011
@@ -1,0 +1,150 @@
+comment_char %
+escape_char /
+%
+% Unami Delaware Locale for U.S.A.
+% Language: unm
+% Contact: lugubrili@xxxxxxxxxxx
+% Territory: US
+% Date: 2011-10-27
+% Application: general
+% Users: general
+% Distribution and use is free, also
+% for commercial purposes.
+
+LC_IDENTIFICATION
+title      "Unami Delaware locale for the USA"
+source     ""
+address    ""
+contact    ""
+email      "bug-glibc-locales@xxxxxxx"
+tel        ""
+fax        ""
+language   "Unami Delaware"
+territory  "USA"
+revision   "1.0"
+date       "2011-10-27"
+%
+category  "unm_US:2011";LC_IDENTIFICATION
+category  "unm_US:2011";LC_CTYPE
+category  "unm_US:2011";LC_COLLATE
+category  "unm_US:2011";LC_TIME
+category  "unm_US:2011";LC_NUMERIC
+category  "unm_US:2011";LC_MONETARY
+category  "unm_US:2011";LC_MESSAGES
+category  "unm_US:2011";LC_PAPER
+category  "unm_US:2011";LC_NAME
+category  "unm_US:2011";LC_ADDRESS
+category  "unm_US:2011";LC_TELEPHONE
+category  "unm_US:2011";LC_MEASUREMENT
+
+END LC_IDENTIFICATION
+
+LC_CTYPE
+copy "i18n"
+
+translit_start
+include "translit_combining";""
+translit_end
+END LC_CTYPE
+
+LC_COLLATE
+copy "iso14651_t1"
+END LC_COLLATE
+
+LC_TIME
+% ken, man, tus, lel, tas, pel, sat
+abday  "<U006B><U0065><U006E>";"<U006D><U0061><U006E>";/
+       "<U0074><U0075><U0073>";"<U006C><U0065><U006C>";/
+       "<U0074><U0061><U0073>";"<U0070><U0065><U006C>";/
+       "<U0073><U0061><U0074>"
+% kentuwei, manteke, tusteke, lelai, tasteke, pelaiteke, sateteke
+day    "<U006B><U0065><U006E><U0074><U0075><U0077><U0065><U0069>";/
+       "<U006D><U0061><U006E><U0074><U0065><U006B><U0065>";/
+       "<U0074><U0075><U0073><U0074><U0065><U006B><U0065>";/
+       "<U006C><U0065><U006C><U0061><U0069>";/
+       "<U0074><U0061><U0073><U0074><U0065><U006B><U0065>";/
+       "<U0070><U0065><U006C><U0061><U0069><U0074><U0065><U006B><U0065>";/
+       "<U0073><U0061><U0074><U0065><U0074><U0065><U006B><U0065>"
+% eni, chk, xam, kwe, tai, nip, lai, win, tah, puk, kun, mux
+abmon  "<U0065><U006E><U0069>";"<U0063><U0068><U006B>";/
+       "<U0078><U0061><U006D>";"<U006B><U0077><U0065>";/
+       "<U0074><U0061><U0069>";"<U006E><U0069><U0070>";/
+       "<U006C><U0061><U0069>";"<U0077><U0069><U006E>";/
+       "<U0074><U0061><U0068>";"<U0070><U0075><U006B>";/
+       "<U006B><U0075><U006E>";"<U006D><U0075><U0078>"
+% enikwsi, chkwali, xamokhwite, kwetayoxe, tainipen, kichinipen
+% lainipen, winaminke, kichitahkok, puksit, wini, muxkotae
+mon    "<U0065><U006E><U0069><U006B><U0077><U0073><U0069>";/
+       "<U0063><U0068><U006B><U0077><U0061><U006C><U0069>";/
+       "<U0078><U0061><U006D><U006F><U006B><U0068><U0077><U0069><U0074><U0065>";/
+       "<U006B><U0077><U0065><U0074><U0061><U0079><U006F><U0078><U0065>";/
+       "<U0074><U0061><U0069><U006E><U0069><U0070><U0065><U006E>";/
+       "<U006B><U0069><U0063><U0068><U0069><U006E><U0069><U0070><U0065><U006E>";/
+       "<U006C><U0061><U0069><U006E><U0069><U0070><U0065><U006E>";/
+       "<U0077><U0069><U006E><U0061><U006D><U0069><U006E><U006B><U0065>";/
+       "<U006B><U0069><U0063><U0068><U0069><U0074><U0061><U0068><U006B><U006F><U006B>";/
+       "<U0070><U0075><U006B><U0073><U0069><U0074>";/
+       "<U0077><U0069><U006E><U0069>";/
+       "<U006D><U0075><U0078><U006B><U006F><U0074><U0061><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>"
+week    7;19971130;4
+first_weekday 1
+first_workday 2
+END LC_TIME
+
+LC_NUMERIC
+decimal_point           "<U002E>"
+thousands_sep           "<U0020>"
+grouping                2;2;2;3
+END LC_NUMERIC
+
+LC_MONETARY
+int_curr_symbol         "<U0055><U0053><U0044><U0020>"
+currency_symbol         "<U0024>"
+mon_decimal_point       "<U002E>"
+mon_thousands_sep       "<U0020>"
+mon_grouping            3
+positive_sign           ""
+negative_sign           "<U002D>"
+int_frac_digits         2
+frac_digits             2
+p_cs_precedes           1
+p_sep_by_space          0
+n_cs_precedes           1
+n_sep_by_space          0
+p_sign_posn             1
+n_sign_posn             1
+END LC_MONETARY
+
+LC_MESSAGES
+yesexpr "<U005E><U005B><U0079><U0059><U005D><U002E><U002A>"
+noexpr  "<U005E><U005B><U006B><U004B><U006D><U004D><U005D><U002E><U002A>"
+END LC_MESSAGES
+
+LC_PAPER
+copy "en_US"
+END LC_PAPER
+
+LC_NAME
+name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+<U0025><U006D><U0025><U0074><U0025><U0066>"
+END LC_NAME
+
+LC_ADDRESS
+copy "en_US"
+END LC_ADDRESS
+
+LC_TELEPHONE
+copy "en_US"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+copy "en_US"
+END LC_MEASUREMENT

Modified: fsf/trunk/libc/malloc/mtrace.c
==============================================================================
--- fsf/trunk/libc/malloc/mtrace.c (original)
+++ fsf/trunk/libc/malloc/mtrace.c Thu Dec 22 19:03:04 2011
@@ -146,10 +146,12 @@
   tr_where (caller, info);
   /* Be sure to print it first.  */
   fprintf (mallstream, "- %p\n", ptr);
-  __libc_lock_unlock (lock);
   if (ptr == mallwatch)
-    tr_break ();
-  __libc_lock_lock (lock);
+    {
+      __libc_lock_unlock (lock);
+      tr_break ();
+      __libc_lock_lock (lock);
+    }
   __free_hook = tr_old_free_hook;
   if (tr_old_free_hook != NULL)
     (*tr_old_free_hook) (ptr, caller);

Modified: fsf/trunk/libc/math/s_cacosh.c
==============================================================================
--- fsf/trunk/libc/math/s_cacosh.c (original)
+++ fsf/trunk/libc/math/s_cacosh.c Thu Dec 22 19:03:04 2011
@@ -65,6 +65,11 @@
       __real__ res = 0.0;
       __imag__ res = __copysign (M_PI_2, __imag__ x);
     }
+  /* The factor 16 is just a guess.  */
+  else if (16.0 * fabs (__imag__ x) < fabs (__real__ x))
+    /* Kahan's formula which avoid cancellation through subtraction in
+       some cases.  */
+    res = 2.0 * __clog (__csqrt ((x + 1.0) / 2.0) + __csqrt ((x - 1.0) / 2.0));
   else
     {
       __complex__ double y;
@@ -74,17 +79,13 @@
 
       y = __csqrt (y);
 
-      if (__real__ x < 0.0)
+      if (signbit (__real__ x))
 	y = -y;
 
       __real__ y += __real__ x;
       __imag__ y += __imag__ x;
 
       res = __clog (y);
-
-      /* We have to use the positive branch.  */
-      if (__real__ res < 0.0)
-	res = -res;
     }
 
   return res;

Modified: fsf/trunk/libc/math/s_cacoshf.c
==============================================================================
--- fsf/trunk/libc/math/s_cacoshf.c (original)
+++ fsf/trunk/libc/math/s_cacoshf.c Thu Dec 22 19:03:04 2011
@@ -1,5 +1,5 @@
 /* Return arc hyperbole cosine for float value.
-   Copyright (C) 1997, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2006, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -65,9 +65,14 @@
       __real__ res = 0.0;
       __imag__ res = __copysignf (M_PI_2, __imag__ x);
     }
+  /* The factor 16 is just a guess.  */
+  else if (16.0 * fabsf (__imag__ x) < fabsf (__real__ x))
+    /* Kahan's formula which avoid cancellation through subtraction in
+       some cases.  */
+    res = 2.0 * __clogf (__csqrtf ((x + 1.0) / 2.0)
+			 + __csqrtf ((x - 1.0) / 2.0));
   else
     {
-#if 1
       __complex__ float y;
 
       __real__ y = (__real__ x - __imag__ x) * (__real__ x + __imag__ x) - 1.0;
@@ -75,30 +80,13 @@
 
       y = __csqrtf (y);
 
-      if (__real__ x < 0.0)
+      if (signbit (__real__ x))
 	y = -y;
 
       __real__ y += __real__ x;
       __imag__ y += __imag__ x;
 
       res = __clogf (y);
-#else
-      float re2 = __real__ x * __real__ x;
-      float im2 = __imag__ x * __imag__ x;
-      float sq = re2 - im2 - 1.0;
-      float ro = __ieee754_sqrtf (sq * sq + 4 * re2 * im2);
-      float a = __ieee754_sqrtf ((sq + ro) / 2.0);
-      float b = __ieee754_sqrtf ((-sq + ro) / 2.0);
-
-      __real__ res = 0.5 * __ieee754_logf (re2 + __real__ x * 2 * a
-					   + im2 + __imag__ x * 2 * b
-					   + ro);
-      __imag__ res = __ieee754_atan2f (__imag__ x + b, __real__ x + a);
-#endif
-
-      /* We have to use the positive branch.  */
-      if (__real__ res < 0.0)
-	res = -res;
     }
 
   return res;

Modified: fsf/trunk/libc/math/s_cacoshl.c
==============================================================================
--- fsf/trunk/libc/math/s_cacoshl.c (original)
+++ fsf/trunk/libc/math/s_cacoshl.c Thu Dec 22 19:03:04 2011
@@ -65,6 +65,12 @@
       __real__ res = 0.0;
       __imag__ res = __copysignl (M_PI_2l, __imag__ x);
     }
+  /* The factor 16 is just a guess.  */
+  else if (16.0L * fabsl (__imag__ x) < fabsl (__real__ x))
+    /* Kahan's formula which avoid cancellation through subtraction in
+       some cases.  */
+    res = 2.0L * __clogl (__csqrtl ((x + 1.0L) / 2.0L)
+			  + __csqrtl ((x - 1.0L) / 2.0L));
   else
     {
       __complex__ long double y;
@@ -74,17 +80,13 @@
 
       y = __csqrtl (y);
 
-      if (__real__ x < 0.0)
+      if (signbit (__real__ x))
 	y = -y;
 
       __real__ y += __real__ x;
       __imag__ y += __imag__ x;
 
       res = __clogl (y);
-
-      /* We have to use the positive branch.  */
-      if (__real__ res < 0.0)
-	res = -res;
     }
 
   return res;

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Thu Dec 22 19:03:04 2011
@@ -1,3 +1,9 @@
+2011-12-21  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	[BZ #13515]
+	* sysdeps/unix/sysv/linux/pthread_getname.c (pthread_getname_np):
+	Correct reading name from file.
+
 2011-12-14  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
 	* allocatestack.c (allocate_stack): Return errno on failure.

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_getname.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_getname.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_getname.c Thu Dec 22 19:03:04 2011
@@ -1,5 +1,5 @@
 /* pthread_getname_np -- Get  thread name.  Linux version
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 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
@@ -57,6 +57,15 @@
   ssize_t n = TEMP_FAILURE_RETRY (read_not_cancel (fd, buf, len));
   if (n < 0)
     res = errno;
+  else
+    {
+      if (buf[n - 1] == '\n')
+	buf[n - 1] = '\0';
+      else if (n == len)
+	res = ERANGE;
+      else
+	buf[n] = '\0';
+    }
 
   close_not_cancel_no_status (fd);
 

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/Makefile (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/Makefile Thu Dec 22 19:03:04 2011
@@ -39,8 +39,27 @@
 tests += tst-clone
 
 # Generate the list of SYS_* macros for the system calls (__NR_* macros).
-# For bi-arch platforms, the CPU/Makefile defines {32,64}bit-predefine and
-# we generate a file that uses <bits/wordsize.h>.
+
+# If there is more than one syscall list for different architecture
+# variants, the CPU/Makefile defines syscall-list-variants to be a
+# list of names for those variants (e.g. 32bit 64bit), and, for each
+# variant, defines syscall-list-$(variant)-options to be compiler
+# options to cause <asm/unistd.h> to define the desired list of
+# syscalls and syscall-list-$(variant)-condition to be the condition
+# for those options to use in a C #if condition.
+# syscall-list-includes may be defined to a list of headers to include
+# in the generated header, if the default does not suffice.
+
+ifndef syscall-list-variants
+syscall-list-variants := default
+syscall-list-default-options :=
+syscall-list-default-condition :=
+endif
+
+ifndef syscall-list-includes
+syscall-list-includes := bits/wordsize.h
+endif
+
 $(objpfx)syscall-%.h $(objpfx)syscall-%.d: ../sysdeps/unix/sysv/linux/sys/syscall.h
 	$(make-target-directory)
 	{ \
@@ -50,37 +69,30 @@
 	 echo '# error "Never use <bits/syscall.h> directly; include <sys/syscall.h> instead."'; \
 	 echo '#endif'; \
 	 echo ''; \
-	 $(CC) -E -MD -MP -MF $(@:.h=.d)-t1 -MT '$(@:.d=.h) $(@:.h=.d)' \
-	       -x c $(sysincludes) $< $(addprefix -U,$(64bit-predefine)) \
-	       $(addprefix -D,$(32bit-predefine)) -D_LIBC -dM | \
+	 $(foreach h,$(syscall-list-includes), echo '#include <$(h)>';) \
+	 echo ''; \
+	 $(foreach v,$(syscall-list-variants),\
+	 $(CC) -E -MD -MP -MF $(@:.h=.d)-t$(v) -MT '$(@:.d=.h) $(@:.h=.d)' \
+	       -x c $(sysincludes) $< $(syscall-list-$(v)-options) \
+	       -D_LIBC -dM | \
 	 sed -n 's@^#define __NR_\([^ ]*\) .*$$@#define SYS_\1 __NR_\1@p' | \
-	 LC_ALL=C sort > $(@:.d=.h).new32; \
-	 $(CC) -E -MD -MP -MF $(@:.h=.d)-t2 -MT '$(@:.d=.h) $(@:.h=.d)' \
-	       -x c $(sysincludes) $< $(addprefix -U,$(32bit-predefine)) \
-	       $(addprefix -D,$(64bit-predefine)) -D_LIBC -dM | \
-	 sed -n 's@^#define __NR_\([^ ]*\) .*$$@#define SYS_\1 __NR_\1@p' | \
-	 LC_ALL=C sort > $(@:.d=.h).new64; \
-	 if cmp -s $(@:.d=.h).new32 $(@:.d=.h).new64; then \
-	   cat $(@:.d=.h).new32; \
-	 else \
-	   echo '#include <bits/wordsize.h>'; \
-	   echo ''; \
-	   LC_ALL=C comm -12 $(@:.d=.h).new32 $(@:.d=.h).new64; \
-	   echo '#if __WORDSIZE == 64'; \
-	   LC_ALL=C comm -13 $(@:.d=.h).new32 $(@:.d=.h).new64; \
-	   echo '#else'; \
-	   LC_ALL=C comm -23 $(@:.d=.h).new32 $(@:.d=.h).new64; \
-	   echo '#endif'; \
-	 fi; \
-	 rm -f $(@:.d=.h).new32 $(@:.d=.h).new64; \
+	 LC_ALL=C sort > $(@:.d=.h).new$(v); \
+	 $(if $(syscall-list-$(v)-condition),\
+	 echo '#if $(syscall-list-$(v)-condition)';) \
+	 cat $(@:.d=.h).new$(v); \
+	 $(if $(syscall-list-$(v)-condition),echo '#endif';) \
+	 rm -f $(@:.d=.h).new$(v); \
+	 ) \
 	} > $(@:.d=.h).new
 	mv -f $(@:.d=.h).new $(@:.d=.h)
 ifneq (,$(objpfx))
-	sed $(sed-remove-objpfx) $(@:.h=.d)-t1 $(@:.h=.d)-t2 > $(@:.h=.d)-t3
+	sed $(sed-remove-objpfx) \
+	 $(foreach v,$(syscall-list-variants),$(@:.h=.d)-t$(v)) > $(@:.h=.d)-t3
 else
-	cat $(@:.h=.d)-t1 $(@:.h=.d)-t2 > $(@:.h=.d)-t3
+	cat $(foreach v,$(syscall-list-variants),$(@:.h=.d)-t$(v)) \
+	 > $(@:.h=.d)-t3
 endif
-	rm -f $(@:.h=.d)-t1 $(@:.h=.d)-t2
+	rm -f $(foreach v,$(syscall-list-variants),$(@:.h=.d)-t$(v))
 	mv -f $(@:.h=.d)-t3 $(@:.h=.d)
 
 $(inst_includedir)/bits/syscall.h: $(objpfx)syscall-list.h $(+force)

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/Makefile (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/Makefile Thu Dec 22 19:03:04 2011
@@ -1,4 +1,9 @@
-64bit-predefine = __powerpc64__
+syscall-list-variants := 32bit 64bit
+syscall-list-32bit-options := -U__powerpc64__
+syscall-list-32bit-condition := __WORDSIZE == 32
+syscall-list-64bit-options := -D__powerpc64__
+syscall-list-64bit-condition := __WORDSIZE == 64
+
 ifeq ($(subdir),rt)
 librt-routines += rt-sysdep
 endif

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/Makefile (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/Makefile Thu Dec 22 19:03:04 2011
@@ -1,4 +1,9 @@
-64bit-predefine = __s390x__
+syscall-list-variants := 32bit 64bit
+syscall-list-32bit-options := -U__s390x__
+syscall-list-32bit-condition := __WORDSIZE == 32
+syscall-list-64bit-options := -D__s390x__
+syscall-list-64bit-condition := __WORDSIZE == 64
+
 ifeq ($(subdir),rt)
 librt-routines += rt-sysdep
 endif

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/Makefile (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/Makefile Thu Dec 22 19:03:04 2011
@@ -1,4 +1,8 @@
-64bit-predefine = __sparc_v9__ __arch64__
+syscall-list-variants := 32bit 64bit
+syscall-list-32bit-options := -U__sparc_v9__ -U__arch64__
+syscall-list-32bit-condition := __WORDSIZE == 32
+syscall-list-64bit-options := -D__sparc_v9__ -D__arch64__
+syscall-list-64bit-condition := __WORDSIZE == 64
 
 ifeq ($(subdir),rt)
 librt-routines += rt-sysdep

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sys/epoll.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sys/epoll.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sys/epoll.h Thu Dec 22 19:03:04 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2006, 2007, 2008, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2008, 2010, 2011 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,9 +65,9 @@
 #define EPOLLHUP EPOLLHUP
     EPOLLRDHUP = 0x2000,
 #define EPOLLRDHUP EPOLLRDHUP
-    EPOLLONESHOT = (1 << 30),
+    EPOLLONESHOT = 1u << 30,
 #define EPOLLONESHOT EPOLLONESHOT
-    EPOLLET = (1 << 31)
+    EPOLLET = 1u << 31
 #define EPOLLET EPOLLET
   };
 

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/epoll.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/epoll.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/epoll.h Thu Dec 22 19:03:04 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2009, 2011 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,9 +65,9 @@
 #define EPOLLHUP EPOLLHUP
     EPOLLRDHUP = 0x2000,
 #define EPOLLRDHUP EPOLLRDHUP
-    EPOLLONESHOT = (1 << 30),
+    EPOLLONESHOT = 1u << 30,
 #define EPOLLONESHOT EPOLLONESHOT
-    EPOLLET = (1 << 31)
+    EPOLLET = 1u << 31
 #define EPOLLET EPOLLET
   };
 

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/Makefile (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/Makefile Thu Dec 22 19:03:04 2011
@@ -1,5 +1,8 @@
-32bit-predefine = __i386__
-64bit-predefine = __x86_64__
+syscall-list-variants := 32bit 64bit
+syscall-list-32bit-options := -D__i386__ -U__x86_64__
+syscall-list-32bit-condition := __WORDSIZE == 32
+syscall-list-64bit-options := -U__i386__ -D__x86_64__
+syscall-list-64bit-condition := __WORDSIZE == 64
 
 ifeq ($(subdir),misc)
 sysdep_routines += ioperm iopl

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h Thu Dec 22 19:03:04 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2008, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2008, 2010, 2011 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,9 +65,9 @@
 #define EPOLLHUP EPOLLHUP
     EPOLLRDHUP = 0x2000,
 #define EPOLLRDHUP EPOLLRDHUP
-    EPOLLONESHOT = (1 << 30),
+    EPOLLONESHOT = 1u << 30,
 #define EPOLLONESHOT EPOLLONESHOT
-    EPOLLET = (1 << 31)
+    EPOLLET = 1u << 31
 #define EPOLLET EPOLLET
   };
 

Modified: fsf/trunk/libc/sysdeps/x86_64/fpu/bits/fenv.h
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/fpu/bits/fenv.h (original)
+++ fsf/trunk/libc/sysdeps/x86_64/fpu/bits/fenv.h Thu Dec 22 19:03:04 2011
@@ -101,7 +101,7 @@
 __BEGIN_DECLS
 
 /* Optimized versions.  */
-extern int __NTH (__feraiseexcept_renamed (int)) __asm__ ("feraiseexcept");
+extern int __REDIRECT_NTH (__feraiseexcept_renamed, (int), feraiseexcept);
 __extern_inline int
 __NTH (feraiseexcept (int __excepts))
 {

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits