[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r10246 - in /trunk: libc/ libc/elf/ libc/localedata/ libc/localedata/locales/ libc/malloc/ libc/math/ libc/nis/ libc/nis/nss...
- To: commits@xxxxxxxxxx
- Subject: [commits] r10246 - in /trunk: libc/ libc/elf/ libc/localedata/ libc/localedata/locales/ libc/malloc/ libc/math/ libc/nis/ libc/nis/nss...
- From: joseph@xxxxxxxxxx
- Date: Wed, 14 Apr 2010 15:27:26 -0000
Author: joseph
Date: Wed Apr 14 08:27:25 2010
New Revision: 10246
Log:
Merge changes between r10202 and r10245 from /fsf/trunk.
Added:
trunk/libc/localedata/locales/cv_RU
- copied unchanged from r10245, fsf/trunk/libc/localedata/locales/cv_RU
trunk/libc/localedata/locales/sq_MK
- copied unchanged from r10245, fsf/trunk/libc/localedata/locales/sq_MK
trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_getname.c
- copied unchanged from r10245, fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_getname.c
trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_setname.c
- copied unchanged from r10245, fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/pthread_setname.c
trunk/libc/posix/bug-getopt1.c
- copied unchanged from r10245, fsf/trunk/libc/posix/bug-getopt1.c
trunk/libc/posix/bug-getopt2.c
- copied unchanged from r10245, fsf/trunk/libc/posix/bug-getopt2.c
trunk/libc/posix/bug-getopt3.c
- copied unchanged from r10245, fsf/trunk/libc/posix/bug-getopt3.c
trunk/libc/posix/bug-getopt4.c
- copied unchanged from r10245, fsf/trunk/libc/posix/bug-getopt4.c
trunk/libc/posix/bug-getopt5.c
- copied unchanged from r10245, fsf/trunk/libc/posix/bug-getopt5.c
trunk/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S
- copied unchanged from r10245, fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S
Removed:
trunk/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/aio_misc.h
Modified:
trunk/libc/ChangeLog
trunk/libc/Makerules
trunk/libc/NEWS
trunk/libc/elf/dl-cache.c
trunk/libc/elf/dl-support.c
trunk/libc/elf/elf.h
trunk/libc/localedata/ChangeLog
trunk/libc/localedata/SUPPORTED
trunk/libc/localedata/locales/ar_AE
trunk/libc/localedata/locales/ar_BH
trunk/libc/localedata/locales/ar_DZ
trunk/libc/localedata/locales/ar_EG
trunk/libc/localedata/locales/ar_IQ
trunk/libc/localedata/locales/ar_JO
trunk/libc/localedata/locales/ar_KW
trunk/libc/localedata/locales/ar_LB
trunk/libc/localedata/locales/ar_LY
trunk/libc/localedata/locales/ar_MA
trunk/libc/localedata/locales/ar_OM
trunk/libc/localedata/locales/ar_QA
trunk/libc/localedata/locales/ar_SD
trunk/libc/localedata/locales/ar_SY
trunk/libc/localedata/locales/ar_TN
trunk/libc/localedata/locales/ar_YE
trunk/libc/localedata/locales/ber_DZ
trunk/libc/localedata/locales/ber_MA
trunk/libc/localedata/locales/bn_IN
trunk/libc/localedata/locales/en_HK
trunk/libc/localedata/locales/en_IN
trunk/libc/localedata/locales/en_PH
trunk/libc/localedata/locales/en_SG
trunk/libc/localedata/locales/es_GT
trunk/libc/localedata/locales/gu_IN
trunk/libc/localedata/locales/hi_IN
trunk/libc/localedata/locales/hne_IN
trunk/libc/localedata/locales/kn_IN
trunk/libc/localedata/locales/kok_IN
trunk/libc/localedata/locales/ks_IN@devanagari
trunk/libc/localedata/locales/ml_IN
trunk/libc/localedata/locales/mr_IN
trunk/libc/localedata/locales/ms_MY
trunk/libc/localedata/locales/mt_MT
trunk/libc/localedata/locales/my_MM
trunk/libc/localedata/locales/ne_NP
trunk/libc/localedata/locales/nn_NO
trunk/libc/localedata/locales/pa_IN
trunk/libc/localedata/locales/sa_IN
trunk/libc/localedata/locales/sd_IN@devanagari
trunk/libc/localedata/locales/sq_AL
trunk/libc/localedata/locales/ta_IN
trunk/libc/localedata/locales/te_IN
trunk/libc/localedata/locales/zh_HK
trunk/libc/localedata/locales/zh_SG
trunk/libc/malloc/malloc.c
trunk/libc/math/libm-test.inc
trunk/libc/math/s_cproj.c
trunk/libc/math/s_cprojf.c
trunk/libc/math/s_cprojl.c
trunk/libc/nis/libnsl.h
trunk/libc/nis/nss
trunk/libc/nis/nss-default.c
trunk/libc/nis/nss_nis/nis-pwd.c
trunk/libc/nis/nss_nis/nis-spwd.c
trunk/libc/nptl/ChangeLog
trunk/libc/nptl/Makefile
trunk/libc/nptl/Versions
trunk/libc/nptl/sysdeps/pthread/pthread.h
trunk/libc/nscd/aicache.c
trunk/libc/nscd/nscd_stat.c
trunk/libc/posix/Makefile
trunk/libc/posix/getopt.c
trunk/libc/resolv/nss_dns/dns-host.c
trunk/libc/stdlib/tst-makecontext3.c
trunk/libc/sysdeps/ieee754/ldbl-128ibm/s_cprojl.c
trunk/libc/sysdeps/unix/sysv/linux/getlogin_r.c
trunk/libc/sysdeps/unix/sysv/linux/i386/fallocate.c
trunk/libc/sysdeps/unix/sysv/linux/i386/fallocate64.c
trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c
trunk/libc/sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c
trunk/libc/sysdeps/x86_64/multiarch/init-arch.h
trunk/ports/ChangeLog.arm
trunk/ports/sysdeps/unix/sysv/linux/arm/eabi/Makefile
trunk/ports/sysdeps/unix/sysv/linux/arm/eabi/sysdep.h
Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Wed Apr 14 08:27:25 2010
@@ -1,3 +1,123 @@
+2010-04-13 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * sysdeps/x86_64/multiarch/init-arch.h: Pretty printing.
+ Add SSE 4.1 macros.
+
+2010-04-10 Matt Fleming <matt@xxxxxxxxxxxxxxxxx>
+
+ * elf/elf.h: Add SH specific ELF header flags.
+
+2010-04-13 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c: Fix setup of
+ overflow area.
+ * sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c: Likewise.
+
+2010-04-12 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * stdlib/tst-makecontext3.c (main): Initialize ucontext_t objects
+ only with getcontext. Test for unimplemented makecontext by
+ checking errno.
+
+2010-04-09 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * nscd/aicache.c (addhstaiX): Correct passing memory to address
+ list to gethostbyname4_r functions.
+
+ * resolv/nss_dns/dns-host.c (gaih_getanswer_slice): Optimize
+ copying of h_name.
+
+2010-04-09 Roland McGrath <roland@xxxxxxxxxx>
+
+ * Makerules ($(common-objpfx)libc-abis.h): Depend on libc-abis.stamp.
+ ($(common-objpfx)libc-abis.stamp): New target, rule moved from
+ libc-abis.h target. Use a stamp file to avoid repeating no-op
+ move-if-change on every run.
+
+ * posix/Makefile (tst-chmod-ARGS): Pass $(objdir), not `pwd`.
+
+2010-04-08 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #10915]
+ * nscd/nscd_stat.c (struct statdata): Add reload_count field.
+ (send_stats): Fill in reload_count.
+ (receive_print_stats): Print reload_count.
+
+ * sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid): When
+ reading the loginuid file use a buffer which is always large enough.
+ NUL-terminate the string.
+
+ * malloc/malloc.c (_int_malloc): Return NULL if printing error message
+ returns.
+
+2010-04-07 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/i386/fallocate.c: Set errno on error.
+ * sysdeps/unix/sysv/linux/i386/fallocate64.c: Likewise.
+
+2010-04-08 Andreas Jaeger <aj@xxxxxxx>
+
+ [BZ #10401]
+ * math/s_cprojl.c (__cprojl): Fix implementation to follow C99
+ standard.
+ * math/s_cprojf.c (__cprojf): Likewise.
+ * math/s_cproj.c (__cproj): Likewise.
+ * sysdeps/ieee754/ldbl-128ibm/s_cprojl.c (__cprojl): Likewise.
+ * math/libm-test.inc (cproj_test): Fix test.
+
+2010-04-08 Roland McGrath <roland@xxxxxxxxxx>
+
+ * Makerules (libc-abis): Variable removed.
+ ($(common-objpfx)libc-abis.h): Depend on Makerules too.
+ Use automatic variables in commands.
+ Depend on first libc-abis from $(sysdirs) or $(..).
+
+2010-04-07 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * posix/bug-getopt1.c: New file.
+ * posix/bug-getopt2.c: New file.
+ * posix/bug-getopt3.c: New file.
+ * posix/bug-getopt4.c: New file.
+ * posix/bug-getopt5.c: New file.
+
+2009-12-01 Eric Blake <ebb9@xxxxxxx>
+
+ [BZ #11039]
+ * posix/getopt.c (_getopt_internal_r): Skip optional - or + before
+ checking lead byte of optstring for :.
+
+ [BZ #11040]
+ * posix/getopt.c (_getopt_internal_r): Reject '-;' as short
+ option, since it conflicts with "W;" optstring extension.
+
+2009-12-02 Eric Blake <ebb9@xxxxxxx>
+
+ [BZ #11041]
+ * posix/getopt.c (_getopt_internal_r): Handle '-Wfoo' identically
+ to '--foo', with optional argument or non-ambiguous prefix.
+
+2010-04-07 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #11134]
+ * nis/libnsl.h (NSS_FLAG_ADJUNCT_AS_SHADOW): Define.
+ * nis/nss: Document new ADJUNCT_AS_SHADOW variable.
+ * nis/nss-default.c: Handle ADJUNCT_AS_SHADOW variable.
+ * nis/nss_nis/nis-pwd.c (internal_nis_endpwent): Minor cleanups.
+ (internal_nis_getpwent_r): Don't fill in password from adjunct table
+ if NSS_FLAG_ADJUNCT_AS_SHADOW is set.
+ (_nss_nis_getpwnam_r): Likewise.
+ (_nss_nis_getpwuid_r): Likewise.
+ * nis/nss_nis/nis-spwd.c (ent_adjunct_used): New global variable.
+ (_nss_nis_setspent): Also reset ent_adjunct_used.
+ (internal_nis_getspent_r): If new_start is set and shadow.byname table
+ does not exist and NSS_FLAG_ADJUNCT_AS_SHADOW is set, try to get
+ passwd.adjunct.byname table. If new_start is not set get next entry
+ from the initially used table. Synthesize shadow.byname table if
+ necessary by adding two empty fields.
+ (_nss_nis_getspnam_r): If shadow.byname table does not exist and
+ NSS_FLAG_ADJUNCT_AS_SHADOW is set, try to get passwd.adjunct.byname
+ table and synthesize shadow.byname table.
+
2010-04-06 H.J. Lu <hongjiu.lu@xxxxxxxxx>
* Makerules (libc-abis): Add $(..) to libc-abis.
@@ -14,6 +134,10 @@
build unwind-resume code, previously in nptl/sysdeps/pthread/Makefile.
2010-04-05 Roland McGrath <roland@xxxxxxxxxx>
+
+ * elf/dl-cache.c (_dl_load_cache_lookup): Obey dl_hwcap_mask.
+
+ * elf/dl-support.c (_dl_hwcap_mask): New variable.
* elf/rtld.c (dl_main) [HAVE_AUX_VECTOR]: Add a cast.
@@ -174,6 +298,7 @@
2010-03-25 Andreas Schwab <schwab@xxxxxxxxxx>
+ [BZ #11001]
* sysdeps/posix/getaddrinfo.c (gaih_inet): Reset no_data before
each action.
@@ -958,6 +1083,7 @@
re_node_set_insert failure; return REG_ESPACE.
Patch by Paul Eggert.
+ [BZ #10864]
* bits/confname.h: Make pre-C99-safe.
2010-01-14 Ryan S. Arnold <rsa@xxxxxxxxxx>
Modified: trunk/libc/Makerules
==============================================================================
--- trunk/libc/Makerules (original)
+++ trunk/libc/Makerules Wed Apr 14 08:27:25 2010
@@ -112,14 +112,16 @@
ifndef avoid-generated
before-compile := $(common-objpfx)libc-abis.h $(before-compile)
-libc-abis := $(firstword $(wildcard $(foreach D,$(add-ons), \
- $(..)$D/libc-abis)) \
- $(..)libc-abis)
-$(common-objpfx)libc-abis.h: $(..)scripts/gen-libc-abis $(libc-abis)
- $(SHELL) $(..)scripts/gen-libc-abis \
+$(common-objpfx)libc-abis.h: $(common-objpfx)libc-abis.stamp; @:
+$(common-objpfx)libc-abis.stamp: $(..)scripts/gen-libc-abis \
+ $(firstword $(wildcard $(sysdirs:=/libc-abis)) \
+ $(..)libc-abis) \
+ $(..)Makerules
+ $(SHELL) $< \
$(base-machine)-$(config-vendor)-$(config-os) \
- < $(libc-abis) > $@T
- $(move-if-change) $@T $@
+ < $(word 2,$^) > $(@:.stamp=.h)T
+ $(move-if-change) $(@:.stamp=.h)T $(@:.stamp=.h)
+ touch $@
common-generated += $(common-objpfx)libc-abis.h
endif # avoid-generated
Modified: trunk/libc/NEWS
==============================================================================
--- trunk/libc/NEWS (original)
+++ trunk/libc/NEWS Wed Apr 14 08:27:25 2010
@@ -1,5 +1,5 @@
-GNU C Library NEWS -- history of user-visible changes. 2009-12-8
-Copyright (C) 1992-2008, 2009 Free Software Foundation, Inc.
+GNU C Library NEWS -- history of user-visible changes. 2010-4-9
+Copyright (C) 1992-2009, 2010 Free Software Foundation, Inc.
See the end for copying conditions.
Please send GNU C library bug reports via <http://sources.redhat.com/bugzilla/>
@@ -7,10 +7,45 @@
Version 2.12
+* The following bugs are resolved with this release:
+
+ 3662, 4457, 5553, 10162, 10401, 10414, 10554, 10824, 10864, 10915, 10918,
+ 10936, 10939, 10958, 10968, 10969, 10972, 10992, 11000, 11001, 11007,
+ 11010, 11027, 11039, 11040, 11041, 11043, 11046, 11056, 11070, 11093,
+ 11115, 11120, 11125, 11126, 11127, 11134, 11141, 11149, 11183, 11184,
+ 11185, 11186, 11187, 11188, 11189, 11190, 11191, 11192, 11193, 11194,
+ 11200, 11230, 11235, 11242, 11254, 11258, 11271, 11272, 11276, 11279,
+ 11287, 11292, 11319, 11332, 11333, 11387, 11389, 11390, 11394, 11397,
+ 11410, 11438, 11449, 11470, 11471
+
+* New interfaces: pthread_getname_np, pthread_setname_np
+
* New Linux interface: recvmmsg
+* STT_GNU_IFUNC implemented for Sparc by David Miller.
+
+* The dynamic linker now recognizes supported ABI versions from the
+ EI_ABIVERSION field in the ELF header.
+ Implemented by Ulrich Drepper.
+
+* New NIS mode selector ADJUNCT_AS_SHADOW. The passwd.adjunct.byname table
+ will not be used to fill in password fields in the passwd.byname replies.
+ Instead it is used to synthesize the shadow.byname table, should it be
+ missing. This is a useful mode in some installations involving Solaris.
+ Implemented by Ulrich Drepper.
+
+* New locales: kok_IN, sq_MK, cv_RU
Version 2.11
+
+* The following bugs are resolved with this release:
+
+ 3270, 7094, 9924, 9986, 10011, 10085, 10107, 10159, 10162, 10166, 10183,
+ 10195, 10196, 10200, 10203, 10207, 10211, 10213, 10217, 10221, 10229,
+ 10262, 10286, 10312, 10315, 10319, 10349, 10360, 10391, 10402, 10416,
+ 10418, 10422, 10425, 10446, 10448, 10452, 10540, 10553, 10560, 10564,
+ 10609, 10643, 10692, 10713, 10717, 10730, 10731, 10742, 10780, 10784,
+ 10789, 10817, 10823, 10840, 10847
* New interfaces: execvpe, pthread_sigqueue, mkstemps, mkstemps64, mkostemps,
mkostemps64
@@ -64,9 +99,16 @@
Implemented by Ulrich Drepper.
* New locales: ps_AF, my_MM
-
Version 2.10
+
+* The following bugs are resolved with this release:
+
+ 697, 5381, 5807, 6411, 6545, 7040, 7058, 7067, 7080, 7083, 7095, 7098,
+ 9677, 9694, 9697, 9701, 9704, 9705, 9706, 9720, 9726, 9730, 9733, 9736,
+ 9741, 9750, 9753, 9759, 9781, 9791, 9793, 9823, 9833, 9844, 9880, 9881,
+ 9891, 9893, 9895, 9913, 9916, 9920, 9948, 9955, 9957, 9963, 9985, 10052,
+ 10069, 10086, 10087, 10090, 10092, 10093, 10100, 10118, 10128
* New interfaces: preadv, preadv64, pwritev, pwritev64, malloc_info
Implemented by Ulrich Drepper.
@@ -114,9 +156,16 @@
in case of a broken server. To avoid it, users can run nscd or put
'options single-request' in /etc/resolv.conf.
Implemented by Ulrich Drepper.
-
Version 2.9
+
+* The following bugs are resolved with this release:
+
+ 3406, 5209, 5210, 5381, 5794, 5814, 5911, 6428, 6438, 6442, 6447, 6461,
+ 6472, 6505, 6544, 6589, 6612, 6634, 6653, 6654, 6657, 6698, 6712, 6713,
+ 6719, 6723, 6724, 6740, 6763, 6771, 6790, 6791, 6817, 6824, 6839, 6843,
+ 6845, 6856, 6857, 6860, 6867, 6875, 6919, 6920, 6942, 6947, 6955, 6966,
+ 6968, 6974, 6980, 6995, 7008, 7009, 7029
* Unified lookup for getaddrinfo: IPv4 and IPv6 addresses are now looked
up at the same time. Implemented by Ulrich Drepper.
@@ -155,6 +204,16 @@
Version 2.8
+* The following bugs are resolved with this release:
+
+ 2549, 3112, 4314, 4407, 4997, 5012, 5040, 5112, 5204, 5208, 5209, 5220,
+ 5222, 5224, 5225, 5237, 5238, 5240, 5245, 5277, 5346, 5375, 5378, 5382,
+ 5424, 5427, 5428, 5435, 5436, 5439, 5441, 5442, 5443, 5451, 5452, 5454,
+ 5455, 5463, 5464, 5465, 5475, 5477, 5478, 5520, 5541, 5545, 5553, 5600,
+ 5602, 5607, 5614, 5627, 5628, 5736, 5737, 5741, 5753, 5760, 5762, 5768,
+ 5774, 5777, 5778, 5779, 5786, 5790, 5818, 5854, 5857, 5903, 5939, 5979,
+ 5983, 5995, 5998, 6004, 6007, 6020, 6021, 6024, 6040, 6042
+
* New locales: bo_CN, bo_IN, shs_CA.
* New encoding: HP-ROMAN9, HP-GREEK8, HP-THAI8, HP-TURKISH8.
@@ -188,6 +247,14 @@
Version 2.7
+* The following bugs are resolved with this release:
+
+ 4125, 4126, 4178, 4359, 4407, 4512, 4514, 4525, 4554, 4556, 4557, 4566,
+ 4582, 4586, 4588, 4599, 4610, 4647, 4702, 4705, 4726, 4745, 4772, 4773,
+ 4775, 4776, 4792, 4813, 4814, 4816, 4833, 4858, 4860, 4896, 4905, 4925,
+ 4936, 4937, 4938, 4941, 4946, 4963, 4972, 5010, 5028, 5043, 5058, 5063,
+ 5071, 5103, 5104, 5112, 5113, 5184, 5186
+
* More checking functions: fread, fread_unlocked, open*, mq_open.
Implemented by Jakub Jelinek and Ulrich Drepper.
@@ -228,14 +295,36 @@
Version 2.6
+* The following bugs are resolved with this release:
+
+ 3156, 3213, 3285, 3291, 3306, 3313, 3320, 3322, 3325, 3326, 3334, 3348,
+ 3352, 3363, 3369, 3426, 3427, 3429, 3451, 3458, 3465, 3480, 3483, 3493,
+ 3514, 3515, 3559, 3632, 3664, 3673, 3674, 3745, 3747, 3818, 3840, 3842,
+ 3851, 3855, 3884, 3885, 3902, 3905, 3919, 3944, 3954, 3955, 3957, 3991,
+ 3995, 3996, 4024, 4040, 4069, 4070, 4074, 4076, 4096, 4101, 4102, 4114,
+ 4130, 4131, 4181, 4276, 4306, 4342, 4344, 4349, 4364, 4368, 4381, 4392,
+ 4403, 4405, 4406, 4411, 4438, 4439, 4455, 4456, 4465, 4512, 4514, 4586,
+ 4702, 4858
+
* New Linux interfaces: epoll_pwait, sched_getcpu.
* New generic interfaces: strerror_l.
* nscd can now cache the services database. Implemented by Ulrich Drepper.
-
Version 2.5
+
+* The following bugs are resolved with this release:
+
+ 39, 68, 192, 352, 388, 531, 935, 1006, 1201, 1203, 1386, 1782, 1783, 1784,
+ 1785, 1786, 1787, 1951, 1974, 1996, 2072, 2098, 2125, 2134, 2158, 2182,
+ 2349, 2376, 2386, 2389, 2415, 2418, 2420, 2423, 2450, 2451, 2466, 2472,
+ 2473, 2477, 2498, 2499, 2501, 2502, 2505, 2507, 2508, 2509, 2517, 2526,
+ 2569, 2571, 2592, 2611, 2625, 2632, 2644, 2662, 2680, 2683, 2684, 2693,
+ 2695, 2703, 2734, 2751, 2764, 2766, 2775, 2792, 2821, 2823, 2832, 2841,
+ 2843, 2883, 2892, 2908, 2914, 2926, 2961, 2978, 2980, 2987, 2997, 2998,
+ 3013, 3018, 3034, 3040, 3044, 3123, 3124, 3137, 3138, 3143, 3155, 3189,
+ 3225, 3251, 3252, 3253, 3273
* For Linux, the sorting of addresses returned by getaddrinfo now also
handles rules 3, 4, and 7 from RFC 3484. I.e., all rules are handled.
Modified: trunk/libc/elf/dl-cache.c
==============================================================================
--- trunk/libc/elf/dl-cache.c (original)
+++ trunk/libc/elf/dl-cache.c Wed Apr 14 08:27:25 2010
@@ -1,5 +1,6 @@
/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
- Copyright (C) 1996-2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1996-2002,2003,2004,2006,2010
+ 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
@@ -255,17 +256,19 @@
if (platform != (uint64_t) -1)
platform = 1ULL << platform;
+#define _DL_HWCAP_TLS_MASK (1LL << 63)
+ uint64_t hwcap_exclude = ~((GLRO(dl_hwcap) & GLRO(dl_hwcap_mask))
+ | _DL_HWCAP_PLATFORM | _DL_HWCAP_TLS_MASK);
+
/* Only accept hwcap if it's for the right platform. */
-#define _DL_HWCAP_TLS_MASK (1LL << 63)
#define HWCAP_CHECK \
+ if (lib->hwcap & hwcap_exclude) \
+ continue; \
if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion)) \
continue; \
if (_DL_PLATFORMS_COUNT \
&& (lib->hwcap & _DL_HWCAP_PLATFORM) != 0 \
&& (lib->hwcap & _DL_HWCAP_PLATFORM) != platform) \
- continue; \
- if (lib->hwcap \
- & ~(GLRO(dl_hwcap) | _DL_HWCAP_PLATFORM | _DL_HWCAP_TLS_MASK)) \
continue
SEARCH_CACHE (cache_new);
}
Modified: trunk/libc/elf/dl-support.c
==============================================================================
--- trunk/libc/elf/dl-support.c (original)
+++ trunk/libc/elf/dl-support.c Wed Apr 14 08:27:25 2010
@@ -1,5 +1,5 @@
/* Support for dynamic linking code in static libc.
- Copyright (C) 1996-2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1996-2008,2009,2010 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
@@ -128,6 +128,14 @@
size_t _dl_phnum;
uint64_t _dl_hwcap __attribute__ ((nocommon));
+/* This is not initialized to HWCAP_IMPORTANT, matching the definition
+ of _dl_important_hwcaps, below, where no hwcap strings are ever
+ used. This mask is still used to mediate the lookups in the cache
+ file. Since there is no way to set this nonzero (we don't grok the
+ LD_HWCAP_MASK environment variable here), there is no real point in
+ setting _dl_hwcap nonzero below, but we do anyway. */
+uint64_t _dl_hwcap_mask __attribute__ ((nocommon));
+
/* Prevailing state of the stack, PF_X indicating it's executable. */
ElfW(Word) _dl_stack_flags = PF_R|PF_W|PF_X;
Modified: trunk/libc/elf/elf.h
==============================================================================
--- trunk/libc/elf/elf.h (original)
+++ trunk/libc/elf/elf.h Wed Apr 14 08:27:25 2010
@@ -2477,6 +2477,30 @@
/* SH specific declarations */
+/* Processor specific flags for the ELF header e_flags field. */
+#define EF_SH_MACH_MASK 0x1f
+#define EF_SH_UNKNOWN 0x0
+#define EF_SH1 0x1
+#define EF_SH2 0x2
+#define EF_SH3 0x3
+#define EF_SH_DSP 0x4
+#define EF_SH3_DSP 0x5
+#define EF_SH4AL_DSP 0x6
+#define EF_SH3E 0x8
+#define EF_SH4 0x9
+#define EF_SH2E 0xb
+#define EF_SH4A 0xc
+#define EF_SH2A 0xd
+#define EF_SH4_NOFPU 0x10
+#define EF_SH4A_NOFPU 0x11
+#define EF_SH4_NOMMU_NOFPU 0x12
+#define EF_SH2A_NOFPU 0x13
+#define EF_SH3_NOMMU 0x14
+#define EF_SH2A_SH4_NOFPU 0x15
+#define EF_SH2A_SH3_NOFPU 0x16
+#define EF_SH2A_SH4 0x17
+#define EF_SH2A_SH3E 0x18
+
/* SH relocs. */
#define R_SH_NONE 0
#define R_SH_DIR32 1
Modified: trunk/libc/localedata/ChangeLog
==============================================================================
--- trunk/libc/localedata/ChangeLog (original)
+++ trunk/libc/localedata/ChangeLog Wed Apr 14 08:27:25 2010
@@ -1,3 +1,72 @@
+2010-04-08 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * locales/ar_AE: Fix typo.
+ * locales/ar_BH: Likewise.
+ * locales/ar_DZ: Likewise.
+ * locales/ar_EG: Likewise.
+ * locales/ar_IQ: Likewise.
+ * locales/ar_JO: Likewise.
+ * locales/ar_KW: Likewise.
+ * locales/ar_LB: Likewise.
+ * locales/ar_LY: Likewise.
+ * locales/ar_MA: Likewise.
+ * locales/ar_OM: Likewise.
+ * locales/ar_QA: Likewise.
+ * locales/ar_SD: Likewise.
+ * locales/ar_SY: Likewise.
+ * locales/ar_TN: Likewise.
+ * locales/ar_YE: Likewise.
+ * locales/ber_DZ: Likewise.
+ * locales/ber_MA: Likewise.
+ * locales/bn_IN: Likewise.
+ * locales/en_HK: Likewise.
+ * locales/en_IN: Likewise.
+ * locales/en_PH: Likewise.
+ * locales/en_SG: Likewise.
+ * locales/gu_IN: Likewise.
+ * locales/hi_IN: Likewise.
+ * locales/hne_IN: Likewise.
+ * locales/kn_IN: Likewise.
+ * locales/kok_IN: Likewise.
+ * locales/ks_IN@devanagari: Likewise.
+ * locales/ml_IN: Likewise.
+ * locales/mr_IN: Likewise.
+ * locales/ms_MY: Likewise.
+ * locales/mt_MT: Likewise.
+ * locales/my_MM: Likewise.
+ * locales/ne_NP: Likewise.
+ * locales/nn_NO: Likewise.
+ * locales/pa_IN: Likewise.
+ * locales/sa_IN: Likewise.
+ * locales/sd_IN@devanagari: Likewise.
+ * locales/sq_AL: Likewise.
+ * locales/sq_MK: Likewise.
+ * locales/ta_IN: Likewise.
+ * locales/te_IN: Likewise.
+ * locales/zh_HK: Likewise.
+ * locales/zh_SG: Likewise.
+
+ * SUPPORTED (SUPPORTED-LOCALES): Add cv_RU.
+
+ [BZ #10824]
+ * locales/cv_RU: New file.
+ Contributed by Adi Roiban <adi@xxxxxxxxx>.
+
+ [BZ #10936]
+ * locales/es_GT: Change paper size to letter.
+
+ * SUPPORTED (SUPPORTED-LOCALES): Add kok_IN and sq_MK.
+
+ [BZ #11470]
+ * locales/sq_MK: New file.
+ Contributed by Agron Selimaj <linuxmaster@xxxxxxxxxxx>.
+
+2010-04-07 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #11471]
+ * locales/sq_AL: Fix Mr. Mrs. Ms. and Miss.
+ Patch by Agron Selimaj <linuxmaster@xxxxxxxxxxx>.
+
2010-04-05 Ulrich Drepper <drepper@xxxxxxxxxx>
[BZ #11007]
Modified: trunk/libc/localedata/SUPPORTED
==============================================================================
--- trunk/libc/localedata/SUPPORTED (original)
+++ trunk/libc/localedata/SUPPORTED Wed Apr 14 08:27:25 2010
@@ -80,6 +80,7 @@
cs_CZ.UTF-8/UTF-8 \
cs_CZ/ISO-8859-2 \
csb_PL/UTF-8 \
+cv_RU/UTF-8 \
cy_GB.UTF-8/UTF-8 \
cy_GB/ISO-8859-14 \
da_DK.UTF-8/UTF-8 \
@@ -259,6 +260,7 @@
kn_IN/UTF-8 \
ko_KR.EUC-KR/EUC-KR \
ko_KR.UTF-8/UTF-8 \
+kok_IN/UTF-8 \
ks_IN/UTF-8 \
ks_IN@devanagari/UTF-8 \
ku_TR.UTF-8/UTF-8 \
@@ -353,6 +355,7 @@
so_SO/ISO-8859-1 \
sq_AL.UTF-8/UTF-8 \
sq_AL/ISO-8859-1 \
+sq_MK/UTF-8 \
sr_ME/UTF-8 \
sr_RS/UTF-8 \
sr_RS@latin/UTF-8 \
Modified: trunk/libc/localedata/locales/ar_AE
==============================================================================
--- trunk/libc/localedata/locales/ar_AE (original)
+++ trunk/libc/localedata/locales/ar_AE Wed Apr 14 08:27:25 2010
@@ -44,7 +44,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0041><U0045><U0044><U0020>"
@@ -75,7 +75,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ar_BH
==============================================================================
--- trunk/libc/localedata/locales/ar_BH (original)
+++ trunk/libc/localedata/locales/ar_BH Wed Apr 14 08:27:25 2010
@@ -45,7 +45,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0042><U0048><U0044><U0020>"
@@ -79,7 +79,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ar_DZ
==============================================================================
--- trunk/libc/localedata/locales/ar_DZ (original)
+++ trunk/libc/localedata/locales/ar_DZ Wed Apr 14 08:27:25 2010
@@ -44,7 +44,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0044><U005A><U0044><U0020>"
@@ -78,7 +78,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ar_EG
==============================================================================
--- trunk/libc/localedata/locales/ar_EG (original)
+++ trunk/libc/localedata/locales/ar_EG Wed Apr 14 08:27:25 2010
@@ -48,7 +48,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0045><U0047><U0050><U0020>"
@@ -82,7 +82,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ar_IQ
==============================================================================
--- trunk/libc/localedata/locales/ar_IQ (original)
+++ trunk/libc/localedata/locales/ar_IQ Wed Apr 14 08:27:25 2010
@@ -44,7 +44,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0049><U0051><U0044><U0020>"
@@ -78,7 +78,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ar_JO
==============================================================================
--- trunk/libc/localedata/locales/ar_JO (original)
+++ trunk/libc/localedata/locales/ar_JO Wed Apr 14 08:27:25 2010
@@ -45,7 +45,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U004A><U004F><U0044><U0020>"
@@ -79,7 +79,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ar_KW
==============================================================================
--- trunk/libc/localedata/locales/ar_KW (original)
+++ trunk/libc/localedata/locales/ar_KW Wed Apr 14 08:27:25 2010
@@ -44,7 +44,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U004B><U0057><U0044><U0020>"
@@ -78,7 +78,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ar_LB
==============================================================================
--- trunk/libc/localedata/locales/ar_LB (original)
+++ trunk/libc/localedata/locales/ar_LB Wed Apr 14 08:27:25 2010
@@ -44,7 +44,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U004C><U0042><U0050><U0020>"
@@ -78,7 +78,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ar_LY
==============================================================================
--- trunk/libc/localedata/locales/ar_LY (original)
+++ trunk/libc/localedata/locales/ar_LY Wed Apr 14 08:27:25 2010
@@ -44,7 +44,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U004C><U0059><U0044><U0020>"
@@ -78,7 +78,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ar_MA
==============================================================================
--- trunk/libc/localedata/locales/ar_MA (original)
+++ trunk/libc/localedata/locales/ar_MA Wed Apr 14 08:27:25 2010
@@ -44,7 +44,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U004D><U0041><U0044><U0020>"
@@ -78,7 +78,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ar_OM
==============================================================================
--- trunk/libc/localedata/locales/ar_OM (original)
+++ trunk/libc/localedata/locales/ar_OM Wed Apr 14 08:27:25 2010
@@ -44,7 +44,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U004F><U004D><U0052><U0020>"
@@ -78,7 +78,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ar_QA
==============================================================================
--- trunk/libc/localedata/locales/ar_QA (original)
+++ trunk/libc/localedata/locales/ar_QA Wed Apr 14 08:27:25 2010
@@ -44,7 +44,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0051><U0041><U0052><U0020>"
@@ -78,7 +78,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ar_SD
==============================================================================
--- trunk/libc/localedata/locales/ar_SD (original)
+++ trunk/libc/localedata/locales/ar_SD Wed Apr 14 08:27:25 2010
@@ -44,7 +44,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0053><U0044><U0044><U0020>"
@@ -78,7 +78,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ar_SY
==============================================================================
--- trunk/libc/localedata/locales/ar_SY (original)
+++ trunk/libc/localedata/locales/ar_SY Wed Apr 14 08:27:25 2010
@@ -44,7 +44,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0053><U0059><U0050><U0020>"
@@ -78,7 +78,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ar_TN
==============================================================================
--- trunk/libc/localedata/locales/ar_TN (original)
+++ trunk/libc/localedata/locales/ar_TN Wed Apr 14 08:27:25 2010
@@ -44,7 +44,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0054><U004E><U0044><U0020>"
@@ -78,7 +78,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ar_YE
==============================================================================
--- trunk/libc/localedata/locales/ar_YE (original)
+++ trunk/libc/localedata/locales/ar_YE Wed Apr 14 08:27:25 2010
@@ -44,7 +44,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0059><U0045><U0052><U0020>"
@@ -78,7 +78,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ber_DZ
==============================================================================
--- trunk/libc/localedata/locales/ber_DZ (original)
+++ trunk/libc/localedata/locales/ber_DZ Wed Apr 14 08:27:25 2010
@@ -175,7 +175,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0044><U005A><U0044><U0020>"
Modified: trunk/libc/localedata/locales/ber_MA
==============================================================================
--- trunk/libc/localedata/locales/ber_MA (original)
+++ trunk/libc/localedata/locales/ber_MA Wed Apr 14 08:27:25 2010
@@ -95,7 +95,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U004D><U0041><U0044><U0020>"
Modified: trunk/libc/localedata/locales/bn_IN
==============================================================================
--- trunk/libc/localedata/locales/bn_IN (original)
+++ trunk/libc/localedata/locales/bn_IN Wed Apr 14 08:27:25 2010
@@ -84,7 +84,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/en_HK
==============================================================================
--- trunk/libc/localedata/locales/en_HK (original)
+++ trunk/libc/localedata/locales/en_HK Wed Apr 14 08:27:25 2010
@@ -84,7 +84,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% Abbreviated weekday names (%a)
@@ -139,7 +139,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% ^[yY]
Modified: trunk/libc/localedata/locales/en_IN
==============================================================================
--- trunk/libc/localedata/locales/en_IN (original)
+++ trunk/libc/localedata/locales/en_IN Wed Apr 14 08:27:25 2010
@@ -83,7 +83,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% Abbreviated weekday names (%a)
@@ -138,7 +138,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% ^[yY]
Modified: trunk/libc/localedata/locales/en_PH
==============================================================================
--- trunk/libc/localedata/locales/en_PH (original)
+++ trunk/libc/localedata/locales/en_PH Wed Apr 14 08:27:25 2010
@@ -84,7 +84,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% Abbreviated weekday names (%a)
@@ -139,7 +139,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% ^[yY]
Modified: trunk/libc/localedata/locales/en_SG
==============================================================================
--- trunk/libc/localedata/locales/en_SG (original)
+++ trunk/libc/localedata/locales/en_SG Wed Apr 14 08:27:25 2010
@@ -82,7 +82,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% Abbreviated weekday names (%a)
@@ -137,7 +137,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% ^[yY]
Modified: trunk/libc/localedata/locales/es_GT
==============================================================================
--- trunk/libc/localedata/locales/es_GT (original)
+++ trunk/libc/localedata/locales/es_GT Wed Apr 14 08:27:25 2010
@@ -15,7 +15,6 @@
% Date: 1997-11-05
% Application: general
% Users: general
-% Repertoiremap: mnemonic.ds
% Charset: ISO-8859-1
% Distribution and use is free, also
% for commercial purposes.
@@ -86,34 +85,34 @@
LC_TIME
abday "<U0064><U006F><U006D>";"<U006C><U0075><U006E>";/
- "<U006D><U0061><U0072>";"<U006D><U0069><U00E9>";/
- "<U006A><U0075><U0065>";"<U0076><U0069><U0065>";/
- "<U0073><U00E1><U0062>"
+ "<U006D><U0061><U0072>";"<U006D><U0069><U00E9>";/
+ "<U006A><U0075><U0065>";"<U0076><U0069><U0065>";/
+ "<U0073><U00E1><U0062>"
day "<U0064><U006F><U006D><U0069><U006E><U0067><U006F>";/
- "<U006C><U0075><U006E><U0065><U0073>";/
- "<U006D><U0061><U0072><U0074><U0065><U0073>";/
- "<U006D><U0069><U00E9><U0072><U0063><U006F><U006C><U0065><U0073>";/
- "<U006A><U0075><U0065><U0076><U0065><U0073>";/
- "<U0076><U0069><U0065><U0072><U006E><U0065><U0073>";/
- "<U0073><U00E1><U0062><U0061><U0064><U006F>"
+ "<U006C><U0075><U006E><U0065><U0073>";/
+ "<U006D><U0061><U0072><U0074><U0065><U0073>";/
+ "<U006D><U0069><U00E9><U0072><U0063><U006F><U006C><U0065><U0073>";/
+ "<U006A><U0075><U0065><U0076><U0065><U0073>";/
+ "<U0076><U0069><U0065><U0072><U006E><U0065><U0073>";/
+ "<U0073><U00E1><U0062><U0061><U0064><U006F>"
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>"
+ "<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>"
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>"
+ "<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>"
@@ -125,10 +124,8 @@
END LC_TIME
LC_PAPER
-% FIXME
-height 297
-% FIXME
-width 210
+height 279
+width 216
END LC_PAPER
LC_TELEPHONE
Modified: trunk/libc/localedata/locales/gu_IN
==============================================================================
--- trunk/libc/localedata/locales/gu_IN (original)
+++ trunk/libc/localedata/locales/gu_IN Wed Apr 14 08:27:25 2010
@@ -67,7 +67,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0049><U004E><U0052><U0020>"
@@ -95,7 +95,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/hi_IN
==============================================================================
--- trunk/libc/localedata/locales/hi_IN (original)
+++ trunk/libc/localedata/locales/hi_IN Wed Apr 14 08:27:25 2010
@@ -65,7 +65,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0049><U004E><U0052><U0020>"
@@ -99,7 +99,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/hne_IN
==============================================================================
--- trunk/libc/localedata/locales/hne_IN (original)
+++ trunk/libc/localedata/locales/hne_IN Wed Apr 14 08:27:25 2010
@@ -51,7 +51,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/kn_IN
==============================================================================
--- trunk/libc/localedata/locales/kn_IN (original)
+++ trunk/libc/localedata/locales/kn_IN Wed Apr 14 08:27:25 2010
@@ -67,7 +67,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0049><U004E><U0052><U0020>"
@@ -100,7 +100,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/kok_IN
==============================================================================
--- trunk/libc/localedata/locales/kok_IN (original)
+++ trunk/libc/localedata/locales/kok_IN Wed Apr 14 08:27:25 2010
@@ -75,7 +75,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% Abbreviated weekday names (%a)
@@ -152,7 +152,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% ^(Yes|[yY])
Modified: trunk/libc/localedata/locales/ks_IN@devanagari
==============================================================================
--- trunk/libc/localedata/locales/ks_IN@devanagari (original)
+++ trunk/libc/localedata/locales/ks_IN@devanagari Wed Apr 14 08:27:25 2010
@@ -51,7 +51,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ml_IN
==============================================================================
--- trunk/libc/localedata/locales/ml_IN (original)
+++ trunk/libc/localedata/locales/ml_IN Wed Apr 14 08:27:25 2010
@@ -98,7 +98,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% Abbreviated weekday names (%a)
@@ -168,7 +168,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% ^[\u0d05\u0d24\u0d46]
Modified: trunk/libc/localedata/locales/mr_IN
==============================================================================
--- trunk/libc/localedata/locales/mr_IN (original)
+++ trunk/libc/localedata/locales/mr_IN Wed Apr 14 08:27:25 2010
@@ -96,7 +96,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% Abbreviated weekday names (%a)
@@ -176,7 +176,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% ^(Yes|[yY])
Modified: trunk/libc/localedata/locales/ms_MY
==============================================================================
--- trunk/libc/localedata/locales/ms_MY (original)
+++ trunk/libc/localedata/locales/ms_MY Wed Apr 14 08:27:25 2010
@@ -90,7 +90,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% Abbreviated weekday names (%a)
@@ -145,7 +145,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% ^[yY]
Modified: trunk/libc/localedata/locales/mt_MT
==============================================================================
--- trunk/libc/localedata/locales/mt_MT (original)
+++ trunk/libc/localedata/locales/mt_MT Wed Apr 14 08:27:25 2010
@@ -166,7 +166,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% Abbreviated weekday names (%a)
@@ -240,7 +240,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% ^(Yes|[yY])
Modified: trunk/libc/localedata/locales/my_MM
==============================================================================
--- trunk/libc/localedata/locales/my_MM (original)
+++ trunk/libc/localedata/locales/my_MM Wed Apr 14 08:27:25 2010
@@ -98,7 +98,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/ne_NP
==============================================================================
--- trunk/libc/localedata/locales/ne_NP (original)
+++ trunk/libc/localedata/locales/ne_NP Wed Apr 14 08:27:25 2010
@@ -45,7 +45,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0049><U004E><U0052><U0020>"
@@ -79,7 +79,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/nn_NO
==============================================================================
--- trunk/libc/localedata/locales/nn_NO (original)
+++ trunk/libc/localedata/locales/nn_NO Wed Apr 14 08:27:25 2010
@@ -42,7 +42,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U004E><U004F><U004B><U0020>"
@@ -71,7 +71,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/pa_IN
==============================================================================
--- trunk/libc/localedata/locales/pa_IN (original)
+++ trunk/libc/localedata/locales/pa_IN Wed Apr 14 08:27:25 2010
@@ -91,7 +91,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/sa_IN
==============================================================================
--- trunk/libc/localedata/locales/sa_IN (original)
+++ trunk/libc/localedata/locales/sa_IN Wed Apr 14 08:27:25 2010
@@ -48,7 +48,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0049><U004E><U0052><U0020>"
@@ -82,7 +82,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/sd_IN@devanagari
==============================================================================
--- trunk/libc/localedata/locales/sd_IN@devanagari (original)
+++ trunk/libc/localedata/locales/sd_IN@devanagari Wed Apr 14 08:27:25 2010
@@ -79,7 +79,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% Abbreviated weekday names (%a)
Modified: trunk/libc/localedata/locales/sq_AL
==============================================================================
--- trunk/libc/localedata/locales/sq_AL (original)
+++ trunk/libc/localedata/locales/sq_AL Wed Apr 14 08:27:25 2010
@@ -189,7 +189,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0041><U004C><U004C><U0020>"
@@ -223,46 +223,46 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Abbreviated weekday names (%a)
abday "<U0044><U0069><U0065><U0020>";"<U0048><U00EB><U006E><U0020>";/
- "<U004D><U0061><U0072><U0020>";"<U004D><U00EB><U0072><U0020>";/
- "<U0045><U006E><U006A><U0020>";"<U0050><U0072><U0065><U0020>";/
- "<U0053><U0068><U0074><U0020>"
+ "<U004D><U0061><U0072><U0020>";"<U004D><U00EB><U0072><U0020>";/
+ "<U0045><U006E><U006A><U0020>";"<U0050><U0072><U0065><U0020>";/
+ "<U0053><U0068><U0074><U0020>"
%
% Full weekday names (%A)
day "<U0065><U0020><U0064><U0069><U0065><U006C><U0020>";/
- "<U0065><U0020><U0068><U00EB><U006E><U00EB><U0020>";/
- "<U0065><U0020><U006D><U0061><U0072><U0074><U00EB><U0020>";/
- "<U0065><U0020><U006D><U00EB><U0072><U006B><U0075><U0072>/
+ "<U0065><U0020><U0068><U00EB><U006E><U00EB><U0020>";/
+ "<U0065><U0020><U006D><U0061><U0072><U0074><U00EB><U0020>";/
+ "<U0065><U0020><U006D><U00EB><U0072><U006B><U0075><U0072>/
<U00EB><U0020>";/
- "<U0065><U0020><U0065><U006E><U006A><U0074><U0065><U0020>";/
- "<U0065><U0020><U0070><U0072><U0065><U006D><U0074><U0065><U0020>";/
- "<U0065><U0020><U0073><U0068><U0074><U0075><U006E><U00EB><U0020>"
+ "<U0065><U0020><U0065><U006E><U006A><U0074><U0065><U0020>";/
+ "<U0065><U0020><U0070><U0072><U0065><U006D><U0074><U0065><U0020>";/
+ "<U0065><U0020><U0073><U0068><U0074><U0075><U006E><U00EB><U0020>"
%
% Abbreviated month names (%b)
abmon "<U004A><U0061><U006E>";"<U0053><U0068><U006B>";/
- "<U004D><U0061><U0072>";"<U0050><U0072><U0069>";/
- "<U004D><U0061><U006A>";"<U0051><U0065><U0072>";/
- "<U004B><U006F><U0072>";"<U0047><U0073><U0068>";/
- "<U0053><U0068><U0074>";"<U0054><U0065><U0074>";/
- "<U004E><U00EB><U006E>";"<U0044><U0068><U006A>"
+ "<U004D><U0061><U0072>";"<U0050><U0072><U0069>";/
+ "<U004D><U0061><U006A>";"<U0051><U0065><U0072>";/
+ "<U004B><U006F><U0072>";"<U0047><U0073><U0068>";/
+ "<U0053><U0068><U0074>";"<U0054><U0065><U0074>";/
+ "<U004E><U00EB><U006E>";"<U0044><U0068><U006A>"
%
% Full month names (%B)
mon "<U006A><U0061><U006E><U0061><U0072>";/
- "<U0073><U0068><U006B><U0075><U0072><U0074>";/
- "<U006D><U0061><U0072><U0073>";/
- "<U0070><U0072><U0069><U006C><U006C>";/
- "<U006D><U0061><U006A>";/
- "<U0071><U0065><U0072><U0073><U0068><U006F><U0072>";/
- "<U006B><U006F><U0072><U0072><U0069><U006B>";/
- "<U0067><U0075><U0073><U0068><U0074>";/
- "<U0073><U0068><U0074><U0061><U0074><U006F><U0072>";/
- "<U0074><U0065><U0074><U006F><U0072>";/
- "<U006E><U00EB><U006E><U0074><U006F><U0072>";/
- "<U0064><U0068><U006A><U0065><U0074><U006F><U0072>"
+ "<U0073><U0068><U006B><U0075><U0072><U0074>";/
+ "<U006D><U0061><U0072><U0073>";/
+ "<U0070><U0072><U0069><U006C><U006C>";/
+ "<U006D><U0061><U006A>";/
+ "<U0071><U0065><U0072><U0073><U0068><U006F><U0072>";/
+ "<U006B><U006F><U0072><U0072><U0069><U006B>";/
+ "<U0067><U0075><U0073><U0068><U0074>";/
+ "<U0073><U0068><U0074><U0061><U0074><U006F><U0072>";/
+ "<U0074><U0065><U0074><U006F><U0072>";/
+ "<U006E><U00EB><U006E><U0074><U006F><U0072>";/
+ "<U0064><U0068><U006A><U0065><U0074><U006F><U0072>"
%
% Equivalent of AM PM
am_pm "<U0050><U0044>";"<U004D><U0044>"
@@ -315,10 +315,10 @@
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>"
+name_mr "<U005A><U002E>"
+name_mrs "<U005A><U006E><U006A><U002E>"
+name_miss "<U005A><U0073><U0068><U002E>"
+name_ms "<U005A><U006E><U006A><U002E>"
END LC_NAME
Modified: trunk/libc/localedata/locales/ta_IN
==============================================================================
--- trunk/libc/localedata/locales/ta_IN (original)
+++ trunk/libc/localedata/locales/ta_IN Wed Apr 14 08:27:25 2010
@@ -105,7 +105,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% Abbreviated weekday names (%a)
@@ -160,7 +160,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
yesexpr "<U005E><U005B><U0B86><U0BAE><U0BCD><U0079><U0059><U005D>"
Modified: trunk/libc/localedata/locales/te_IN
==============================================================================
--- trunk/libc/localedata/locales/te_IN (original)
+++ trunk/libc/localedata/locales/te_IN Wed Apr 14 08:27:25 2010
@@ -104,7 +104,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% Abbreviated weekday names (%a)
@@ -162,7 +162,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% Syntax on Unicode Regular Expression Guidelines TR#18
Modified: trunk/libc/localedata/locales/zh_HK
==============================================================================
--- trunk/libc/localedata/locales/zh_HK (original)
+++ trunk/libc/localedata/locales/zh_HK Wed Apr 14 08:27:25 2010
@@ -44,7 +44,7 @@
LC_MONETARY
% This is the POSIX Locale definition the LC_MONETARY category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
int_curr_symbol "<U0048><U004B><U0044><U0020>"
@@ -78,7 +78,7 @@
LC_TIME
% This is the POSIX Locale definition for the LC_TIME category.
-% These are generated based on XML base Locale difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode/Java
%
% Removed trailing space, by Anthony Fok <anthony@xxxxxxxxxxxxx>, Feb 2002
Modified: trunk/libc/localedata/locales/zh_SG
==============================================================================
--- trunk/libc/localedata/locales/zh_SG (original)
+++ trunk/libc/localedata/locales/zh_SG Wed Apr 14 08:27:25 2010
@@ -81,7 +81,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% Abbreviated weekday names (%a)
@@ -136,7 +136,7 @@
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 difintion file
+% These are generated based on XML base Locale definition file
% for IBM Class for Unicode.
%
% ^[yY]
Modified: trunk/libc/malloc/malloc.c
==============================================================================
--- trunk/libc/malloc/malloc.c (original)
+++ trunk/libc/malloc/malloc.c Wed Apr 14 08:27:25 2010
@@ -4306,6 +4306,7 @@
errstr = "malloc(): memory corruption (fast)";
errout:
malloc_printerr (check_action, errstr, chunk2mem (victim));
+ return NULL;
}
#ifndef ATOMIC_FASTBINS
*fb = victim->fd;
Modified: trunk/libc/math/libm-test.inc
==============================================================================
--- trunk/libc/math/libm-test.inc (original)
+++ trunk/libc/math/libm-test.inc Wed Apr 14 08:27:25 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2006, 2007, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@xxxxxxx>, 1997.
@@ -2095,7 +2095,7 @@
TEST_c_c (cproj, minus_infty, minus_infty, plus_infty, minus_zero);
TEST_c_c (cproj, 1.0, 0.0, 1.0, 0.0);
- TEST_c_c (cproj, 2.0, 3.0, 0.2857142857142857142857142857142857L, 0.42857142857142857142857142857142855L);
+ TEST_c_c (cproj, 2.0, 3.0, 2.0, 3.0);
END (cproj, complex);
}
Modified: trunk/libc/math/s_cproj.c
==============================================================================
--- trunk/libc/math/s_cproj.c (original)
+++ trunk/libc/math/s_cproj.c Wed Apr 14 08:27:25 2010
@@ -1,5 +1,5 @@
/* Compute projection of complex double value to Riemann sphere.
- Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
@@ -25,24 +25,19 @@
__complex__ double
__cproj (__complex__ double x)
{
- __complex__ double res;
-
if (isnan (__real__ x) && isnan (__imag__ x))
return x;
else if (!isfinite (__real__ x) || !isfinite (__imag__ x))
{
+ __complex__ double res;
+
__real__ res = INFINITY;
__imag__ res = __copysign (0.0, __imag__ x);
- }
- else
- {
- double den = __real__ x * __real__ x + __imag__ x * __imag__ x + 1.0;
- __real__ res = (2.0 * __real__ x) / den;
- __imag__ res = (2.0 * __imag__ x) / den;
+ return res;
}
- return res;
+ return x;
}
weak_alias (__cproj, cproj)
#ifdef NO_LONG_DOUBLE
Modified: trunk/libc/math/s_cprojf.c
==============================================================================
--- trunk/libc/math/s_cprojf.c (original)
+++ trunk/libc/math/s_cprojf.c Wed Apr 14 08:27:25 2010
@@ -1,5 +1,5 @@
/* Compute projection of complex float value to Riemann sphere.
- Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
@@ -25,24 +25,19 @@
__complex__ float
__cprojf (__complex__ float x)
{
- __complex__ float res;
-
if (isnan (__real__ x) && isnan (__imag__ x))
return x;
else if (!isfinite (__real__ x) || !isfinite (__imag__ x))
{
+ __complex__ float res;
+
__real__ res = INFINITY;
__imag__ res = __copysignf (0.0, __imag__ x);
- }
- else
- {
- float den = __real__ x * __real__ x + __imag__ x * __imag__ x + 1.0;
- __real__ res = (2.0 * __real__ x) / den;
- __imag__ res = (2.0 * __imag__ x) / den;
+ return res;
}
- return res;
+ return x;
}
#ifndef __cprojf
weak_alias (__cprojf, cprojf)
Modified: trunk/libc/math/s_cprojl.c
==============================================================================
--- trunk/libc/math/s_cprojl.c (original)
+++ trunk/libc/math/s_cprojl.c Wed Apr 14 08:27:25 2010
@@ -1,5 +1,5 @@
/* Compute projection of complex long double value to Riemann sphere.
- Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
@@ -25,24 +25,18 @@
__complex__ long double
__cprojl (__complex__ long double x)
{
- __complex__ long double res;
-
if (isnan (__real__ x) && isnan (__imag__ x))
return x;
else if (!isfinite (__real__ x) || !isfinite (__imag__ x))
{
+ __complex__ long double res;
+
__real__ res = INFINITY;
__imag__ res = __copysignl (0.0, __imag__ x);
- }
- else
- {
- long double den = (__real__ x * __real__ x + __imag__ x * __imag__ x
- + 1.0);
- __real__ res = (2.0 * __real__ x) / den;
- __imag__ res = (2.0 * __imag__ x) / den;
+ return res;
}
- return res;
+ return x;
}
weak_alias (__cprojl, cprojl)
Modified: trunk/libc/nis/libnsl.h
==============================================================================
--- trunk/libc/nis/libnsl.h (original)
+++ trunk/libc/nis/libnsl.h Wed Apr 14 08:27:25 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006, 2010 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
@@ -21,6 +21,7 @@
#define NSS_FLAG_NETID_AUTHORITATIVE 1
#define NSS_FLAG_SERVICES_AUTHORITATIVE 2
#define NSS_FLAG_SETENT_BATCH_READ 4
+#define NSS_FLAG_ADJUNCT_AS_SHADOW 8
/* Get current set of default flags. */
Modified: trunk/libc/nis/nss
==============================================================================
--- trunk/libc/nis/nss (original)
+++ trunk/libc/nis/nss Wed Apr 14 08:27:25 2010
@@ -1,7 +1,7 @@
# /etc/default/nss
# This file can theoretically contain a bunch of customization variables
# for Name Service Switch in the GNU C library. For now there are only
-# three variables:
+# four variables:
#
# NETID_AUTHORITATIVE
# If set to TRUE, the initgroups() function will accept the information
@@ -26,3 +26,12 @@
# might result into a network communication with the server to get
# the next entry.
#SETENT_BATCH_READ=TRUE
+#
+# ADJUNCT_AS_SHADOW
+# If set to TRUE, the passwd routines in the NIS NSS module will not
+# use the passwd.adjunct.byname tables to fill in the password data
+# in the passwd structure. This is a security problem if the NIS
+# server cannot be trusted to send the passwd.adjuct table only to
+# privileged clients. Instead the passwd.adjunct.byname table is
+# used to synthesize the shadow.byname table if it does not exist.
+#ADJUNCT_AS_SHADOW=TRUE
Modified: trunk/libc/nis/nss-default.c
==============================================================================
--- trunk/libc/nis/nss-default.c (original)
+++ trunk/libc/nis/nss-default.c Wed Apr 14 08:27:25 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 2001, 2004, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1996,2001,2004,2006,2007,2010 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
@@ -47,7 +47,8 @@
#define STRNLEN(s) s, sizeof (s) - 1
{ STRNLEN ("NETID_AUTHORITATIVE"), NSS_FLAG_NETID_AUTHORITATIVE },
{ STRNLEN ("SERVICES_AUTHORITATIVE"), NSS_FLAG_SERVICES_AUTHORITATIVE },
- { STRNLEN ("SETENT_BATCH_READ"), NSS_FLAG_SETENT_BATCH_READ }
+ { STRNLEN ("SETENT_BATCH_READ"), NSS_FLAG_SETENT_BATCH_READ },
+ { STRNLEN ("ADJUNCT_AS_SHADOW"), NSS_FLAG_ADJUNCT_AS_SHADOW },
};
#define nvars (sizeof (vars) / sizeof (vars[0]))
Modified: trunk/libc/nis/nss_nis/nis-pwd.c
==============================================================================
--- trunk/libc/nis/nss_nis/nis-pwd.c (original)
+++ trunk/libc/nis/nss_nis/nis-pwd.c Wed Apr 14 08:27:25 2010
@@ -1,4 +1,5 @@
-/* Copyright (C) 1996-1998,2001-2003,2006,2009 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1998,2001-2003,2006,2009,2010
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@xxxxxxxxxxxxxxxxxxx>, 1996.
@@ -39,7 +40,7 @@
/* Protect global state against multiple changers */
__libc_lock_define_initialized (static, lock)
-static bool_t new_start = 1;
+static bool new_start = true;
static char *oldkey;
static int oldkeylen;
static intern_t intern;
@@ -108,13 +109,10 @@
static void
internal_nis_endpwent (void)
{
- new_start = 1;
- if (oldkey != NULL)
- {
- free (oldkey);
- oldkey = NULL;
- oldkeylen = 0;
- }
+ new_start = true;
+ free (oldkey);
+ oldkey = NULL;
+ oldkeylen = 0;
struct response_t *curr = intern.start;
@@ -264,18 +262,21 @@
}
/* Check for adjunct style secret passwords. They can be
- recognized by a password starting with "##". */
+ recognized by a password starting with "##". We do not use
+ it if the passwd.adjunct.byname table is supposed to be used
+ as a shadow.byname replacement. */
char *p = strchr (result, ':');
size_t namelen;
char *result2;
int len2;
- if (p != NULL /* This better should be true in all cases. */
+ if ((_nsl_default_nss () & NSS_FLAG_ADJUNCT_AS_SHADOW) == 0
+ && p != NULL /* This better should be true in all cases. */
&& p[1] == '#' && p[2] == '#'
&& (namelen = p - result,
yp_match (domain, "passwd.adjunct.byname", result, namelen,
&result2, &len2)) == YPERR_SUCCESS)
{
- /* We found a passwd.adjunct entry. Merge encrypted
+ /* We found a passwd.adjunct.byname entry. Merge encrypted
password therein into original result. */
char *encrypted = strchr (result2, ':');
char *endp;
@@ -325,7 +326,7 @@
}
while (isspace (*p))
- ++p;
+ ++p;
if (!batch_read)
free (result);
@@ -346,7 +347,7 @@
free (oldkey);
oldkey = outkey;
oldkeylen = keylen;
- new_start = 0;
+ new_start = false;
}
}
while (parse_res < 1);
@@ -399,16 +400,19 @@
}
/* Check for adjunct style secret passwords. They can be recognized
- by a password starting with "##". */
+ by a password starting with "##". We do not use it if the
+ passwd.adjunct.byname table is supposed to be used as a shadow.byname
+ replacement. */
char *result2;
int len2;
char *p = strchr (result, ':');
- if (p != NULL /* This better should be true in all cases. */
+ if ((_nsl_default_nss () & NSS_FLAG_ADJUNCT_AS_SHADOW) == 0
+ && p != NULL /* This better should be true in all cases. */
&& p[1] == '#' && p[2] == '#'
&& yp_match (domain, "passwd.adjunct.byname", name, namelen,
&result2, &len2) == YPERR_SUCCESS)
{
- /* We found a passwd.adjunct entry. Merge encrypted password
+ /* We found a passwd.adjunct.byname entry. Merge encrypted password
therein into original result. */
char *encrypted = strchr (result2, ':');
char *endp;
@@ -465,7 +469,7 @@
if (__builtin_expect (parse_res < 1, 0))
{
if (parse_res == -1)
- return NSS_STATUS_TRYAGAIN;
+ return NSS_STATUS_TRYAGAIN;
else
return NSS_STATUS_NOTFOUND;
}
@@ -498,18 +502,21 @@
}
/* Check for adjunct style secret passwords. They can be recognized
- by a password starting with "##". */
+ by a password starting with "##". We do not use it if the
+ passwd.adjunct.byname table is supposed to be used as a shadow.byname
+ replacement. */
char *result2;
int len2;
size_t namelen;
char *p = strchr (result, ':');
- if (p != NULL /* This better should be true in all cases. */
+ if ((_nsl_default_nss () & NSS_FLAG_ADJUNCT_AS_SHADOW) == 0
+ && p != NULL /* This better should be true in all cases. */
&& p[1] == '#' && p[2] == '#'
&& (namelen = p - result,
yp_match (domain, "passwd.adjunct.byname", result, namelen,
&result2, &len2)) == YPERR_SUCCESS)
{
- /* We found a passwd.adjunct entry. Merge encrypted password
+ /* We found a passwd.adjunct.byname entry. Merge encrypted password
therein into original result. */
char *encrypted = strchr (result2, ':');
char *endp;
@@ -567,7 +574,7 @@
if (__builtin_expect (parse_res < 1, 0))
{
if (parse_res == -1)
- return NSS_STATUS_TRYAGAIN;
+ return NSS_STATUS_TRYAGAIN;
else
return NSS_STATUS_NOTFOUND;
}
Modified: trunk/libc/nis/nss_nis/nis-spwd.c
==============================================================================
--- trunk/libc/nis/nss_nis/nis-spwd.c (original)
+++ trunk/libc/nis/nss_nis/nis-spwd.c Wed Apr 14 08:27:25 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-1998,2001,2002,2003,2006 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1998,2001-2003,2006,2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@xxxxxxxxxxxxxxxxxxx>, 1996.
@@ -31,6 +31,7 @@
#include <rpcsvc/ypclnt.h>
#include "nss-nis.h"
+#include <libnsl.h>
/* Get the declaration of the parser function. */
#define ENTNAME spent
@@ -41,7 +42,8 @@
/* Protect global state against multiple changers */
__libc_lock_define_initialized (static, lock)
-static bool_t new_start = 1;
+static bool new_start = true;
+static bool ent_adjunct_used;
static char *oldkey;
static int oldkeylen;
@@ -50,7 +52,8 @@
{
__libc_lock_lock (lock);
- new_start = 1;
+ new_start = true;
+ ent_adjunct_used = false;
free (oldkey);
oldkey = NULL;
oldkeylen = 0;
@@ -83,32 +86,50 @@
int yperr;
if (new_start)
- yperr = yp_first (domain, "shadow.byname", &outkey, &keylen, &result,
- &len);
+ {
+ yperr = yp_first (domain, "shadow.byname", &outkey, &keylen, &result,
+ &len);
+ if (__builtin_expect (yperr == YPERR_MAP, 0)
+ && (_nsl_default_nss () & NSS_FLAG_ADJUNCT_AS_SHADOW))
+ {
+ free (result);
+ yperr = yp_first (domain, "passwd.adjunct.byname", &outkey,
+ &keylen, &result, &len);
+ ent_adjunct_used = true;
+ }
+ }
else
- yperr = yp_next (domain, "shadow.byname", oldkey, oldkeylen, &outkey,
- &keylen, &result, &len);
+ yperr = yp_next (domain, (ent_adjunct_used
+ ? "passwd.adjunct.byname" : "shadow.byname"),
+ oldkey, oldkeylen, &outkey, &keylen, &result, &len);
if (__builtin_expect (yperr != YPERR_SUCCESS, 0))
- {
+ {
enum nss_status retval = yperr2nss (yperr);
if (retval == NSS_STATUS_TRYAGAIN)
*errnop = errno;
- return retval;
- }
-
- if (__builtin_expect ((size_t) (len + 1) > buflen, 0))
- {
- free (result);
+ return retval;
+ }
+
+ if (__builtin_expect ((size_t) (len + (ent_adjunct_used ? 3 : 1))
+ > buflen, 0))
+ {
+ free (result);
*errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
+ return NSS_STATUS_TRYAGAIN;
+ }
char *p = strncpy (buffer, result, len);
- buffer[len] = '\0';
+ if (ent_adjunct_used)
+ /* This is an ugly trick. The format of passwd.adjunct.byname almost
+ matches the shadow.byname format except that the last two fields
+ are missing. Synthesize them by marking them empty. */
+ strcpy (&buffer[len], "::");
+ else
+ buffer[len] = '\0';
while (isspace (*p))
- ++p;
+ ++p;
free (result);
parse_res = _nss_files_parse_spent (p, sp, (void *) buffer, buflen,
@@ -123,7 +144,7 @@
free (oldkey);
oldkey = outkey;
oldkeylen = keylen;
- new_start = 0;
+ new_start = false;
}
while (!parse_res);
@@ -154,15 +175,25 @@
*errnop = EINVAL;
return NSS_STATUS_UNAVAIL;
}
+ const size_t name_len = strlen (name);
char *domain;
if (__builtin_expect (yp_get_default_domain (&domain), 0))
return NSS_STATUS_UNAVAIL;
+ bool adjunct_used = false;
char *result;
int len;
- int yperr = yp_match (domain, "shadow.byname", name, strlen (name), &result,
+ int yperr = yp_match (domain, "shadow.byname", name, name_len, &result,
&len);
+ if (__builtin_expect (yperr == YPERR_MAP, 0)
+ && (_nsl_default_nss () & NSS_FLAG_ADJUNCT_AS_SHADOW))
+ {
+ free (result);
+ yperr = yp_match (domain, "passwd.adjunct.byname", name, name_len,
+ &result, &len);
+ adjunct_used = true;
+ }
if (__builtin_expect (yperr != YPERR_SUCCESS, 0))
{
@@ -173,7 +204,7 @@
return retval;
}
- if (__builtin_expect ((size_t) (len + 1) > buflen, 0))
+ if (__builtin_expect ((size_t) (len + (adjunct_used ? 3 : 1)) > buflen, 0))
{
free (result);
*errnop = ERANGE;
@@ -181,7 +212,13 @@
}
char *p = strncpy (buffer, result, len);
- buffer[len] = '\0';
+ if (__builtin_expect (adjunct_used, false))
+ /* This is an ugly trick. The format of passwd.adjunct.byname almost
+ matches the shadow.byname format except that the last two fields
+ are missing. Synthesize them by marking them empty. */
+ strcpy (&buffer[len], "::");
+ else
+ buffer[len] = '\0';
while (isspace (*p))
++p;
free (result);
Modified: trunk/libc/nptl/ChangeLog
==============================================================================
--- trunk/libc/nptl/ChangeLog (original)
+++ trunk/libc/nptl/ChangeLog Wed Apr 14 08:27:25 2010
@@ -1,3 +1,14 @@
+2010-04-09 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #11390]
+ * sysdeps/unix/sysv/linux/pthread_getname.c: New file.
+ * sysdeps/unix/sysv/linux/pthread_setname.c: New file.
+ * nptl/sysdeps/pthread/pthread.h: Declare pthread_getname and
+ pthread_setname.
+ * Makefile (libpthread-routines): Add pthread_getname and
+ pthread_setname.
+ * Versions: Export pthread_getname and pthread_setname for GLIBC_2.12.
+
2010-04-05 Thomas Schwinge <thomas@xxxxxxxxxxxxx>
* sysdeps/pthread/unwind-resume.c: Moved to main tree sysdeps/gnu/.
Modified: trunk/libc/nptl/Makefile
==============================================================================
--- trunk/libc/nptl/Makefile (original)
+++ trunk/libc/nptl/Makefile Wed Apr 14 08:27:25 2010
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008,2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2008,2009,2010 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
@@ -126,7 +126,9 @@
pthread_mutexattr_setprotocol \
pthread_mutexattr_getprioceiling \
pthread_mutexattr_setprioceiling tpp \
- pthread_mutex_getprioceiling pthread_mutex_setprioceiling
+ pthread_mutex_getprioceiling \
+ pthread_mutex_setprioceiling \
+ pthread_setname pthread_getname
# pthread_setuid pthread_seteuid pthread_setreuid \
# pthread_setresuid \
# pthread_setgid pthread_setegid pthread_setregid \
Modified: trunk/libc/nptl/Versions
==============================================================================
--- trunk/libc/nptl/Versions (original)
+++ trunk/libc/nptl/Versions Wed Apr 14 08:27:25 2010
@@ -247,6 +247,8 @@
GLIBC_2.12 {
pthread_mutex_consistent; pthread_mutexattr_getrobust;
pthread_mutexattr_setrobust;
+
+ pthread_setname_np; pthread_getname_np;
};
GLIBC_PRIVATE {
Modified: trunk/libc/nptl/sysdeps/pthread/pthread.h
==============================================================================
--- trunk/libc/nptl/sysdeps/pthread/pthread.h (original)
+++ trunk/libc/nptl/sysdeps/pthread/pthread.h Wed Apr 14 08:27:25 2010
@@ -425,6 +425,18 @@
__THROW;
+#ifdef __USE_GNU
+/* Get thread name visible in the kernel and its interfaces. */
+extern int pthread_getname_np (pthread_t __target_thread, char *__buf,
+ size_t __buflen)
+ __THROW __nonnull ((2));
+
+/* Set thread name visible in the kernel and its interfaces. */
+extern int pthread_setname_np (pthread_t __target_thread, __const char *__name)
+ __THROW __nonnull ((2));
+#endif
+
+
#ifdef __USE_UNIX98
/* Determine level of concurrency. */
extern int pthread_getconcurrency (void) __THROW;
Modified: trunk/libc/nscd/aicache.c
==============================================================================
--- trunk/libc/nscd/aicache.c (original)
+++ trunk/libc/nscd/aicache.c Wed Apr 14 08:27:25 2010
@@ -1,5 +1,5 @@
/* Cache handling for host lookup.
- Copyright (C) 2004-2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2004-2008, 2009, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2004.
@@ -111,7 +111,7 @@
int old_res_options = _res.options;
_res.options &= ~RES_USE_INET6;
- size_t tmpbuf6len = 512;
+ size_t tmpbuf6len = 1024;
char *tmpbuf6 = alloca (tmpbuf6len);
size_t tmpbuf4len = 0;
char *tmpbuf4 = NULL;
@@ -133,9 +133,11 @@
"gethostbyname4_r");
if (fct4 != NULL)
{
- struct gaih_addrtuple *at = NULL;
+ struct gaih_addrtuple atmem;
+ struct gaih_addrtuple *at;
while (1)
{
+ at = &atmem;
rc6 = 0;
herrno = 0;
status[1] = DL_CALL_FCT (fct4, (key, &at, tmpbuf6, tmpbuf6len,
@@ -153,7 +155,7 @@
goto next_nip;
/* We found the data. Count the addresses and the size. */
- for (const struct gaih_addrtuple *at2 = at; at2 != NULL;
+ for (const struct gaih_addrtuple *at2 = at = &atmem; at2 != NULL;
at2 = at2->next)
{
++naddrs;
Modified: trunk/libc/nscd/nscd_stat.c
==============================================================================
--- trunk/libc/nscd/nscd_stat.c (original)
+++ trunk/libc/nscd/nscd_stat.c Wed Apr 14 08:27:25 2010
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (c) 1998, 2003, 2004, 2005, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@xxxxxxxxxxxxxxxxxxx>, 1998.
@@ -80,6 +80,7 @@
int max_nthreads;
int paranoia;
time_t restart_interval;
+ unsigned int reload_count;
int ndbs;
struct dbstat dbs[lastdb];
#ifdef HAVE_SELINUX
@@ -102,6 +103,7 @@
data.max_nthreads = max_nthreads;
data.paranoia = paranoia;
data.restart_interval = restart_interval;
+ data.reload_count = reload_count;
data.ndbs = lastdb;
for (cnt = 0; cnt < lastdb; ++cnt)
@@ -240,10 +242,11 @@
"%15d maximum number of threads\n"
"%15lu number of times clients had to wait\n"
"%15s paranoia mode enabled\n"
- "%15lu restart internal\n"),
+ "%15lu restart internal\n"
+ "%15u reload count\n"),
data.nthreads, data.max_nthreads, data.client_queued,
data.paranoia ? yesstr : nostr,
- (unsigned long int) data.restart_interval);
+ (unsigned long int) data.restart_interval, data.reload_count);
for (i = 0; i < lastdb; ++i)
{
Modified: trunk/libc/posix/Makefile
==============================================================================
--- trunk/libc/posix/Makefile (original)
+++ trunk/libc/posix/Makefile Wed Apr 14 08:27:25 2010
@@ -102,7 +102,9 @@
tst-execv1 tst-execv2 tst-execl1 tst-execl2 \
tst-execve1 tst-execve2 tst-execle1 tst-execle2 \
tst-execvp3 tst-execvp4 \
- tst-fnmatch2 tst-cpucount tst-cpuset
+ tst-fnmatch2 tst-cpucount tst-cpuset \
+ bug-getopt1 bug-getopt2 bug-getopt3 bug-getopt4 \
+ bug-getopt5
tests-$(OPTION_EGLIBC_LOCALE_CODE) \
+= tst-fnmatch tst-regexloc bug-regex1 bug-regex5 \
bug-regex23 bug-regex25
@@ -208,7 +210,7 @@
tst-exec-ARGS = -- $(local-built-program-cmd)
tst-spawn-ARGS = -- $(local-built-program-cmd)
tst-dir-ARGS = `pwd` `cd $(common-objdir)/$(subdir); pwd` `cd $(common-objdir); pwd` $(objpfx)tst-dir
-tst-chmod-ARGS = `pwd`
+tst-chmod-ARGS = $(objdir)
tst-vfork3-ARGS = --test-dir=$(objpfx)
tst-fnmatch-ENV = LOCPATH=$(common-objpfx)localedata
Modified: trunk/libc/posix/getopt.c
==============================================================================
--- trunk/libc/posix/getopt.c (original)
+++ trunk/libc/posix/getopt.c Wed Apr 14 08:27:25 2010
@@ -395,8 +395,6 @@
int long_only, struct _getopt_data *d, int posixly_correct)
{
int print_errors = d->opterr;
- if (optstring[0] == ':')
- print_errors = 0;
if (argc < 1)
return -1;
@@ -411,6 +409,10 @@
posixly_correct);
d->__initialized = 1;
}
+ else if (optstring[0] == '-' || optstring[0] == '+')
+ optstring++;
+ if (optstring[0] == ':')
+ print_errors = 0;
/* Test whether ARGV[optind] points to a non-option argument.
Either it does not have option syntax, or there is an environment flag
@@ -789,7 +791,7 @@
if (*d->__nextchar == '\0')
++d->optind;
- if (temp == NULL || c == ':')
+ if (temp == NULL || c == ':' || c == ';')
{
if (print_errors)
{
@@ -911,7 +913,10 @@
pfound = p;
indfound = option_index;
}
- else
+ else if (long_only
+ || pfound->has_arg != p->has_arg
+ || pfound->flag != p->flag
+ || pfound->val != p->val)
/* Second or later nonexact match found. */
ambig = 1;
}
@@ -1028,6 +1033,8 @@
return optstring[0] == ':' ? ':' : '?';
}
}
+ else
+ d->optarg = NULL;
d->__nextchar += strlen (d->__nextchar);
if (longind != NULL)
*longind = option_index;
Modified: trunk/libc/resolv/nss_dns/dns-host.c
==============================================================================
--- trunk/libc/resolv/nss_dns/dns-host.c (original)
+++ trunk/libc/resolv/nss_dns/dns-host.c Wed Apr 14 08:27:25 2010
@@ -1050,7 +1050,7 @@
++had_error;
continue;
}
- if (*firstp)
+ if (*firstp && canon == NULL)
{
h_name = buffer;
buffer += h_namelen;
@@ -1166,19 +1166,7 @@
if (ttl != 0 && ttlp != NULL)
*ttlp = ttl;
- if (canon != NULL)
- {
- (*pat)->name = canon;
-
- /* Reclaim buffer space. */
- if (h_name + h_namelen == buffer)
- {
- buffer = h_name;
- buflen += h_namelen;
- }
- }
- else
- (*pat)->name = h_name;
+ (*pat)->name = canon ?: h_name;
*firstp = 0;
}
Modified: trunk/libc/stdlib/tst-makecontext3.c
==============================================================================
--- trunk/libc/stdlib/tst-makecontext3.c (original)
+++ trunk/libc/stdlib/tst-makecontext3.c Wed Apr 14 08:27:25 2010
@@ -136,38 +136,42 @@
exit (1);
}
- ctx[1] = ctx[0];
+ if (getcontext (&ctx[1]) != 0)
+ {
+ printf ("%s: getcontext: %m\n", __FUNCTION__);
+ exit (1);
+ }
+
ctx[1].uc_stack.ss_sp = st1;
ctx[1].uc_stack.ss_size = sizeof st1;
ctx[1].uc_link = &ctx[0];
- {
- ucontext_t tempctx = ctx[1];
- makecontext (&ctx[1], (void (*) (void)) f1, 33,
- 0x00000001 << flag, 0x00000004 << flag,
- 0x00000012 << flag, 0x00000048 << flag,
- 0x00000123 << flag, 0x0000048d << flag,
- 0x00001234 << flag, 0x000048d1 << flag,
- 0x00012345 << flag, 0x00048d15 << flag,
- 0x00123456 << flag, 0x0048d159 << flag,
- 0x01234567 << flag, 0x048d159e << flag,
- 0x12345678 << flag, 0x48d159e2 << flag,
- 0x23456789 << flag, 0x8d159e26 << flag,
- 0x3456789a << flag, 0xd159e26a << flag,
- 0x456789ab << flag, 0x159e26af << flag,
- 0x56789abc << flag, 0x59e26af3 << flag,
- 0x6789abcd << flag, 0x9e26af37 << flag,
- 0x789abcde << flag, 0xe26af37b << flag,
- 0x89abcdef << flag, 0x26af37bc << flag,
- 0x9abcdef0 << flag, 0x6af37bc3 << flag,
- 0xabcdef0f << flag);
-
- /* Without this check, a stub makecontext can make us spin forever. */
- if (memcmp (&tempctx, &ctx[1], sizeof ctx[1]) == 0)
- {
- puts ("makecontext was a no-op, presuming not implemented");
- return 0;
- }
- }
+ errno = 0;
+ makecontext (&ctx[1], (void (*) (void)) f1, 33,
+ 0x00000001 << flag, 0x00000004 << flag,
+ 0x00000012 << flag, 0x00000048 << flag,
+ 0x00000123 << flag, 0x0000048d << flag,
+ 0x00001234 << flag, 0x000048d1 << flag,
+ 0x00012345 << flag, 0x00048d15 << flag,
+ 0x00123456 << flag, 0x0048d159 << flag,
+ 0x01234567 << flag, 0x048d159e << flag,
+ 0x12345678 << flag, 0x48d159e2 << flag,
+ 0x23456789 << flag, 0x8d159e26 << flag,
+ 0x3456789a << flag, 0xd159e26a << flag,
+ 0x456789ab << flag, 0x159e26af << flag,
+ 0x56789abc << flag, 0x59e26af3 << flag,
+ 0x6789abcd << flag, 0x9e26af37 << flag,
+ 0x789abcde << flag, 0xe26af37b << flag,
+ 0x89abcdef << flag, 0x26af37bc << flag,
+ 0x9abcdef0 << flag, 0x6af37bc3 << flag,
+ 0xabcdef0f << flag);
+
+ /* Without this check, a stub makecontext can make us spin forever. */
+ if (errno == ENOSYS)
+ {
+ puts ("makecontext not implemented");
+ back_in_main = 1;
+ return 0;
+ }
/* Play some tricks with this context. */
if (++global == 1)
Modified: trunk/libc/sysdeps/ieee754/ldbl-128ibm/s_cprojl.c
==============================================================================
--- trunk/libc/sysdeps/ieee754/ldbl-128ibm/s_cprojl.c (original)
+++ trunk/libc/sysdeps/ieee754/ldbl-128ibm/s_cprojl.c Wed Apr 14 08:27:25 2010
@@ -1,5 +1,5 @@
/* Compute projection of complex long double value to Riemann sphere.
- Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006,2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
@@ -25,30 +25,18 @@
__complex__ long double
__cprojl (__complex__ long double x)
{
- __complex__ long double res;
-
if (isnan (__real__ x) && isnan (__imag__ x))
return x;
else if (!isfinite (__real__ x) || !isfinite (__imag__ x))
{
+ __complex__ long double res;
+
__real__ res = INFINITY;
__imag__ res = __copysignl (0.0, __imag__ x);
- }
- else
- {
- long double den = (__real__ x * __real__ x + __imag__ x * __imag__ x
- + 1.0);
- __real__ res = (2.0 * __real__ x) / den;
- __imag__ res = (2.0 * __imag__ x) / den;
- /* __gcc_qmul does not respect -0.0 so we need the following fixup. */
- if (__real__ x == 0.0)
- __real__ res = __real__ x;
-
- if (__imag__ x == 0.0)
- __imag__ res = __imag__ x;
+ return res;
}
- return res;
+ return x;
}
long_double_symbol (libm, __cprojl, cprojl);
Modified: trunk/libc/sysdeps/unix/sysv/linux/getlogin_r.c
==============================================================================
--- trunk/libc/sysdeps/unix/sysv/linux/getlogin_r.c (original)
+++ trunk/libc/sysdeps/unix/sysv/linux/getlogin_r.c Wed Apr 14 08:27:25 2010
@@ -37,13 +37,20 @@
if (fd == -1)
return 1;
- ssize_t n = TEMP_FAILURE_RETRY (read_not_cancel (fd, name, namesize));
+ /* We are reading a 32-bit number. 12 bytes are enough for the text
+ representation. If not, something is wrong. */
+ char uidbuf[12];
+ ssize_t n = TEMP_FAILURE_RETRY (read_not_cancel (fd, uidbuf,
+ sizeof (uidbuf)));
close_not_cancel_no_status (fd);
uid_t uid;
char *endp;
if (n <= 0
- || (uid = strtoul (name, &endp, 10), endp == name || *endp != '\0'))
+ || n == sizeof (uidbuf)
+ || (uidbuf[n] = '\0',
+ uid = strtoul (uidbuf, &endp, 10),
+ endp == uidbuf || *endp != '\0'))
return 1;
size_t buflen = 1024;
@@ -84,8 +91,9 @@
}
-/* Return the login name of the user, or NULL if it can't be determined.
- The returned pointer, if not NULL, is good only until the next call. */
+/* Return at most NAME_LEN characters of the login name of the user in NAME.
+ If it cannot be determined or some other error occurred, return the error
+ code. Otherwise return 0. */
int
[... 446 lines stripped ...]