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

[Commits] r21945 - in /fsf/trunk/libc: ./ include/ po/ ports/ ports/sysdeps/aarch64/ ports/sysdeps/alpha/ ports/sysdeps/alpha/fpu/ por...



Author: eglibc
Date: Sat Dec  8 00:03:04 2012
New Revision: 21945

Log:
Import glibc-mainline for 2012-12-08

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/include/link.h
    fsf/trunk/libc/po/libc.pot
    fsf/trunk/libc/ports/ChangeLog.aarch64
    fsf/trunk/libc/ports/ChangeLog.alpha
    fsf/trunk/libc/ports/sysdeps/aarch64/dl-machine.h
    fsf/trunk/libc/ports/sysdeps/aarch64/libm-test-ulps
    fsf/trunk/libc/ports/sysdeps/alpha/Makefile
    fsf/trunk/libc/ports/sysdeps/alpha/fpu/math_private.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/mmap.c
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h
    fsf/trunk/libc/soft-fp/op-common.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/posix_fadvise.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Dec  8 00:03:04 2012
@@ -1,3 +1,25 @@
+2012-12-07  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	[BZ #14898]
+	* include/link.h (FORCED_DYNAMIC_TLS_OFFSET) [NO_TLS_OFFSET == 0]:
+	Change to -1.
+
+2012-12-07  David S. Miller  <davem@xxxxxxxxxxxxx>
+
+	* po/libc.pot: Update.
+
+2012-12-07  Richard Henderson  <rth@xxxxxxxxxx>
+
+	* soft-fp/op-common.h (_FP_MUL): Pull computation of R_e from the
+	normal/normal case to before the switch.
+	(_FP_DIV): Likewise.
+
+2012-12-06  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+	    Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/posix_fadvise.c (posix_fadvise): Also
+	check for __NR_fadvise64_64.
+
 2012-12-06  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
 
 	* sysdeps/generic/fpu_control.h (_FPU_GETCW): Define to set cw to

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Sat Dec  8 00:03:04 2012
@@ -22,7 +22,7 @@
   14661, 14669, 14672, 14683, 14694, 14716, 14719, 14743, 14767, 14783,
   14784, 14785, 14793, 14796, 14797, 14801, 14803, 14805, 14807, 14811,
   14815, 14821, 14822, 14824, 14828, 14831, 14835, 14838, 14856, 14863,
-  14865, 14866, 14868, 14869, 14871, 14879, 14889, 14893, 14914.
+  14865, 14866, 14868, 14869, 14871, 14879, 14889, 14893, 14898, 14914.
 
 * CVE-2011-4609 svc_run() produces high cpu usage when accept fails with
   EMFILE has been fixed (Bugzilla #14889).

Modified: fsf/trunk/libc/include/link.h
==============================================================================
--- fsf/trunk/libc/include/link.h (original)
+++ fsf/trunk/libc/include/link.h Sat Dec  8 00:03:04 2012
@@ -289,7 +289,7 @@
 #endif
 #ifndef FORCED_DYNAMIC_TLS_OFFSET
 # if NO_TLS_OFFSET == 0
-#  define FORCED_DYNAMIC_TLS_OFFSET 1
+#  define FORCED_DYNAMIC_TLS_OFFSET -1
 # elif NO_TLS_OFFSET == -1
 #  define FORCED_DYNAMIC_TLS_OFFSET -2
 # else

Modified: fsf/trunk/libc/po/libc.pot
==============================================================================
--- fsf/trunk/libc/po/libc.pot (original)
+++ fsf/trunk/libc/po/libc.pot Sat Dec  8 00:03:04 2012
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.15.90\n"
-"POT-Creation-Date: 2012-06-21 07:51-0700\n"
+"Project-Id-Version: libc 2.16.90\n"
+"POT-Creation-Date: 2012-12-07 15:10-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -14,45 +14,45 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: argp/argp-help.c:226
+#: argp/argp-help.c:227
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr ""
 
-#: argp/argp-help.c:236
+#: argp/argp-help.c:237
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr ""
 
-#: argp/argp-help.c:249
+#: argp/argp-help.c:250
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr ""
 
-#: argp/argp-help.c:1213
+#: argp/argp-help.c:1214
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
 msgstr ""
 
-#: argp/argp-help.c:1599
+#: argp/argp-help.c:1600
 msgid "Usage:"
 msgstr ""
 
-#: argp/argp-help.c:1603
+#: argp/argp-help.c:1604
 msgid "  or: "
 msgstr ""
 
-#: argp/argp-help.c:1615
+#: argp/argp-help.c:1616
 msgid " [OPTION...]"
 msgstr ""
 
-#: argp/argp-help.c:1642
+#: argp/argp-help.c:1643
 #, c-format
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr ""
 
-#: argp/argp-help.c:1670
+#: argp/argp-help.c:1671
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
@@ -102,7 +102,7 @@
 "%n"
 msgstr ""
 
-#: catgets/gencat.c:109 catgets/gencat.c:113 nscd/nscd.c:115 nss/makedb.c:118
+#: catgets/gencat.c:109 catgets/gencat.c:113 nscd/nscd.c:115 nss/makedb.c:119
 msgid "NAME"
 msgstr ""
 
@@ -114,7 +114,7 @@
 msgid "Do not use existing catalog, force new output file"
 msgstr ""
 
-#: catgets/gencat.c:113 nss/makedb.c:118
+#: catgets/gencat.c:113 nss/makedb.c:119
 msgid "Write output to file NAME"
 msgstr ""
 
@@ -131,26 +131,25 @@
 "[OUTPUT-FILE [INPUT-FILE]...]"
 msgstr ""
 
-#: catgets/gencat.c:234 debug/pcprofiledump.c:207 debug/xtrace.sh:57
-#: elf/ldconfig.c:301 elf/ldd.bash.in:55 elf/pldd.c:56 elf/sln.c:85
-#: elf/sotruss.ksh:49 elf/sprof.c:370 iconv/iconv_prog.c:407
-#: iconv/iconvconfig.c:382 locale/programs/locale.c:278
-#: locale/programs/localedef.c:367 login/programs/pt_chown.c:91
-#: malloc/memusage.sh:64 malloc/memusagestat.c:538 nscd/nscd.c:456
-#: nss/getent.c:965 nss/makedb.c:369 posix/getconf.c:1121
-#: sunrpc/rpc_main.c:1446 sunrpc/rpcinfo.c:691
+#: catgets/gencat.c:235 debug/pcprofiledump.c:208 elf/ldconfig.c:302
+#: elf/pldd.c:222 elf/sln.c:85 elf/sprof.c:371 iconv/iconv_prog.c:408
+#: iconv/iconvconfig.c:383 locale/programs/locale.c:279
+#: locale/programs/localedef.c:363 login/programs/pt_chown.c:88
+#: malloc/memusagestat.c:536 nscd/nscd.c:459 nss/getent.c:965 nss/makedb.c:371
+#: posix/getconf.c:1121 sunrpc/rpcinfo.c:691
 #: sysdeps/unix/sysv/linux/lddlibc4.c:61
+#, c-format
 msgid ""
 "For bug reporting instructions, please see:\n"
-"<http://www.gnu.org/software/libc/bugs.html>.\n"
-msgstr ""
-
-#: catgets/gencat.c:248 debug/pcprofiledump.c:221 debug/xtrace.sh:65
-#: elf/ldconfig.c:315 elf/ldd.bash.in:38 elf/pldd.c:220 elf/sotruss.ksh:76
-#: elf/sprof.c:385 iconv/iconv_prog.c:422 iconv/iconvconfig.c:397
-#: locale/programs/locale.c:293 locale/programs/localedef.c:383
-#: login/programs/pt_chown.c:62 malloc/memusage.sh:72
-#: malloc/memusagestat.c:556 nscd/nscd.c:470 nss/getent.c:86 nss/makedb.c:383
+"%s.\n"
+msgstr ""
+
+#: catgets/gencat.c:251 debug/pcprofiledump.c:224 debug/xtrace.sh:64
+#: elf/ldconfig.c:318 elf/ldd.bash.in:38 elf/pldd.c:238 elf/sotruss.ksh:75
+#: elf/sprof.c:388 iconv/iconv_prog.c:425 iconv/iconvconfig.c:400
+#: locale/programs/locale.c:296 locale/programs/localedef.c:389
+#: login/programs/pt_chown.c:62 malloc/memusage.sh:71
+#: malloc/memusagestat.c:552 nscd/nscd.c:475 nss/getent.c:86 nss/makedb.c:387
 #: posix/getconf.c:1103 sysdeps/unix/sysv/linux/lddlibc4.c:68
 #, c-format
 msgid ""
@@ -159,96 +158,96 @@
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: catgets/gencat.c:253 debug/pcprofiledump.c:226 debug/xtrace.sh:69
-#: elf/ldconfig.c:320 elf/pldd.c:225 elf/sprof.c:391 iconv/iconv_prog.c:427
-#: iconv/iconvconfig.c:402 locale/programs/locale.c:298
-#: locale/programs/localedef.c:388 malloc/memusage.sh:76
-#: malloc/memusagestat.c:561 nscd/nscd.c:475 nss/getent.c:91 nss/makedb.c:388
+#: catgets/gencat.c:256 debug/pcprofiledump.c:229 debug/xtrace.sh:68
+#: elf/ldconfig.c:323 elf/pldd.c:243 elf/sprof.c:394 iconv/iconv_prog.c:430
+#: iconv/iconvconfig.c:405 locale/programs/locale.c:301
+#: locale/programs/localedef.c:394 malloc/memusage.sh:75
+#: malloc/memusagestat.c:557 nscd/nscd.c:480 nss/getent.c:91 nss/makedb.c:392
 #: posix/getconf.c:1108
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
-#: catgets/gencat.c:284
+#: catgets/gencat.c:287
 msgid "*standard input*"
 msgstr ""
 
-#: catgets/gencat.c:290 iconv/iconv_charmap.c:171 iconv/iconv_prog.c:293
-#: nss/makedb.c:247
+#: catgets/gencat.c:293 iconv/iconv_charmap.c:169 iconv/iconv_prog.c:293
+#: nss/makedb.c:248
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr ""
 
-#: catgets/gencat.c:419 catgets/gencat.c:494
+#: catgets/gencat.c:422 catgets/gencat.c:497
 msgid "illegal set number"
 msgstr ""
 
-#: catgets/gencat.c:446
+#: catgets/gencat.c:449
 msgid "duplicate set definition"
 msgstr ""
 
-#: catgets/gencat.c:448 catgets/gencat.c:620 catgets/gencat.c:672
+#: catgets/gencat.c:451 catgets/gencat.c:623 catgets/gencat.c:675
 msgid "this is the first definition"
 msgstr ""
 
-#: catgets/gencat.c:519
+#: catgets/gencat.c:522
 #, c-format
 msgid "unknown set `%s'"
 msgstr ""
 
-#: catgets/gencat.c:560
+#: catgets/gencat.c:563
 msgid "invalid quote character"
 msgstr ""
 
-#: catgets/gencat.c:573
+#: catgets/gencat.c:576
 #, c-format
 msgid "unknown directive `%s': line ignored"
 msgstr ""
 
-#: catgets/gencat.c:618
+#: catgets/gencat.c:621
 msgid "duplicated message number"
 msgstr ""
 
-#: catgets/gencat.c:669
+#: catgets/gencat.c:672
 msgid "duplicated message identifier"
 msgstr ""
 
-#: catgets/gencat.c:726
+#: catgets/gencat.c:729
 msgid "invalid character: message ignored"
 msgstr ""
 
-#: catgets/gencat.c:769
+#: catgets/gencat.c:772
 msgid "invalid line"
 msgstr ""
 
-#: catgets/gencat.c:823
+#: catgets/gencat.c:826
 msgid "malformed line ignored"
 msgstr ""
 
-#: catgets/gencat.c:987 catgets/gencat.c:1028
+#: catgets/gencat.c:990 catgets/gencat.c:1031
 #, c-format
 msgid "cannot open output file `%s'"
 msgstr ""
 
-#: catgets/gencat.c:1190 locale/programs/linereader.c:559
+#: catgets/gencat.c:1193 locale/programs/linereader.c:559
 msgid "invalid escape sequence"
 msgstr ""
 
-#: catgets/gencat.c:1212
+#: catgets/gencat.c:1215
 msgid "unterminated message"
 msgstr ""
 
-#: catgets/gencat.c:1236
+#: catgets/gencat.c:1239
 #, c-format
 msgid "while opening old catalog file"
 msgstr ""
 
-#: catgets/gencat.c:1327
+#: catgets/gencat.c:1330
 #, c-format
 msgid "conversion modules not available"
 msgstr ""
 
-#: catgets/gencat.c:1353
+#: catgets/gencat.c:1356
 #, c-format
 msgid "cannot determine escape character"
 msgstr ""
@@ -284,8 +283,8 @@
 msgid "Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n"
 msgstr ""
 
-#: debug/xtrace.sh:32 elf/sotruss.ksh:57 elf/sotruss.ksh:68
-#: elf/sotruss.ksh:136 malloc/memusage.sh:26
+#: debug/xtrace.sh:32 elf/sotruss.ksh:56 elf/sotruss.ksh:67
+#: elf/sotruss.ksh:135 malloc/memusage.sh:26
 msgid "Try \\`%s --help' or \\`%s --usage' for more information.\\n"
 msgstr ""
 
@@ -310,20 +309,25 @@
 "\n"
 msgstr ""
 
-#: debug/xtrace.sh:126
+#: debug/xtrace.sh:57 elf/ldd.bash.in:55 elf/sotruss.ksh:49
+#: malloc/memusage.sh:64
+msgid "For bug reporting instructions, please see:\\\\n%s.\\\\n"
+msgstr ""
+
+#: debug/xtrace.sh:125
 msgid "xtrace: unrecognized option \\`$1'\\n"
 msgstr ""
 
-#: debug/xtrace.sh:139
+#: debug/xtrace.sh:138
 msgid "No program name given\\n"
 msgstr ""
 
-#: debug/xtrace.sh:147
+#: debug/xtrace.sh:146
 #, sh-format
 msgid "executable \\`$program' not found\\n"
 msgstr ""
 
-#: debug/xtrace.sh:151
+#: debug/xtrace.sh:150
 #, sh-format
 msgid "\\`$program' is no executable\\n"
 msgstr ""
@@ -352,87 +356,87 @@
 msgid "unknown"
 msgstr ""
 
-#: elf/cache.c:115
+#: elf/cache.c:121
 msgid "Unknown OS"
 msgstr ""
 
-#: elf/cache.c:120
+#: elf/cache.c:126
 #, c-format
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ""
 
-#: elf/cache.c:137 elf/ldconfig.c:1306
+#: elf/cache.c:143 elf/ldconfig.c:1309
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr ""
 
-#: elf/cache.c:151
+#: elf/cache.c:157
 #, c-format
 msgid "mmap of cache file failed.\n"
 msgstr ""
 
-#: elf/cache.c:155 elf/cache.c:169
+#: elf/cache.c:161 elf/cache.c:175
 #, c-format
 msgid "File is not a cache file.\n"
 msgstr ""
 
-#: elf/cache.c:202 elf/cache.c:212
+#: elf/cache.c:208 elf/cache.c:218
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr ""
 
-#: elf/cache.c:406
+#: elf/cache.c:412
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr ""
 
-#: elf/cache.c:414 elf/cache.c:424 elf/cache.c:428 elf/cache.c:433
+#: elf/cache.c:420 elf/cache.c:430 elf/cache.c:434 elf/cache.c:439
 #, c-format
 msgid "Writing of cache data failed"
 msgstr ""
 
-#: elf/cache.c:438
+#: elf/cache.c:444
 #, c-format
 msgid "Changing access rights of %s to %#o failed"
 msgstr ""
 
-#: elf/cache.c:443
+#: elf/cache.c:449
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr ""
 
-#: elf/dl-close.c:386 elf/dl-open.c:460
+#: elf/dl-close.c:378 elf/dl-open.c:474
 msgid "cannot create scope list"
 msgstr ""
 
-#: elf/dl-close.c:773
+#: elf/dl-close.c:771
 msgid "shared object not open"
 msgstr ""
 
-#: elf/dl-deps.c:114
+#: elf/dl-deps.c:112
 msgid "DST not allowed in SUID/SGID programs"
 msgstr ""
 
-#: elf/dl-deps.c:127
+#: elf/dl-deps.c:125
 msgid "empty dynamic string token substitution"
 msgstr ""
 
-#: elf/dl-deps.c:133
+#: elf/dl-deps.c:131
 #, c-format
 msgid ""
 "cannot load auxiliary `%s' because of empty dynamic string token "
 "substitution\n"
 msgstr ""
 
-#: elf/dl-deps.c:486
+#: elf/dl-deps.c:483
 msgid "cannot allocate dependency list"
 msgstr ""
 
-#: elf/dl-deps.c:522 elf/dl-deps.c:582
+#: elf/dl-deps.c:520 elf/dl-deps.c:580
 msgid "cannot allocate symbol search list"
 msgstr ""
 
-#: elf/dl-deps.c:562
+#: elf/dl-deps.c:560
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr ""
 
@@ -456,187 +460,191 @@
 msgid "internal error: symidx out of range of fptr table"
 msgstr ""
 
-#: elf/dl-load.c:470
+#: elf/dl-hwcaps.c:173 elf/dl-hwcaps.c:185
+msgid "cannot create capability list"
+msgstr ""
+
+#: elf/dl-load.c:471
 msgid "cannot allocate name record"
 msgstr ""
 
-#: elf/dl-load.c:547 elf/dl-load.c:663 elf/dl-load.c:748 elf/dl-load.c:861
+#: elf/dl-load.c:548 elf/dl-load.c:664 elf/dl-load.c:749 elf/dl-load.c:862
 msgid "cannot create cache for search path"
 msgstr ""
 
-#: elf/dl-load.c:638
+#: elf/dl-load.c:639
 msgid "cannot create RUNPATH/RPATH copy"
 msgstr ""
 
-#: elf/dl-load.c:734
+#: elf/dl-load.c:735
 msgid "cannot create search path array"
 msgstr ""
 
-#: elf/dl-load.c:932
+#: elf/dl-load.c:934
 msgid "cannot stat shared object"
 msgstr ""
 
-#: elf/dl-load.c:1010
+#: elf/dl-load.c:1012
 msgid "cannot open zero fill device"
 msgstr ""
 
-#: elf/dl-load.c:1056 elf/dl-load.c:2317
+#: elf/dl-load.c:1059 elf/dl-load.c:2339
 msgid "cannot create shared object descriptor"
 msgstr ""
 
-#: elf/dl-load.c:1075 elf/dl-load.c:1731 elf/dl-load.c:1834
+#: elf/dl-load.c:1078 elf/dl-load.c:1751 elf/dl-load.c:1854
 msgid "cannot read file data"
 msgstr ""
 
-#: elf/dl-load.c:1121
+#: elf/dl-load.c:1124
 msgid "ELF load command alignment not page-aligned"
 msgstr ""
 
-#: elf/dl-load.c:1128
+#: elf/dl-load.c:1131
 msgid "ELF load command address/offset not properly aligned"
 msgstr ""
 
-#: elf/dl-load.c:1211
+#: elf/dl-load.c:1216
 msgid "cannot allocate TLS data structures for initial thread"
 msgstr ""
 
-#: elf/dl-load.c:1234
+#: elf/dl-load.c:1239
 msgid "cannot handle TLS data"
 msgstr ""
 
-#: elf/dl-load.c:1253
+#: elf/dl-load.c:1258
 msgid "object file has no loadable segments"
 msgstr ""
 
-#: elf/dl-load.c:1289
+#: elf/dl-load.c:1294
 msgid "failed to map segment from shared object"
 msgstr ""
 
-#: elf/dl-load.c:1315
+#: elf/dl-load.c:1320
 msgid "cannot dynamically load executable"
 msgstr ""
 
-#: elf/dl-load.c:1377
+#: elf/dl-load.c:1383
 msgid "cannot change memory protections"
 msgstr ""
 
-#: elf/dl-load.c:1396
+#: elf/dl-load.c:1402
 msgid "cannot map zero-fill pages"
 msgstr ""
 
-#: elf/dl-load.c:1410
+#: elf/dl-load.c:1416
 msgid "object file has no dynamic section"
 msgstr ""
 
-#: elf/dl-load.c:1433
+#: elf/dl-load.c:1439
 msgid "shared object cannot be dlopen()ed"
 msgstr ""
 
-#: elf/dl-load.c:1446
+#: elf/dl-load.c:1452
 msgid "cannot allocate memory for program header"
 msgstr ""
 
-#: elf/dl-load.c:1463 elf/dl-open.c:178
+#: elf/dl-load.c:1469 elf/dl-open.c:180
 msgid "invalid caller"
 msgstr ""
 
-#: elf/dl-load.c:1502
+#: elf/dl-load.c:1508
 msgid "cannot enable executable stack as shared object requires"
 msgstr ""
 
-#: elf/dl-load.c:1515
+#: elf/dl-load.c:1521
 msgid "cannot close file descriptor"
 msgstr ""
 
-#: elf/dl-load.c:1731
+#: elf/dl-load.c:1751
 msgid "file too short"
 msgstr ""
 
-#: elf/dl-load.c:1767
+#: elf/dl-load.c:1787
 msgid "invalid ELF header"
 msgstr ""
 
-#: elf/dl-load.c:1779
+#: elf/dl-load.c:1799
 msgid "ELF file data encoding not big-endian"
 msgstr ""
 
-#: elf/dl-load.c:1781
+#: elf/dl-load.c:1801
 msgid "ELF file data encoding not little-endian"
 msgstr ""
 
-#: elf/dl-load.c:1785
+#: elf/dl-load.c:1805
 msgid "ELF file version ident does not match current one"
 msgstr ""
 
-#: elf/dl-load.c:1789
+#: elf/dl-load.c:1809
 msgid "ELF file OS ABI invalid"
 msgstr ""
 
-#: elf/dl-load.c:1792
+#: elf/dl-load.c:1812
 msgid "ELF file ABI version invalid"
 msgstr ""
 
-#: elf/dl-load.c:1795
+#: elf/dl-load.c:1815
 msgid "nonzero padding in e_ident"
 msgstr ""
 
-#: elf/dl-load.c:1798
+#: elf/dl-load.c:1818
 msgid "internal error"
 msgstr ""
 
-#: elf/dl-load.c:1805
+#: elf/dl-load.c:1825
 msgid "ELF file version does not match current one"
 msgstr ""
 
-#: elf/dl-load.c:1813
+#: elf/dl-load.c:1833
 msgid "only ET_DYN and ET_EXEC can be loaded"
 msgstr ""
 
-#: elf/dl-load.c:1819
+#: elf/dl-load.c:1839
 msgid "ELF file's phentsize not the expected size"
 msgstr ""
 
-#: elf/dl-load.c:2336
+#: elf/dl-load.c:2358
 msgid "wrong ELF class: ELFCLASS64"
 msgstr ""
 
-#: elf/dl-load.c:2337
+#: elf/dl-load.c:2359
 msgid "wrong ELF class: ELFCLASS32"
 msgstr ""
 
-#: elf/dl-load.c:2340
+#: elf/dl-load.c:2362
 msgid "cannot open shared object file"
 msgstr ""
 
-#: elf/dl-lookup.c:756 ports/sysdeps/mips/dl-lookup.c:773
+#: elf/dl-lookup.c:757 ports/sysdeps/mips/dl-lookup.c:774
 msgid "relocation error"
 msgstr ""
 
-#: elf/dl-lookup.c:785 ports/sysdeps/mips/dl-lookup.c:802
+#: elf/dl-lookup.c:786 ports/sysdeps/mips/dl-lookup.c:803
 msgid "symbol lookup error"
 msgstr ""
 
-#: elf/dl-open.c:108
+#: elf/dl-open.c:110
 msgid "cannot extend global scope"
 msgstr ""
 
-#: elf/dl-open.c:510
+#: elf/dl-open.c:524
 msgid "TLS generation counter wrapped!  Please report this."
 msgstr ""
 
-#: elf/dl-open.c:532
+#: elf/dl-open.c:546
 msgid "cannot load any more object with static TLS"
 msgstr ""
 
-#: elf/dl-open.c:581
+#: elf/dl-open.c:599
 msgid "invalid mode for dlopen()"
 msgstr ""
 
-#: elf/dl-open.c:598
+#: elf/dl-open.c:616
 msgid "no more namespaces available for dlmopen()"
 msgstr ""
 
-#: elf/dl-open.c:616
+#: elf/dl-open.c:634
 msgid "invalid target namespace in dlmopen()"
 msgstr ""
 
@@ -666,23 +674,19 @@
 msgid "cannot apply additional memory protection after relocation"
 msgstr ""
 
-#: elf/dl-sym.c:162
+#: elf/dl-sym.c:163
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr ""
 
-#: elf/dl-sysdep.c:488 elf/dl-sysdep.c:500
-msgid "cannot create capability list"
-msgstr ""
-
-#: elf/dl-tls.c:872
+#: elf/dl-tls.c:875
 msgid "cannot create TLS data structures"
 msgstr ""
 
-#: elf/dl-version.c:171
+#: elf/dl-version.c:166
 msgid "version lookup error"
 msgstr ""
 
-#: elf/dl-version.c:302
+#: elf/dl-version.c:297
 msgid "cannot allocate version reference table"
 msgstr ""
 
@@ -751,157 +755,157 @@
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr ""
 
-#: elf/ldconfig.c:338
+#: elf/ldconfig.c:341
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr ""
 
-#: elf/ldconfig.c:378
+#: elf/ldconfig.c:381
 #, c-format
 msgid "%s is not a known library type"
 msgstr ""
 
-#: elf/ldconfig.c:406
+#: elf/ldconfig.c:409
 #, c-format
 msgid "Can't stat %s"
 msgstr ""
 
-#: elf/ldconfig.c:480
+#: elf/ldconfig.c:483
 #, c-format
 msgid "Can't stat %s\n"
 msgstr ""
 
-#: elf/ldconfig.c:490
+#: elf/ldconfig.c:493
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr ""
 
-#: elf/ldconfig.c:509
+#: elf/ldconfig.c:512
 #, c-format
 msgid "Can't unlink %s"
 msgstr ""
 
-#: elf/ldconfig.c:515
+#: elf/ldconfig.c:518
 #, c-format
 msgid "Can't link %s to %s"
 msgstr ""
 
-#: elf/ldconfig.c:521
+#: elf/ldconfig.c:524
 msgid " (changed)\n"
 msgstr ""
 
-#: elf/ldconfig.c:523
+#: elf/ldconfig.c:526
 msgid " (SKIPPED)\n"
 msgstr ""
 
-#: elf/ldconfig.c:578
+#: elf/ldconfig.c:581
 #, c-format
 msgid "Can't find %s"
 msgstr ""
 
-#: elf/ldconfig.c:594 elf/ldconfig.c:767 elf/ldconfig.c:826 elf/ldconfig.c:860
+#: elf/ldconfig.c:597 elf/ldconfig.c:770 elf/ldconfig.c:829 elf/ldconfig.c:863
 #, c-format
 msgid "Cannot lstat %s"
 msgstr ""
 
-#: elf/ldconfig.c:601
+#: elf/ldconfig.c:604
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr ""
 
-#: elf/ldconfig.c:610
+#: elf/ldconfig.c:613
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr ""
 
-#: elf/ldconfig.c:693
+#: elf/ldconfig.c:696
 #, c-format
 msgid "Can't open directory %s"
 msgstr ""
 
-#: elf/ldconfig.c:785 elf/ldconfig.c:847 elf/readlib.c:90
+#: elf/ldconfig.c:788 elf/ldconfig.c:850 elf/readlib.c:90
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr ""
 
-#: elf/ldconfig.c:792
+#: elf/ldconfig.c:795
 #, c-format
 msgid "Cannot stat %s"
 msgstr ""
 
-#: elf/ldconfig.c:921
+#: elf/ldconfig.c:924
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr ""
 
-#: elf/ldconfig.c:924
+#: elf/ldconfig.c:927
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr ""
 
-#: elf/ldconfig.c:927
+#: elf/ldconfig.c:930
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr ""
 
-#: elf/ldconfig.c:955
+#: elf/ldconfig.c:958
 #, c-format
 msgid ""
 "libraries %s and %s in directory %s have same soname but different type."
 msgstr ""
 
-#: elf/ldconfig.c:1064
+#: elf/ldconfig.c:1067
 #, c-format
 msgid "Warning: ignoring configuration file that cannot be opened: %s"
 msgstr ""
 
-#: elf/ldconfig.c:1130
+#: elf/ldconfig.c:1133
 #, c-format
 msgid "%s:%u: bad syntax in hwcap line"
 msgstr ""
 
-#: elf/ldconfig.c:1136
+#: elf/ldconfig.c:1139
 #, c-format
 msgid "%s:%u: hwcap index %lu above maximum %u"
 msgstr ""
 
-#: elf/ldconfig.c:1143 elf/ldconfig.c:1151
+#: elf/ldconfig.c:1146 elf/ldconfig.c:1154
 #, c-format
 msgid "%s:%u: hwcap index %lu already defined as %s"
 msgstr ""
 
-#: elf/ldconfig.c:1154
+#: elf/ldconfig.c:1157
 #, c-format
 msgid "%s:%u: duplicate hwcap %lu %s"
 msgstr ""
 
-#: elf/ldconfig.c:1176
+#: elf/ldconfig.c:1179
 #, c-format
 msgid "need absolute file name for configuration file when using -r"
 msgstr ""
 
-#: elf/ldconfig.c:1183 locale/programs/xmalloc.c:65 malloc/obstack.c:433
+#: elf/ldconfig.c:1186 locale/programs/xmalloc.c:65 malloc/obstack.c:433
 #: malloc/obstack.c:435 posix/getconf.c:1076 posix/getconf.c:1296
 #, c-format
 msgid "memory exhausted"
 msgstr ""
 
-#: elf/ldconfig.c:1215
+#: elf/ldconfig.c:1218
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr ""
 
-#: elf/ldconfig.c:1259
+#: elf/ldconfig.c:1262
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr ""
 
-#: elf/ldconfig.c:1285
+#: elf/ldconfig.c:1288
 #, c-format
 msgid "Can't chdir to /"
 msgstr ""
 
-#: elf/ldconfig.c:1326
+#: elf/ldconfig.c:1329
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr ""
@@ -921,46 +925,46 @@
 "  -v, --verbose           print all information\n"
 msgstr ""
 
-#: elf/ldd.bash.in:81
+#: elf/ldd.bash.in:80
 msgid "ldd: option \\`$1' is ambiguous"
 msgstr ""
 
-#: elf/ldd.bash.in:88
+#: elf/ldd.bash.in:87
 msgid "unrecognized option"
 msgstr ""
 
-#: elf/ldd.bash.in:89 elf/ldd.bash.in:127
+#: elf/ldd.bash.in:88 elf/ldd.bash.in:126
 msgid "Try \\`ldd --help' for more information."
 msgstr ""
 
-#: elf/ldd.bash.in:126
+#: elf/ldd.bash.in:125
 msgid "missing file arguments"
 msgstr ""
 
 #. TRANS No such file or directory.  This is a ``file doesn't exist'' error
 #. TRANS for ordinary files that are referenced in contexts where they are
 #. TRANS expected to already exist.
-#: elf/ldd.bash.in:149 sysdeps/gnu/errlist.c:36
+#: elf/ldd.bash.in:148 sysdeps/gnu/errlist.c:36
 msgid "No such file or directory"
 msgstr ""
 
-#: elf/ldd.bash.in:152 inet/rcmd.c:488
+#: elf/ldd.bash.in:151 inet/rcmd.c:488
 msgid "not regular file"
 msgstr ""
 
-#: elf/ldd.bash.in:155
+#: elf/ldd.bash.in:154
 msgid "warning: you do not have execution permission for"
 msgstr ""
 
-#: elf/ldd.bash.in:184
+#: elf/ldd.bash.in:183
 msgid "\tnot a dynamic executable"
 msgstr ""
 
-#: elf/ldd.bash.in:192
+#: elf/ldd.bash.in:191
 msgid "exited with unknown exit code"
 msgstr ""
 
-#: elf/ldd.bash.in:197
+#: elf/ldd.bash.in:196
 msgid "error: you do not have read permission for"
 msgstr ""
 
@@ -999,55 +1003,55 @@
 msgid "cannot read object name"
 msgstr ""
 
-#: elf/pldd.c:67
+#: elf/pldd.c:65
 msgid "List dynamic shared objects loaded into process."
 msgstr ""
 
-#: elf/pldd.c:71
+#: elf/pldd.c:69
 msgid "PID"
 msgstr ""
 
-#: elf/pldd.c:102
+#: elf/pldd.c:100
 #, c-format
 msgid "Exactly one parameter with process ID required.\n"
 msgstr ""
 
-#: elf/pldd.c:114
+#: elf/pldd.c:112
 #, c-format
 msgid "invalid process ID '%s'"
 msgstr ""
 
-#: elf/pldd.c:122
+#: elf/pldd.c:120
 #, c-format
 msgid "cannot open %s"
 msgstr ""
 
-#: elf/pldd.c:147
+#: elf/pldd.c:145
 #, c-format
 msgid "cannot open %s/task"
 msgstr ""
 
-#: elf/pldd.c:150
+#: elf/pldd.c:148
 #, c-format
 msgid "cannot prepare reading %s/task"
 msgstr ""
 
-#: elf/pldd.c:163
+#: elf/pldd.c:161
 #, c-format
 msgid "invalid thread ID '%s'"
 msgstr ""
 
-#: elf/pldd.c:174
+#: elf/pldd.c:172
 #, c-format
 msgid "cannot attach to process %lu"
 msgstr ""
 
-#: elf/pldd.c:246
+#: elf/pldd.c:264
 #, c-format
 msgid "cannot get information about process %lu"
 msgstr ""
 
-#: elf/pldd.c:259
+#: elf/pldd.c:277
 #, c-format
 msgid "process %lu is no ELF program"
 msgstr ""
@@ -1168,19 +1172,19 @@
 "\\nshort options.\\n"
 msgstr ""
 
-#: elf/sotruss.ksh:56
+#: elf/sotruss.ksh:55
 msgid "%s: option requires an argument -- '%s'\\n"
 msgstr ""
 
-#: elf/sotruss.ksh:62
+#: elf/sotruss.ksh:61
 msgid "%s: option is ambiguous; possibilities:"
 msgstr ""
 
-#: elf/sotruss.ksh:80
+#: elf/sotruss.ksh:79
 msgid "Written by %s.\\n"
 msgstr ""
 
-#: elf/sotruss.ksh:87
+#: elf/sotruss.ksh:86
 msgid ""
 "Usage: %s [-ef] [-F FROMLIST] [-o FILENAME] [-T TOLIST] [--exit]\n"
 "\t    [--follow] [--from FROMLIST] [--output FILENAME] [--to TOLIST]\n"
@@ -1188,7 +1192,7 @@
 "\t    EXECUTABLE [EXECUTABLE-OPTION...]\\n"
 msgstr ""
 
-#: elf/sotruss.ksh:135
+#: elf/sotruss.ksh:134
 msgid "%s: unrecognized option '%c%s'\\n"
 msgstr ""
 
@@ -1216,97 +1220,97 @@
 msgid "SHOBJ [PROFDATA]"
 msgstr ""
 
-#: elf/sprof.c:429
+#: elf/sprof.c:432
 #, c-format
 msgid "failed to load shared object `%s'"
 msgstr ""
 
-#: elf/sprof.c:438
+#: elf/sprof.c:441
 #, c-format
 msgid "cannot create internal descriptors"
 msgstr ""
 
-#: elf/sprof.c:550
+#: elf/sprof.c:553
 #, c-format
 msgid "Reopening shared object `%s' failed"
 msgstr ""
 
-#: elf/sprof.c:557 elf/sprof.c:652
+#: elf/sprof.c:560 elf/sprof.c:655
 #, c-format
 msgid "reading of section headers failed"
 msgstr ""
 
-#: elf/sprof.c:565 elf/sprof.c:660
+#: elf/sprof.c:568 elf/sprof.c:663
 #, c-format
 msgid "reading of section header string table failed"
 msgstr ""
 
-#: elf/sprof.c:591
+#: elf/sprof.c:594
 #, c-format
 msgid "*** Cannot read debuginfo file name: %m\n"
 msgstr ""
 
-#: elf/sprof.c:612
+#: elf/sprof.c:615
 #, c-format
 msgid "cannot determine file name"
 msgstr ""
 
-#: elf/sprof.c:645
+#: elf/sprof.c:648
 #, c-format
 msgid "reading of ELF header failed"
 msgstr ""
 
-#: elf/sprof.c:681
+#: elf/sprof.c:684
 #, c-format
 msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
 msgstr ""
 
-#: elf/sprof.c:711
+#: elf/sprof.c:714
 #, c-format
 msgid "failed to load symbol data"
 msgstr ""
 
-#: elf/sprof.c:776
+#: elf/sprof.c:779
 #, c-format
 msgid "cannot load profiling data"
 msgstr ""
 
-#: elf/sprof.c:785
+#: elf/sprof.c:788
 #, c-format
 msgid "while stat'ing profiling data file"
 msgstr ""
 
-#: elf/sprof.c:793
+#: elf/sprof.c:796
 #, c-format
 msgid "profiling data file `%s' does not match shared object `%s'"
 msgstr ""
 
-#: elf/sprof.c:804
+#: elf/sprof.c:807
 #, c-format
 msgid "failed to mmap the profiling data file"
 msgstr ""
 
-#: elf/sprof.c:812
+#: elf/sprof.c:815
 #, c-format
 msgid "error while closing the profiling data file"
 msgstr ""
 
-#: elf/sprof.c:821 elf/sprof.c:919
+#: elf/sprof.c:824 elf/sprof.c:922
 #, c-format
 msgid "cannot create internal descriptor"
 msgstr ""
 
-#: elf/sprof.c:895
+#: elf/sprof.c:898
 #, c-format
 msgid "`%s' is no correct profile data file for `%s'"
 msgstr ""
 
-#: elf/sprof.c:1076 elf/sprof.c:1134
+#: elf/sprof.c:1079 elf/sprof.c:1137
 #, c-format
 msgid "cannot allocate symbol data"
 msgstr ""
 
-#: iconv/iconv_charmap.c:143 iconv/iconv_prog.c:445
+#: iconv/iconv_charmap.c:143 iconv/iconv_prog.c:448
 #, c-format
 msgid "cannot open output file"
 msgstr ""
@@ -1321,18 +1325,18 @@
 msgid "illegal input sequence at position %Zd"
 msgstr ""
 
-#: iconv/iconv_charmap.c:482 iconv/iconv_prog.c:536
+#: iconv/iconv_charmap.c:482 iconv/iconv_prog.c:539
 #, c-format
 msgid "incomplete character or shift sequence at end of buffer"
 msgstr ""
 
-#: iconv/iconv_charmap.c:527 iconv/iconv_charmap.c:563 iconv/iconv_prog.c:579
-#: iconv/iconv_prog.c:615
+#: iconv/iconv_charmap.c:527 iconv/iconv_charmap.c:563 iconv/iconv_prog.c:582
+#: iconv/iconv_prog.c:618
 #, c-format
 msgid "error while reading the input"
 msgstr ""
 
-#: iconv/iconv_charmap.c:545 iconv/iconv_prog.c:597
+#: iconv/iconv_charmap.c:545 iconv/iconv_prog.c:600
 #, c-format
 msgid "unable to allocate buffer for input"
 msgstr ""
@@ -1415,27 +1419,27 @@
 msgid "error while closing output file"
 msgstr ""
 
-#: iconv/iconv_prog.c:455
+#: iconv/iconv_prog.c:458
 #, c-format
 msgid "conversion stopped due to problem in writing the output"
 msgstr ""
 
-#: iconv/iconv_prog.c:532
+#: iconv/iconv_prog.c:535
 #, c-format
 msgid "illegal input sequence at position %ld"
 msgstr ""
 
-#: iconv/iconv_prog.c:540
+#: iconv/iconv_prog.c:543
 #, c-format
 msgid "internal error (illegal descriptor)"
 msgstr ""
 
-#: iconv/iconv_prog.c:543
+#: iconv/iconv_prog.c:546
 #, c-format
 msgid "unknown iconv() error %d"
 msgstr ""
 
-#: iconv/iconv_prog.c:788
+#: iconv/iconv_prog.c:791
 msgid ""
 "The following list contain all the coded character sets known.  This does\n"
 "not necessarily mean that all combinations of these names can be used for\n"
@@ -1477,12 +1481,12 @@
 msgid "no output file produced because warnings were issued"
 msgstr ""
 
-#: iconv/iconvconfig.c:431
+#: iconv/iconvconfig.c:434
 #, c-format
 msgid "while inserting in search tree"
 msgstr ""
 
-#: iconv/iconvconfig.c:1240
+#: iconv/iconvconfig.c:1243
 #, c-format
 msgid "cannot generate output file"
 msgstr ""
@@ -2592,7 +2596,7 @@
 msgid "Cannot set LC_ALL to default locale"
 msgstr ""
 
-#: locale/programs/locale.c:518
+#: locale/programs/locale.c:521
 #, c-format
 msgid "while preparing output"
 msgstr ""
@@ -2687,7 +2691,7 @@
 msgstr ""
 
 #: locale/programs/localedef.c:253 locale/programs/localedef.c:269
-#: locale/programs/localedef.c:595 locale/programs/localedef.c:615
+#: locale/programs/localedef.c:601 locale/programs/localedef.c:621
 #, c-format
 msgid "cannot open locale definition file `%s'"
 msgstr ""
@@ -2697,7 +2701,7 @@
 msgid "cannot write output files to `%s'"
 msgstr ""
 
-#: locale/programs/localedef.c:362
+#: locale/programs/localedef.c:367
 #, c-format
 msgid ""
 "System's directory for character maps : %s\n"
@@ -2706,18 +2710,18 @@
 "%s"
 msgstr ""
 
-#: locale/programs/localedef.c:563
+#: locale/programs/localedef.c:569
 #, c-format
 msgid "circular dependencies between locale definitions"
 msgstr ""
 
-#: locale/programs/localedef.c:569
+#: locale/programs/localedef.c:575
 #, c-format
 msgid "cannot add already read locale `%s' a second time"
 msgstr ""
 
 #: locale/programs/locarchive.c:113 locale/programs/locarchive.c:347
-#: nss/makedb.c:289
+#: nss/makedb.c:290
 #, c-format
 msgid "cannot create temporary file"
 msgstr ""
@@ -2911,7 +2915,7 @@
 msgid "repertoire map file `%s' not found"
 msgstr ""
 
-#: login/programs/pt_chown.c:77
+#: login/programs/pt_chown.c:78
 #, c-format
 msgid ""
 "Set the owner, group and access permission of the slave pseudo terminal "
@@ -2920,7 +2924,7 @@
 "to be run directly from the command line.\n"
 msgstr ""
 
-#: login/programs/pt_chown.c:87
+#: login/programs/pt_chown.c:92
 #, c-format
 msgid ""
 "The owner is set to the current user, the group is set to `%s', and the "
@@ -2929,33 +2933,33 @@
 "%s"
 msgstr ""
 
-#: login/programs/pt_chown.c:191
+#: login/programs/pt_chown.c:198
 #, c-format
 msgid "too many arguments"
 msgstr ""
 
-#: login/programs/pt_chown.c:199
+#: login/programs/pt_chown.c:206
 #, c-format
 msgid "needs to be installed setuid `root'"
 msgstr ""
 
-#: malloc/mcheck.c:349
+#: malloc/mcheck.c:348
 msgid "memory is consistent, library is buggy\n"
 msgstr ""
 
-#: malloc/mcheck.c:352
+#: malloc/mcheck.c:351
 msgid "memory clobbered before allocated block\n"
 msgstr ""
 
-#: malloc/mcheck.c:355
+#: malloc/mcheck.c:354
 msgid "memory clobbered past end of allocated block\n"
 msgstr ""
 
-#: malloc/mcheck.c:358
+#: malloc/mcheck.c:357
 msgid "block freed twice\n"
 msgstr ""
 
-#: malloc/mcheck.c:361
+#: malloc/mcheck.c:360
 msgid "bogus mcheck_status, library is buggy\n"
 msgstr ""
 
@@ -2994,7 +2998,7 @@
 "\n"
 msgstr ""
 
-#: malloc/memusage.sh:100
+#: malloc/memusage.sh:99
 msgid ""
 "Syntax: memusage [--data=FILE] [--progname=NAME] [--png=FILE] [--"
 "unbuffered]\n"
@@ -3003,49 +3007,49 @@
 "\t    PROGRAM [PROGRAMOPTION]..."
 msgstr ""
 
-#: malloc/memusage.sh:192
+#: malloc/memusage.sh:191
 msgid "memusage: option \\`${1##*=}' is ambiguous"
 msgstr ""
 
-#: malloc/memusage.sh:201
+#: malloc/memusage.sh:200
 msgid "memusage: unrecognized option \\`$1'"
 msgstr ""
 
-#: malloc/memusage.sh:214
+#: malloc/memusage.sh:213
 msgid "No program name given"
 msgstr ""
 
+#: malloc/memusagestat.c:55
+msgid "Name output file"
+msgstr ""
+
 #: malloc/memusagestat.c:56
-msgid "Name output file"
+msgid "Title string used in output graphic"
 msgstr ""
 
 #: malloc/memusagestat.c:57
-msgid "Title string used in output graphic"
-msgstr ""
-
-#: malloc/memusagestat.c:58
 msgid ""
 "Generate output linear to time (default is linear to number of function "
 "calls)"
 msgstr ""
 
+#: malloc/memusagestat.c:59
+msgid "Also draw graph for total memory consumption"
+msgstr ""
+
 #: malloc/memusagestat.c:60
-msgid "Also draw graph for total memory consumption"
+msgid "Make output graphic VALUE pixels wide"
 msgstr ""
 
 #: malloc/memusagestat.c:61
-msgid "Make output graphic VALUE pixels wide"
-msgstr ""
-
-#: malloc/memusagestat.c:62
 msgid "Make output graphic VALUE pixels high"
 msgstr ""
 
-#: malloc/memusagestat.c:67
+#: malloc/memusagestat.c:66
 msgid "Generate graphic from memory profiling data"
 msgstr ""
 
-#: malloc/memusagestat.c:70
+#: malloc/memusagestat.c:69
 msgid "DATAFILE [OUTFILE]"
 msgstr ""
 
@@ -3943,23 +3947,23 @@
 msgid "setgroups failed"
 msgstr ""
 
-#: nscd/grpcache.c:390 nscd/hstcache.c:440 nscd/initgrcache.c:411
+#: nscd/grpcache.c:407 nscd/hstcache.c:440 nscd/initgrcache.c:411
 #: nscd/pwdcache.c:383 nscd/servicescache.c:338
 #, c-format
 msgid "short write in %s: %s"
 msgstr ""
 
-#: nscd/grpcache.c:435 nscd/initgrcache.c:77
+#: nscd/grpcache.c:452 nscd/initgrcache.c:77
 #, c-format
 msgid "Haven't found \"%s\" in group cache!"
 msgstr ""
 
-#: nscd/grpcache.c:437 nscd/initgrcache.c:79
+#: nscd/grpcache.c:454 nscd/initgrcache.c:79
 #, c-format
 msgid "Reloading \"%s\" in group cache!"
 msgstr ""
 
-#: nscd/grpcache.c:516
+#: nscd/grpcache.c:533
 #, c-format
 msgid "Invalid numeric gid \"%s\"!"
 msgstr ""
@@ -4042,7 +4046,7 @@
 msgid "Name Service Cache Daemon."
 msgstr ""
 
-#: nscd/nscd.c:164 nss/getent.c:999 nss/makedb.c:207
+#: nscd/nscd.c:164 nss/getent.c:999 nss/makedb.c:208
 #, c-format
 msgid "wrong number of arguments"
 msgstr ""
@@ -4071,32 +4075,32 @@
 msgid "Could not create log file"
 msgstr ""
 
-#: nscd/nscd.c:346 nscd/nscd.c:371 nscd/nscd_stat.c:173
+#: nscd/nscd.c:348 nscd/nscd.c:373 nscd/nscd_stat.c:173
 #, c-format
 msgid "Only root is allowed to use this option!"
 msgstr ""
 
-#: nscd/nscd.c:386
+#: nscd/nscd.c:388
 #, c-format
 msgid "'%s' is not a known database"
 msgstr ""
 
-#: nscd/nscd.c:411 nscd/nscd_stat.c:192
+#: nscd/nscd.c:413 nscd/nscd_stat.c:192
 #, c-format
 msgid "write incomplete"
 msgstr ""
 
-#: nscd/nscd.c:422
+#: nscd/nscd.c:424
 #, c-format
 msgid "cannot read invalidate ACK"
 msgstr ""
 
-#: nscd/nscd.c:428
+#: nscd/nscd.c:430
 #, c-format
 msgid "invalidation failed"
 msgstr ""
 
-#: nscd/nscd.c:438
+#: nscd/nscd.c:440
 #, c-format
 msgid "secure services not implemented anymore"
 msgstr ""
@@ -4387,97 +4391,97 @@
 msgid "Unknown database: %s\n"
 msgstr ""
 
-#: nss/makedb.c:117
+#: nss/makedb.c:118
 msgid "Convert key to lower case"
 msgstr ""
 
-#: nss/makedb.c:120
+#: nss/makedb.c:121
 msgid "Do not print messages while building database"
 msgstr ""
 
-#: nss/makedb.c:122
+#: nss/makedb.c:123
 msgid "Print content of database file, one entry a line"
 msgstr ""
 
-#: nss/makedb.c:123
+#: nss/makedb.c:124
 msgid "CHAR"
 msgstr ""
 
-#: nss/makedb.c:124
+#: nss/makedb.c:125
 msgid "Generated line not part of iteration"
 msgstr ""
 
-#: nss/makedb.c:129
+#: nss/makedb.c:130
 msgid "Create simple database from textual input."
 msgstr ""
 
-#: nss/makedb.c:132
+#: nss/makedb.c:133
 msgid ""
 "INPUT-FILE OUTPUT-FILE\n"
 "-o OUTPUT-FILE INPUT-FILE\n"
 "-u INPUT-FILE"
 msgstr ""
 
-#: nss/makedb.c:228
+#: nss/makedb.c:229
 #, c-format
 msgid "cannot open database file `%s'"
 msgstr ""
 
-#: nss/makedb.c:273
+#: nss/makedb.c:274
 #, c-format
 msgid "no entries to be processed"
 msgstr ""
 
-#: nss/makedb.c:283
+#: nss/makedb.c:284
 #, c-format
 msgid "cannot create temporary file name"
 msgstr ""
 
-#: nss/makedb.c:305
+#: nss/makedb.c:306
 #, c-format
 msgid "cannot stat newly created file"
 msgstr ""
 
-#: nss/makedb.c:316
+#: nss/makedb.c:317
 #, c-format
 msgid "cannot rename temporary file"
 msgstr ""
 
-#: nss/makedb.c:529 nss/makedb.c:552
+#: nss/makedb.c:533 nss/makedb.c:556
 #, c-format
 msgid "cannot create search tree"
 msgstr ""
 
-#: nss/makedb.c:558
+#: nss/makedb.c:562
 msgid "duplicate key"
 msgstr ""
 
-#: nss/makedb.c:570
+#: nss/makedb.c:574
 #, c-format
 msgid "problems while reading `%s'"
 msgstr ""
 
-#: nss/makedb.c:794
+#: nss/makedb.c:801
 #, c-format
 msgid "failed to write new database file"
 msgstr ""
 
-#: nss/makedb.c:807
+#: nss/makedb.c:814
 #, c-format
 msgid "cannot stat database file"
 msgstr ""
 
-#: nss/makedb.c:812
+#: nss/makedb.c:819
 #, c-format
 msgid "cannot map database file"
 msgstr ""
 
-#: nss/makedb.c:815
+#: nss/makedb.c:822
 #, c-format
 msgid "file not a database file"
 msgstr ""
 
-#: nss/makedb.c:866
+#: nss/makedb.c:873
 #, c-format
 msgid "cannot set file creation context for `%s'"
 msgstr ""
@@ -4652,7 +4656,7 @@
 msgid "No previous regular expression"
 msgstr ""
 
-#: posix/wordexp.c:1829
+#: posix/wordexp.c:1830
 msgid "parameter null or not set"
 msgstr ""
 
@@ -4919,8 +4923,8 @@
 msgstr ""
 
 #: sunrpc/auth_unix.c:111 sunrpc/clnt_tcp.c:123 sunrpc/clnt_udp.c:134
-#: sunrpc/clnt_unix.c:124 sunrpc/svc_tcp.c:171 sunrpc/svc_tcp.c:216
-#: sunrpc/svc_udp.c:145 sunrpc/svc_unix.c:171 sunrpc/svc_unix.c:212
+#: sunrpc/clnt_unix.c:124 sunrpc/svc_tcp.c:188 sunrpc/svc_tcp.c:233
+#: sunrpc/svc_udp.c:162 sunrpc/svc_unix.c:188 sunrpc/svc_unix.c:229
 #: sunrpc/xdr.c:630 sunrpc/xdr.c:790 sunrpc/xdr_array.c:97
 #: sunrpc/xdr_rec.c:151 sunrpc/xdr_ref.c:76
 msgid "out of memory\n"
@@ -5085,242 +5089,246 @@
 msgid "Cannot receive reply to broadcast"
 msgstr ""
 
-#: sunrpc/rpc_main.c:280
+#: sunrpc/rpc_main.c:277
 #, c-format
 msgid "%s: output would overwrite %s\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:287
+#: sunrpc/rpc_main.c:284
 #, c-format
 msgid "%s: unable to open %s: %m\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:299
+#: sunrpc/rpc_main.c:296
 #, c-format
 msgid "%s: while writing output %s: %m"
 msgstr ""
 
-#: sunrpc/rpc_main.c:334
-#, c-format
-msgid "cannot find C preprocessor: %s \n"
-msgstr ""
-
-#: sunrpc/rpc_main.c:342
-msgid "cannot find any C preprocessor (cpp)\n"
-msgstr ""
-
-#: sunrpc/rpc_main.c:411
+#: sunrpc/rpc_main.c:332 sunrpc/rpc_main.c:371
+#, c-format
+msgid "cannot find C preprocessor: %s\n"
+msgstr ""
+
+#: sunrpc/rpc_main.c:407
 #, c-format
 msgid "%s: C preprocessor failed with signal %d\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:414
+#: sunrpc/rpc_main.c:410
 #, c-format
 msgid "%s: C preprocessor failed with exit code %d\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:454
+#: sunrpc/rpc_main.c:450
 #, c-format
 msgid "illegal nettype: `%s'\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1089
+#: sunrpc/rpc_main.c:1085
 #, c-format
 msgid "rpcgen: too many defines\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1101
+#: sunrpc/rpc_main.c:1097
 #, c-format
 msgid "rpcgen: arglist coding error\n"
 msgstr ""
 
 #. TRANS: the file will not be removed; this is an
 #. TRANS: informative message.
-#: sunrpc/rpc_main.c:1134
+#: sunrpc/rpc_main.c:1130
 #, c-format
 msgid "file `%s' already exists and may be overwritten\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1179
+#: sunrpc/rpc_main.c:1175
 #, c-format
 msgid "Cannot specify more than one input file!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1349
+#: sunrpc/rpc_main.c:1345
 #, c-format
 msgid "This implementation doesn't support newstyle or MT-safe code!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1358
+#: sunrpc/rpc_main.c:1354
 #, c-format
 msgid "Cannot use netid flag with inetd flag!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1367
+#: sunrpc/rpc_main.c:1363
 #, c-format
 msgid "Cannot use netid flag without TIRPC!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1374
+#: sunrpc/rpc_main.c:1370
 #, c-format
 msgid "Cannot use table flags with newstyle!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1393
+#: sunrpc/rpc_main.c:1389
 #, c-format
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1398
+#: sunrpc/rpc_main.c:1394
 #, c-format
 msgid "Cannot have more than one file generation flag!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1407
+#: sunrpc/rpc_main.c:1403
 #, c-format
 msgid "usage: %s infile\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1408
+#: sunrpc/rpc_main.c:1404
 #, c-format
 msgid ""
 "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] "
 "infile\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1410
+#: sunrpc/rpc_main.c:1406
 #, c-format
 msgid "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1412
+#: sunrpc/rpc_main.c:1408
 #, c-format
 msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1413
+#: sunrpc/rpc_main.c:1409
 #, c-format
 msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
 msgstr ""
 
+#: sunrpc/rpc_main.c:1417
+#, c-format
+msgid "options:\n"
+msgstr ""
+
+#: sunrpc/rpc_main.c:1418
+#, c-format
+msgid "-a\t\tgenerate all files, including samples\n"
+msgstr ""
+
+#: sunrpc/rpc_main.c:1419
+#, c-format
+msgid "-b\t\tbackward compatibility mode (generates code for SunOS 4.1)\n"
+msgstr ""
+
+#: sunrpc/rpc_main.c:1420
+#, c-format
+msgid "-c\t\tgenerate XDR routines\n"
+msgstr ""
+
 #: sunrpc/rpc_main.c:1421
 #, c-format
-msgid "options:\n"
+msgid "-C\t\tANSI C mode\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1422
 #, c-format
-msgid "-a\t\tgenerate all files, including samples\n"
+msgid "-Dname[=value]\tdefine a symbol (same as #define)\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1423
 #, c-format
-msgid "-b\t\tbackward compatibility mode (generates code for SunOS 4.1)\n"
+msgid "-h\t\tgenerate header file\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1424
 #, c-format
-msgid "-c\t\tgenerate XDR routines\n"
+msgid "-i size\t\tsize at which to start generating inline code\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1425
 #, c-format
-msgid "-C\t\tANSI C mode\n"
+msgid "-I\t\tgenerate code for inetd support in server (for SunOS 4.1)\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1426
 #, c-format
-msgid "-Dname[=value]\tdefine a symbol (same as #define)\n"
+msgid "-K seconds\tserver exits after K seconds of inactivity\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1427
 #, c-format
-msgid "-h\t\tgenerate header file\n"
+msgid "-l\t\tgenerate client side stubs\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1428
 #, c-format
-msgid "-i size\t\tsize at which to start generating inline code\n"
+msgid "-L\t\tserver errors will be printed to syslog\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1429
 #, c-format
-msgid "-I\t\tgenerate code for inetd support in server (for SunOS 4.1)\n"
+msgid "-m\t\tgenerate server side stubs\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1430
 #, c-format
-msgid "-K seconds\tserver exits after K seconds of inactivity\n"
+msgid "-M\t\tgenerate MT-safe code\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1431
 #, c-format
-msgid "-l\t\tgenerate client side stubs\n"
+msgid "-n netid\tgenerate server code that supports named netid\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1432
 #, c-format
-msgid "-L\t\tserver errors will be printed to syslog\n"
+msgid "-N\t\tsupports multiple arguments and call-by-value\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1433
 #, c-format
-msgid "-m\t\tgenerate server side stubs\n"
+msgid "-o outfile\tname of the output file\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1434
 #, c-format
-msgid "-M\t\tgenerate MT-safe code\n"
+msgid "-s nettype\tgenerate server code that supports named nettype\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1435
 #, c-format
-msgid "-n netid\tgenerate server code that supports named netid\n"
+msgid "-Sc\t\tgenerate sample client code that uses remote procedures\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1436
 #, c-format
-msgid "-N\t\tsupports multiple arguments and call-by-value\n"
+msgid "-Ss\t\tgenerate sample server code that defines remote procedures\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1437
 #, c-format
-msgid "-o outfile\tname of the output file\n"
+msgid "-Sm \t\tgenerate makefile template \n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1438
 #, c-format
-msgid "-s nettype\tgenerate server code that supports named nettype\n"
+msgid "-t\t\tgenerate RPC dispatch table\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1439
 #, c-format
-msgid "-Sc\t\tgenerate sample client code that uses remote procedures\n"
+msgid "-T\t\tgenerate code to support RPC dispatch tables\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1440
 #, c-format
-msgid "-Ss\t\tgenerate sample server code that defines remote procedures\n"
-msgstr ""
-
-#: sunrpc/rpc_main.c:1441
-#, c-format
-msgid "-Sm \t\tgenerate makefile template \n"
+msgid "-Y path\t\tdirectory name to find C preprocessor (cpp)\n"
 msgstr ""
 
 #: sunrpc/rpc_main.c:1442
 #, c-format
-msgid "-t\t\tgenerate RPC dispatch table\n"
-msgstr ""
-
-#: sunrpc/rpc_main.c:1443
-#, c-format
-msgid "-T\t\tgenerate code to support RPC dispatch tables\n"
-msgstr ""
-
-#: sunrpc/rpc_main.c:1444
-#, c-format
-msgid "-Y path\t\tdirectory name to find C preprocessor (cpp)\n"
+msgid ""
+"\n"
+"For bug reporting instructions, please see:\n"
+"%s.\n"
 msgstr ""
 
 #: sunrpc/rpc_scan.c:112
@@ -5456,59 +5464,59 @@
 msgid "never registered prog %d\n"
 msgstr ""
 
-#: sunrpc/svc_tcp.c:147
+#: sunrpc/svc_tcp.c:164
 msgid "svc_tcp.c - tcp socket creation problem"
 msgstr ""
 
-#: sunrpc/svc_tcp.c:162
+#: sunrpc/svc_tcp.c:179
 msgid "svc_tcp.c - cannot getsockname or listen"
 msgstr ""
 
-#: sunrpc/svc_udp.c:120
+#: sunrpc/svc_udp.c:137
 msgid "svcudp_create: socket creation problem"
 msgstr ""
 
-#: sunrpc/svc_udp.c:134
+#: sunrpc/svc_udp.c:151
 msgid "svcudp_create - cannot getsockname"
 msgstr ""
 
-#: sunrpc/svc_udp.c:166
+#: sunrpc/svc_udp.c:183
 msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n"
 msgstr ""
 
-#: sunrpc/svc_udp.c:474
+#: sunrpc/svc_udp.c:495
 msgid "enablecache: cache already enabled"
 msgstr ""
 
-#: sunrpc/svc_udp.c:480
+#: sunrpc/svc_udp.c:501
 msgid "enablecache: could not allocate cache"
 msgstr ""
 
-#: sunrpc/svc_udp.c:489
+#: sunrpc/svc_udp.c:510
 msgid "enablecache: could not allocate cache data"
 msgstr ""
 
-#: sunrpc/svc_udp.c:497
+#: sunrpc/svc_udp.c:518
 msgid "enablecache: could not allocate cache fifo"
 msgstr ""
 
-#: sunrpc/svc_udp.c:533
+#: sunrpc/svc_udp.c:554
 msgid "cache_set: victim not found"
 msgstr ""
 
-#: sunrpc/svc_udp.c:544
+#: sunrpc/svc_udp.c:565
 msgid "cache_set: victim alloc failed"
 msgstr ""
 
-#: sunrpc/svc_udp.c:551
+#: sunrpc/svc_udp.c:572
 msgid "cache_set: could not allocate new rpc_buffer"
 msgstr ""
 
-#: sunrpc/svc_unix.c:145
+#: sunrpc/svc_unix.c:162
 msgid "svc_unix.c - AF_UNIX socket creation problem"
 msgstr ""
 
-#: sunrpc/svc_unix.c:161
+#: sunrpc/svc_unix.c:178
 msgid "svc_unix.c - cannot getsockname or listen"
 msgstr ""
 
@@ -5618,39 +5626,39 @@
 msgstr ""
 
 #: sysdeps/generic/siglist.h:53
+msgid "User defined signal 1"
+msgstr ""
+
+#: sysdeps/generic/siglist.h:54
+msgid "User defined signal 2"
+msgstr ""
+
+#: sysdeps/generic/siglist.h:58
+msgid "EMT trap"
+msgstr ""
+
+#: sysdeps/generic/siglist.h:61
+msgid "Bad system call"
+msgstr ""
+
+#: sysdeps/generic/siglist.h:64
+msgid "Stack fault"
+msgstr ""
+
+#: sysdeps/generic/siglist.h:67
+msgid "Information request"
+msgstr ""
+
+#: sysdeps/generic/siglist.h:69
+msgid "Power failure"
+msgstr ""
+
+#: sysdeps/generic/siglist.h:72
+msgid "Resource lost"
+msgstr ""
+
+#: sysdeps/generic/siglist.h:75
 msgid "Window changed"
-msgstr ""
-
-#: sysdeps/generic/siglist.h:54
-msgid "User defined signal 1"
-msgstr ""
-
-#: sysdeps/generic/siglist.h:55
-msgid "User defined signal 2"
-msgstr ""
-
-#: sysdeps/generic/siglist.h:59
-msgid "EMT trap"
-msgstr ""
-
-#: sysdeps/generic/siglist.h:62
-msgid "Bad system call"
-msgstr ""
-
-#: sysdeps/generic/siglist.h:65
-msgid "Stack fault"
-msgstr ""
-
-#: sysdeps/generic/siglist.h:68
-msgid "Information request"
-msgstr ""
-
-#: sysdeps/generic/siglist.h:70
-msgid "Power failure"
-msgstr ""
-
-#: sysdeps/generic/siglist.h:73
-msgid "Resource lost"
 msgstr ""
 
 #. TRANS Operation not permitted; only the owner of the file (or other resource)
@@ -6584,411 +6592,411 @@
 msgid "cannot read header from `%s'"
 msgstr ""
 
-#: timezone/zdump.c:215
+#: timezone/zdump.c:246
 msgid "lacks alphabetic at start"
 msgstr ""
 
-#: timezone/zdump.c:217
+#: timezone/zdump.c:248
 msgid "has fewer than 3 alphabetics"
 msgstr ""
 
-#: timezone/zdump.c:219
+#: timezone/zdump.c:250
 msgid "has more than 6 alphabetics"
 msgstr ""
 
-#: timezone/zdump.c:227
+#: timezone/zdump.c:258
 msgid "differs from POSIX standard"
 msgstr ""
 
-#: timezone/zdump.c:233
+#: timezone/zdump.c:264
 #, c-format
 msgid "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"
 msgstr ""
 
-#: timezone/zdump.c:244
+#: timezone/zdump.c:273
 #, c-format
 msgid ""
 "%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] "
 "zonename ...\n"
 "\n"
-"Report bugs to tz@xxxxxxxxxxxxxxxxxx\n"
-msgstr ""
-
-#: timezone/zdump.c:313
+"Report bugs to %s.\n"
+msgstr ""
+
+#: timezone/zdump.c:340
 #, c-format
 msgid "%s: wild -c argument %s\n"
 msgstr ""
 
-#: timezone/zdump.c:400
+#: timezone/zdump.c:426
 msgid "Error writing to standard output"
 msgstr ""
 
-#: timezone/zdump.c:423
+#: timezone/zdump.c:439
 #, c-format
 msgid ""
 "%s: use of -v on system with floating time_t other than float or double\n"
 msgstr ""
 
-#: timezone/zic.c:388
+#: timezone/zic.c:361
 #, c-format
 msgid "%s: Memory exhausted: %s\n"
 msgstr ""
 
-#: timezone/zic.c:434
+#: timezone/zic.c:401
 #, c-format
 msgid "\"%s\", line %d: %s"
 msgstr ""
 
-#: timezone/zic.c:437
+#: timezone/zic.c:404
 #, c-format
 msgid " (rule from \"%s\", line %d)"
 msgstr ""
 
-#: timezone/zic.c:449
+#: timezone/zic.c:415
 msgid "warning: "
 msgstr ""
 
-#: timezone/zic.c:459
+#: timezone/zic.c:425
 #, c-format
 msgid ""
 "%s: usage is %s [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p "
 "posixrules ] \\\n"
 "\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
 "\n"
-"Report bugs to tz@xxxxxxxxxxxxxxxxxx\n"
-msgstr ""
-
-#: timezone/zic.c:496
+"Report bugs to %s.\n"
+msgstr ""
+
+#: timezone/zic.c:460
 msgid "wild compilation-time specification of zic_t"
 msgstr ""
 
-#: timezone/zic.c:515
+#: timezone/zic.c:479
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr ""
 
-#: timezone/zic.c:525
+#: timezone/zic.c:489
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr ""
 
-#: timezone/zic.c:535
+#: timezone/zic.c:499
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr ""
 
-#: timezone/zic.c:545
+#: timezone/zic.c:509
 #, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr ""
 
-#: timezone/zic.c:555
+#: timezone/zic.c:519
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr ""
 
-#: timezone/zic.c:604
+#: timezone/zic.c:566
 msgid "link to link"
 msgstr ""
 
-#: timezone/zic.c:669
+#: timezone/zic.c:629
 msgid "hard link failed, symbolic link used"
 msgstr ""
 
-#: timezone/zic.c:677
+#: timezone/zic.c:637
 #, c-format
 msgid "%s: Can't link from %s to %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:749 timezone/zic.c:751
+#: timezone/zic.c:697 timezone/zic.c:699
 msgid "same rule name in multiple files"
 msgstr ""
 
-#: timezone/zic.c:792
+#: timezone/zic.c:740
 msgid "unruly zone"
 msgstr ""
 
-#: timezone/zic.c:799
+#: timezone/zic.c:747
 #, c-format
 msgid "%s in ruleless zone"
 msgstr ""
 
-#: timezone/zic.c:820
+#: timezone/zic.c:767
 msgid "standard input"
 msgstr ""
 
-#: timezone/zic.c:825
+#: timezone/zic.c:772
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:836
+#: timezone/zic.c:783
 msgid "line too long"
 msgstr ""
 
-#: timezone/zic.c:856
+#: timezone/zic.c:803
 msgid "input line of unknown type"
 msgstr ""
 
-#: timezone/zic.c:872
+#: timezone/zic.c:819
 #, c-format
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr ""
 
-#: timezone/zic.c:879 timezone/zic.c:1316 timezone/zic.c:1338
+#: timezone/zic.c:826 timezone/zic.c:1243 timezone/zic.c:1265
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr ""
 
-#: timezone/zic.c:887
+#: timezone/zic.c:834
 #, c-format
 msgid "%s: Error reading %s\n"
 msgstr ""
 
+#: timezone/zic.c:841
+#, c-format
+msgid "%s: Error closing %s: %s\n"
+msgstr ""
+
+#: timezone/zic.c:846
+msgid "expected continuation line not found"
+msgstr ""
+
+#: timezone/zic.c:887 timezone/zic.c:2411 timezone/zic.c:2425
+msgid "time overflow"
+msgstr ""
+
+#: timezone/zic.c:891
+msgid "24:00 not handled by pre-1998 versions of zic"
+msgstr ""
+
 #: timezone/zic.c:894
-#, c-format
-msgid "%s: Error closing %s: %s\n"
-msgstr ""
-
-#: timezone/zic.c:899
-msgid "expected continuation line not found"
-msgstr ""
-
-#: timezone/zic.c:943 timezone/zic.c:2541 timezone/zic.c:2560
-msgid "time overflow"
-msgstr ""
-
-#: timezone/zic.c:947
-msgid "24:00 not handled by pre-1998 versions of zic"
-msgstr ""
-
-#: timezone/zic.c:950
 msgid "values over 24 hours not handled by pre-2007 versions of zic"
 msgstr ""
 
-#: timezone/zic.c:963
+#: timezone/zic.c:905
 msgid "wrong number of fields on Rule line"
 msgstr ""
 
-#: timezone/zic.c:967
+#: timezone/zic.c:909
 msgid "nameless rule"
 msgstr ""
 
+#: timezone/zic.c:914
+msgid "invalid saved time"
+msgstr ""
+
+#: timezone/zic.c:932
+msgid "wrong number of fields on Zone line"
+msgstr ""
+
+#: timezone/zic.c:938
+#, c-format
+msgid "\"Zone %s\" line and -l option are mutually exclusive"
+msgstr ""
+
+#: timezone/zic.c:946
+#, c-format
+msgid "\"Zone %s\" line and -p option are mutually exclusive"
+msgstr ""
+
+#: timezone/zic.c:958
+#, c-format
+msgid "duplicate zone name %s (file \"%s\", line %d)"
+msgstr ""
+
 #: timezone/zic.c:972
-msgid "invalid saved time"
-msgstr ""
-
-#: timezone/zic.c:993
-msgid "wrong number of fields on Zone line"
-msgstr ""
-
-#: timezone/zic.c:999
-#, c-format
-msgid "\"Zone %s\" line and -l option are mutually exclusive"
-msgstr ""
-
-#: timezone/zic.c:1007
-#, c-format
-msgid "\"Zone %s\" line and -p option are mutually exclusive"
-msgstr ""
-
-#: timezone/zic.c:1019
-#, c-format
-msgid "duplicate zone name %s (file \"%s\", line %d)"
-msgstr ""
-
-#: timezone/zic.c:1035
 msgid "wrong number of fields on Zone continuation line"
 msgstr ""
 
+#: timezone/zic.c:1009
+msgid "invalid UTC offset"
+msgstr ""
+
+#: timezone/zic.c:1012
+msgid "invalid abbreviation format"
+msgstr ""
+
+#: timezone/zic.c:1041
+msgid "Zone continuation line end time is not after end time of previous line"
+msgstr ""
+
+#: timezone/zic.c:1066
+msgid "wrong number of fields on Leap line"
+msgstr ""
+
 #: timezone/zic.c:1075
-msgid "invalid UTC offset"
-msgstr ""
-
-#: timezone/zic.c:1078
-msgid "invalid abbreviation format"
-msgstr ""
-
-#: timezone/zic.c:1107
-msgid "Zone continuation line end time is not after end time of previous line"
-msgstr ""
-
-#: timezone/zic.c:1135
-msgid "wrong number of fields on Leap line"
+msgid "invalid leaping year"
+msgstr ""
+
+#: timezone/zic.c:1095 timezone/zic.c:1197
+msgid "invalid month name"
+msgstr ""
+
+#: timezone/zic.c:1108 timezone/zic.c:1310 timezone/zic.c:1324
+msgid "invalid day of month"
+msgstr ""
+
+#: timezone/zic.c:1113
+msgid "time before zero"
+msgstr ""
+
+#: timezone/zic.c:1117
+msgid "time too small"
+msgstr ""
+
+#: timezone/zic.c:1121
+msgid "time too large"
+msgstr ""
+
+#: timezone/zic.c:1125 timezone/zic.c:1226
+msgid "invalid time of day"
 msgstr ""
 
 #: timezone/zic.c:1144
-msgid "invalid leaping year"
-msgstr ""
-
-#: timezone/zic.c:1164 timezone/zic.c:1270
-msgid "invalid month name"
-msgstr ""
-
-#: timezone/zic.c:1177 timezone/zic.c:1383 timezone/zic.c:1397
-msgid "invalid day of month"
-msgstr ""
-
-#: timezone/zic.c:1182
-msgid "time before zero"
-msgstr ""
-
-#: timezone/zic.c:1186
-msgid "time too small"
-msgstr ""
-
-#: timezone/zic.c:1190
-msgid "time too large"
-msgstr ""
-
-#: timezone/zic.c:1194 timezone/zic.c:1299
-msgid "invalid time of day"
-msgstr ""
-
-#: timezone/zic.c:1213
 msgid "illegal CORRECTION field on Leap line"
 msgstr ""
 
-#: timezone/zic.c:1218
+#: timezone/zic.c:1149
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr ""
 
-#: timezone/zic.c:1234
+#: timezone/zic.c:1163
 msgid "wrong number of fields on Link line"
 msgstr ""
 
-#: timezone/zic.c:1238
+#: timezone/zic.c:1167
 msgid "blank FROM field on Link line"
 msgstr ""
 
-#: timezone/zic.c:1242
+#: timezone/zic.c:1171
 msgid "blank TO field on Link line"
 msgstr ""
 
-#: timezone/zic.c:1320
+#: timezone/zic.c:1247
 msgid "invalid starting year"
 msgstr ""
 
-#: timezone/zic.c:1342
+#: timezone/zic.c:1269
 msgid "invalid ending year"
 msgstr ""
 
-#: timezone/zic.c:1346
+#: timezone/zic.c:1273
 msgid "starting year greater than ending year"
 msgstr ""
 
-#: timezone/zic.c:1353
+#: timezone/zic.c:1280
 msgid "typed single year"
 msgstr ""
 
-#: timezone/zic.c:1388
+#: timezone/zic.c:1315
 msgid "invalid weekday name"
 msgstr ""
 
-#: timezone/zic.c:1566
+#: timezone/zic.c:1481
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:1576
+#: timezone/zic.c:1491
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:1773
+#: timezone/zic.c:1683
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr ""
 
-#: timezone/zic.c:2070
+#: timezone/zic.c:1964
 msgid "no POSIX environment variable for zone"
 msgstr ""
 
-#: timezone/zic.c:2237
+#: timezone/zic.c:2131
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr ""
 
-#: timezone/zic.c:2283
+#: timezone/zic.c:2175
 msgid "too many transitions?!"
 msgstr ""
 
+#: timezone/zic.c:2190
+msgid "internal error - addtype called with bad isdst"
+msgstr ""
+
+#: timezone/zic.c:2194
+msgid "internal error - addtype called with bad ttisstd"
+msgstr ""
+
+#: timezone/zic.c:2198
+msgid "internal error - addtype called with bad ttisgmt"
+msgstr ""
+
+#: timezone/zic.c:2217
+msgid "too many local time types"
+msgstr ""
+
+#: timezone/zic.c:2221
+msgid "UTC offset out of range"
+msgstr ""
+
+#: timezone/zic.c:2245
+msgid "too many leap seconds"
+msgstr ""
+
+#: timezone/zic.c:2251
+msgid "repeated leap second moment"
+msgstr ""
+
+#: timezone/zic.c:2301
+msgid "Wild result from command execution"
+msgstr ""
+
 #: timezone/zic.c:2302
-msgid "internal error - addtype called with bad isdst"
-msgstr ""
-
-#: timezone/zic.c:2306
-msgid "internal error - addtype called with bad ttisstd"
-msgstr ""
-
-#: timezone/zic.c:2310
-msgid "internal error - addtype called with bad ttisgmt"
-msgstr ""
-
-#: timezone/zic.c:2329
-msgid "too many local time types"
-msgstr ""
-
-#: timezone/zic.c:2333
-msgid "UTC offset out of range"
-msgstr ""
-
-#: timezone/zic.c:2361
-msgid "too many leap seconds"
-msgstr ""
-
-#: timezone/zic.c:2367
-msgid "repeated leap second moment"
-msgstr ""
-
-#: timezone/zic.c:2419
-msgid "Wild result from command execution"
-msgstr ""
-
-#: timezone/zic.c:2420
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr ""
 
-#: timezone/zic.c:2518
+#: timezone/zic.c:2393
 msgid "Odd number of quotation marks"
 msgstr ""
 
-#: timezone/zic.c:2607
+#: timezone/zic.c:2470
 msgid "use of 2/29 in non leap-year"
 msgstr ""
 
-#: timezone/zic.c:2642
+#: timezone/zic.c:2505
 msgid ""
 "rule goes past start/end of month--will not work with pre-2004 versions of "
 "zic"
 msgstr ""
 
-#: timezone/zic.c:2674
+#: timezone/zic.c:2536
 msgid "time zone abbreviation lacks alphabetic at start"
 msgstr ""
 
-#: timezone/zic.c:2676
-msgid "time zone abbreviation has more than 3 alphabetics"
-msgstr ""
-
-#: timezone/zic.c:2678
+#: timezone/zic.c:2538
+msgid "time zone abbreviation has fewer than 3 alphabetics"
+msgstr ""
+
+#: timezone/zic.c:2540
 msgid "time zone abbreviation has too many alphabetics"
 msgstr ""
 
-#: timezone/zic.c:2688
+#: timezone/zic.c:2550
 msgid "time zone abbreviation differs from POSIX standard"
 msgstr ""
 
-#: timezone/zic.c:2700
+#: timezone/zic.c:2562
 msgid "too many, or too long, time zone abbreviations"
 msgstr ""
 
-#: timezone/zic.c:2741
+#: timezone/zic.c:2602
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:2763
+#: timezone/zic.c:2623
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr ""

Modified: fsf/trunk/libc/ports/ChangeLog.aarch64
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.aarch64 (original)
+++ fsf/trunk/libc/ports/ChangeLog.aarch64 Sat Dec  8 00:03:04 2012
@@ -1,3 +1,21 @@
+2012-12-07  Marcus Shawcroft  <marcus.shawcroft@xxxxxxxxxx>
+
+	* sysdeps/aarch64/libm-test-ulps: Regenerate.
+
+2012-12-07  Marcus Shawcroft  <marcus.shawcroft@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/aarch64/sysdep.h (INLINE_VSYSCALL):
+	Remove _x0 and sc_err declarations.
+
+2012-12-07  Marcus Shawcroft  <marcus.shawcroft@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/aarch64/mmap.c (mmap): Cast return value.
+
+2012-12-07  Marcus Shawcroft  <marcus.shawcroft@xxxxxxxxxx>
+
+	* sysdeps/aarch64/dl-machine.h (elf_machine_rela): Remove
+	strtab.
+
 2012-12-04  Steve McIntyre <steve.mcintyre@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/aarch64/ldconfig.h: Add entries

Modified: fsf/trunk/libc/ports/ChangeLog.alpha
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.alpha (original)
+++ fsf/trunk/libc/ports/ChangeLog.alpha Sat Dec  8 00:03:04 2012
@@ -1,3 +1,10 @@
+2012-12-07  Richard Henderson  <rth@xxxxxxxxxx>
+
+	* sysdeps/alpha/Makefile [$(subdir) = math]
+	(CFLAGS-s_isnan.c): New variable.
+
+	* sysdeps/alpha/fpu/math_private.h (__isnanl): Remove definition.
+
 2012-11-30  Richard Henderson  <rth@xxxxxxxxxx>
 
 	* sysdeps/alpha/fpu/libm-test-ulps: Update.

Modified: fsf/trunk/libc/ports/sysdeps/aarch64/dl-machine.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/dl-machine.h (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/dl-machine.h Sat Dec  8 00:03:04 2012
@@ -320,18 +320,12 @@
 
 	case R_AARCH64_TLS_DTPREL64:
 	  if (sym)
-	    {
-	      const char *strtab;
-	      strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
-	      *reloc_addr = sym->st_value + reloc->r_addend;
-	    }
+	    *reloc_addr = sym->st_value + reloc->r_addend;
 	  break;
 
 	case R_AARCH64_TLS_TPREL64:
 	  if (sym)
 	    {
-	      const char *strtab;
-	      strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
 	      CHECK_STATIC_TLS (map, sym_map);
 	      *reloc_addr =
 		sym->st_value + reloc->r_addend + sym_map->l_tls_offset;

Modified: fsf/trunk/libc/ports/sysdeps/aarch64/libm-test-ulps
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/libm-test-ulps (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/libm-test-ulps Sat Dec  8 00:03:04 2012
@@ -2492,9 +2492,33 @@
 ldouble: 1
 
 # pow
+Test "pow (0x0.fffffffffffff8p0, -0x1.23456789abcdfp62) == 9.8826311568054561811190162420900667121992e+252":
+ildouble: 1
+ldouble: 1
+Test "pow (0x0.ffffffp0, -0x1p24) == 2.7182819094701610539628664526874952929416":
+ildouble: 1
+ldouble: 1
 Test "pow (0x0.ffffffp0, 0x1p24) == 0.3678794302077803437135155590023422899744":
 float: 1
 ifloat: 1
+Test "pow (10.0, -4930.0) == 1e-4930":
+ildouble: 1
+ldouble: 1
+Test "pow (10.0, 4929.0) == 1e4929":
+ildouble: 1
+ldouble: 1
+Test "pow (10.0, 4930.0) == 1e4930":
+ildouble: 1
+ldouble: 1
+Test "pow (10.0, 4931.0) == 1e4931":
+ildouble: 1
+ldouble: 1
+Test "pow (10.0, 4932.0) == 1e4932":
+ildouble: 1
+ldouble: 1
+Test "pow (1e4932, 0.75) == 1e3699":
+ildouble: 1
+ldouble: 1
 
 # pow_downward
 Test "pow_downward (1.5, 1.03125) == 1.519127098714743184071644334163037684948":
@@ -3583,6 +3607,8 @@
 Function: "pow":
 float: 1
 ifloat: 1
+ildouble: 1
+ldouble: 1
 
 Function: "pow_downward":
 float: 1

Modified: fsf/trunk/libc/ports/sysdeps/alpha/Makefile
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/alpha/Makefile (original)
+++ fsf/trunk/libc/ports/sysdeps/alpha/Makefile Sat Dec  8 00:03:04 2012
@@ -43,6 +43,8 @@
 CFLAGS-s_fmaf.c = -mieee-with-inexact
 # This test tries to check for inexact being raised by arithmetic.
 CFLAGS-test-misc.c += -mieee-with-inexact
+# Avoid "conflicting types for built-in function" warnings
+CFLAGS-s_isnan.c += -fno-builtin-isnanf
 endif
 
 # Build everything with full IEEE math support, and with dynamic rounding;

Modified: fsf/trunk/libc/ports/sysdeps/alpha/fpu/math_private.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/alpha/fpu/math_private.h (original)
+++ fsf/trunk/libc/ports/sysdeps/alpha/fpu/math_private.h Sat Dec  8 00:03:04 2012
@@ -11,9 +11,6 @@
 #endif
 #ifndef __isnanf
 # define __isnanf __isnanf
-#endif
-#ifndef __isnanl
-# define __isnanl __isnanl
 #endif
 
 #include_next <math_private.h>

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/mmap.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/mmap.c (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/mmap.c Sat Dec  8 00:03:04 2012
@@ -26,7 +26,7 @@
 __ptr_t
 __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
 {
-  return INLINE_SYSCALL (mmap, 6, addr, len, prot, flags, fd, offset);
+  return (__ptr_t) INLINE_SYSCALL (mmap, 6, addr, len, prot, flags, fd, offset);
 }
 
 weak_alias (__mmap, mmap)

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h Sat Dec  8 00:03:04 2012
@@ -208,12 +208,10 @@
     __label__ out;							      \
     __label__ iserr;							      \
     long sc_ret;							      \
-    long sc_err;							      \
     INTERNAL_SYSCALL_DECL (sc_err);					      \
 									      \
     if (__vdso_##name != NULL)						      \
       {									      \
-	register long _x0 asm ("x0");					      \
 	sc_ret = INTERNAL_VSYSCALL_NCS (__vdso_##name, sc_err, nr, ##args);   \
 	if (!INTERNAL_SYSCALL_ERROR_P (sc_ret, sc_err))			      \
 	  goto out;							      \

Modified: fsf/trunk/libc/soft-fp/op-common.h
==============================================================================
--- fsf/trunk/libc/soft-fp/op-common.h (original)
+++ fsf/trunk/libc/soft-fp/op-common.h Sat Dec  8 00:03:04 2012
@@ -748,11 +748,11 @@
 #define _FP_MUL(fs, wc, R, X, Y)			\
 do {							\
   R##_s = X##_s ^ Y##_s;				\
+  R##_e = X##_e + Y##_e + 1;				\
   switch (_FP_CLS_COMBINE(X##_c, Y##_c))		\
   {							\
   case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NORMAL):	\
     R##_c = FP_CLS_NORMAL;				\
-    R##_e = X##_e + Y##_e + 1;				\
 							\
     _FP_MUL_MEAT_##fs(R,X,Y);				\
 							\
@@ -811,11 +811,11 @@
 #define _FP_DIV(fs, wc, R, X, Y)			\
 do {							\
   R##_s = X##_s ^ Y##_s;				\
+  R##_e = X##_e - Y##_e;				\
   switch (_FP_CLS_COMBINE(X##_c, Y##_c))		\
   {							\
   case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NORMAL):	\
     R##_c = FP_CLS_NORMAL;				\
-    R##_e = X##_e - Y##_e;				\
 							\
     _FP_DIV_MEAT_##fs(R,X,Y);				\
     break;						\

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/posix_fadvise.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/posix_fadvise.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/posix_fadvise.c Sat Dec  8 00:03:04 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -25,11 +25,20 @@
 int
 posix_fadvise (int fd, off_t offset, off_t len, int advise)
 {
-#ifdef __NR_fadvise64
+#if defined(__NR_fadvise64) || defined(__NR_fadvise64_64)
   INTERNAL_SYSCALL_DECL (err);
+# ifdef __NR_fadvise64
   int ret = INTERNAL_SYSCALL (fadvise64, err, 5, fd,
 			      __LONG_LONG_PAIR (offset >> 31, offset), len,
 			      advise);
+# else
+  int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd,
+			      __LONG_LONG_PAIR ((long) (offset >> 31),
+						(long) offset),
+			      __LONG_LONG_PAIR ((long) (len >> 31),
+						(long) len),
+			      advise);
+# endif
   if (INTERNAL_SYSCALL_ERROR_P (ret, err))
     return INTERNAL_SYSCALL_ERRNO (ret, err);
   return 0;

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