From 0e4d91bd31869b6f67e9284e1de3d470e10a3156 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 23 Sep 2006 10:14:27 +0000 Subject: Updated to fedora-glibc-20060923T0946 --- ChangeLog | 91 ++++++++++++ fedora/branch.mk | 4 +- fedora/glibc.spec.in | 23 ++- iconv/iconv_prog.c | 2 +- iconv/iconvconfig.c | 2 +- include/link.h | 2 +- inet/inet6_option.c | 12 ++ locale/programs/ld-collate.c | 2 +- locale/programs/ld-ctype.c | 2 +- locale/programs/localedef.c | 2 +- locale/programs/repertoire.c | 2 +- localedata/ChangeLog | 7 + localedata/locales/mk_MK | 15 +- math/libm-test.inc | 164 +++++++++++++++++++++ nscd/connections.c | 2 +- po/be.po | 12 +- po/ca.po | 12 +- po/cs.po | 4 +- po/da.po | 12 +- po/de.po | 12 +- po/el.po | 10 +- po/en_GB.po | 8 +- po/es.po | 12 +- po/fi.po | 12 +- po/fr.po | 12 +- po/gl.po | 12 +- po/hr.po | 10 +- po/hu.po | 10 +- po/ja.po | 12 +- po/ko.po | 12 +- po/libc.pot | 12 +- po/nb.po | 12 +- po/nl.po | 12 +- po/pl.po | 12 +- po/pt_BR.po | 4 +- po/ru.po | 12 +- po/rw.po | 12 +- po/sk.po | 12 +- po/sv.po | 12 +- po/tr.po | 12 +- po/zh_CN.po | 12 +- po/zh_TW.po | 12 +- sysdeps/ieee754/dbl-64/s_llrint.c | 23 ++- sysdeps/ieee754/dbl-64/s_lrint.c | 21 +-- sysdeps/ieee754/flt-32/s_llrintf.c | 10 +- sysdeps/ieee754/flt-32/s_lrintf.c | 10 +- sysdeps/ieee754/ldbl-128/s_llrintl.c | 6 +- sysdeps/ieee754/ldbl-128/s_lrintl.c | 21 +-- sysdeps/ieee754/ldbl-96/s_llrintl.c | 10 +- sysdeps/ieee754/ldbl-96/s_lrintl.c | 17 +-- sysdeps/powerpc/powerpc32/__longjmp-common.S | 8 +- sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S | 8 +- sysdeps/powerpc/powerpc64/__longjmp-common.S | 6 +- sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h | 6 +- sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h | 4 + sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c | 20 ++- sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c | 19 ++- timezone/zdump.c | 2 +- 58 files changed, 556 insertions(+), 265 deletions(-) diff --git a/ChangeLog b/ChangeLog index 43576a82b5..62c9a6946c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,94 @@ +2006-09-21 Jakub Jelinek + + [BZ #3225] + * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h (PTR_MANGLE3, + PTR_DEMANGLE3): Define. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h (PTR_MANGLE3, + PTR_DEMANGLE3): Likewise. + * sysdeps/powerpc/powerpc32/__longjmp-common.S (__longjmp): Use them. + * sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S (__longjmp): + Likewise. + * sysdeps/powerpc/powerpc64/__longjmp-common.S (__longjmp): Likewise. + +2006-09-20 Jakub Jelinek + + * po/libc.pot: Regenerated. + * po/be.po: Updated. + * po/ca.po: Likewise. + * po/cs.po: Likewise. + * po/da.po: Likewise. + * po/de.po: Likewise. + * po/el.po: Likewise. + * po/en_GB.po: Likewise. + * po/es.po: Likewise. + * po/fi.po: Likewise. + * po/fr.po: Likewise. + * po/gl.po: Likewise. + * po/hr.po: Likewise. + * po/hu.po: Likewise. + * po/ja.po: Likewise. + * po/ko.po: Likewise. + * po/nb.po: Likewise. + * po/nl.po: Likewise. + * po/pl.po: Likewise. + * po/pt_BR.po: Likewise. + * po/ru.po: Likewise. + * po/rw.po: Likewise. + * po/sk.po: Likewise. + * po/sv.po: Likewise. + * po/tr.po: Likewise. + * po/zh_CN.po: Likewise. + * po/zh_TW.po: Likewise. + + [BZ #3137] + * iconv/iconv_prog.c (main): Fix spelling in error message. + * iconv/iconvconfig.c (main): Likewise. + * locale/programs/ld-collate.c (handle_ellipsis): Likewise. + * locale/programs/ld-ctype.c (charclass_symbolic_ellipsis): Likewise. + * locale/programs/localedef.c (main): Likewise. + * locale/programs/repertoire.c (repertoire_read): Likewise. + * timezone/zdump.c (main): Likewise. + * nscd/connections.c (handle_request): Fix spelling in log message. + Patch by Malcolm Parsons . + +2006-09-20 Ulrich Drepper + + * inet/inet6_option.c: Also emit linker warnings for the RFC 2292 + interfaces. + +2006-09-20 Andreas Jaeger + + * math/libm-test.inc (lrint_test_upward): Fix typo. + +2006-06-17 Joseph S. Myers + + [BZ #2592] + * math/libm-test.inc (lrint_test_tonearest): New function. + (lrint_test_towardzero): New function. + (lrint_test_downward): New function. + (lrint_test_upward): New function. + (main): Run these new tests. + * sysdeps/ieee754/dbl-64/s_llrint.c (__llrint): Correct rounding + of values near to 0. + (two52): Use double not long double. + * sysdeps/ieee754/dbl-64/s_lrint.c (__lrint): Likewise. + * sysdeps/ieee754/flt-32/s_llrintf.c (__llrintf): Likewise. + (two23): Use float not double. + * sysdeps/ieee754/flt-32/s_lrintf.c (__lrintf): Likewise. + (two23): Use float not double. + * sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Likewise. + * sysdeps/ieee754/ldbl-128/s_lrintl.c (__lrintl): Likewise. + * sysdeps/ieee754/ldbl-96/s_llrintl.c (__llrintl): Likewise. + * sysdeps/ieee754/ldbl-96/s_lrintl.c (__lrintl): Likewise. + +2006-09-20 Martin Schwidefsky + + * sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c (__makecontext): + Cast sp to unsigned long to avoid compiler warning. + Use __makecontext_ret function instead of a trampoline on the stack. + (__makecontext_ret): New function. + * sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c: Likewise. + 2006-09-19 Jakub Jelinek * elf/dl-cache.c (HWCAP_CHECK): If _DL_PLATFORMS_COUNT, but diff --git a/fedora/branch.mk b/fedora/branch.mk index a48b6b7549..029201b763 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -3,5 +3,5 @@ glibc-branch := fedora glibc-base := HEAD DIST_BRANCH := devel COLLECTION := dist-fc4 -fedora-sync-date := 2006-09-19 18:47 UTC -fedora-sync-tag := fedora-glibc-20060919T1847 +fedora-sync-date := 2006-09-23 09:46 UTC +fedora-sync-tag := fedora-glibc-20060923T0946 diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 2b68cf556d..c8ea8090d3 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -1,4 +1,4 @@ -%define glibcrelease 33 +%define glibcrelease 34 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define xenarches i686 athlon %ifarch %{xenarches} @@ -900,11 +900,15 @@ cd build-%{nptl_target_cpu}-linuxnptl && \ cd .. %endif +librtso=`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*` + %ifarch %{rtkaioarches} rm -f $RPM_BUILD_ROOT{,%{_prefix}}/%{_lib}/librtkaio.so* mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio mv $RPM_BUILD_ROOT/%{_lib}/librtkaio-*.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/ -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/librtkaio-*.so` $RPM_BUILD_ROOT/%{_lib}/rtkaio/`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*` +rm -f $RPM_BUILD_ROOT/%{_lib}/$librtso +ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/$librtso +ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/librtkaio-*.so` $RPM_BUILD_ROOT/%{_lib}/rtkaio/$librtso %endif %if %{buildxen} @@ -922,13 +926,13 @@ pushd $RPM_BUILD_ROOT/%{_lib}/$SubDir ln -sf libpthread-*.so `basename $RPM_BUILD_ROOT/%{_lib}/libpthread.so.*` popd cp -a rt/librt.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*` +ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/$librtso cp -a nptl_db/libthread_db.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db.so.*` %ifarch %{rtkaioarches} mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir cp -a rtkaio/librtkaio.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir/librtkaio-*.so` $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*` +ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir/librtkaio-*.so` $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir/$librtso %endif cd .. %endif @@ -945,13 +949,13 @@ pushd $RPM_BUILD_ROOT/%{_lib}/power6 ln -sf libpthread-*.so `basename $RPM_BUILD_ROOT/%{_lib}/libpthread.so.*` popd cp -a rt/librt.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*` +ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/$librtso cp -a nptl_db/libthread_db.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db.so.*` %ifarch %{rtkaioarches} mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6 cp -a rtkaio/librtkaio.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/librtkaio-*.so` $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*` +ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/librtkaio-*.so` $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/$librtso %endif cd .. %endif @@ -1524,12 +1528,19 @@ rm -f *.filelist* %endif %changelog +* Sat Sep 23 2006 Jakub Jelinek 2.4.90-34 +- fix ppc{32,64} longjmp (BZ#3225) +- fix user visible spelling errors (BZ#3137) +- fix l{,l}rint{,f,l} around zero (BZ#2592) +- avoid stack trampoline in s390{,x} makecontext + * Tue Sep 15 2006 Jakub Jelinek 2.4.90-33 - fix dlclose (#206639) - don't load platform optimized libraries if kernel doesn't set AT_PLATFORM - fix ppc{32,64} libSegFault.so - use -mtune=generic even for glibc-devel.i386 (#206437) +- fix /%{_lib}/librt.so.1 symlink * Fri Sep 15 2006 Jakub Jelinek 2.4.90-32 - on ppc* use just AT_PLATFORM and altivec AT_HWCAP bit for library selection diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index fabdd001e3..77829971ad 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -239,7 +239,7 @@ main (int argc, char *argv[]) if (to_wrong) error (0, 0, _("\ -conversion from `%s' and to `%s' are not supported"), +conversions from `%s' and to `%s' are not supported"), from_pretty, to_pretty); else error (0, 0, diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c index 9d23520314..59867f9015 100644 --- a/iconv/iconvconfig.c +++ b/iconv/iconvconfig.c @@ -339,7 +339,7 @@ main (int argc, char *argv[]) if (status == 0) status = write_output (); else - error (1, 0, _("no output file produced because warning were issued")); + error (1, 0, _("no output file produced because warnings were issued")); return status; } diff --git a/include/link.h b/include/link.h index 9947ee7813..0d6b66100e 100644 --- a/include/link.h +++ b/include/link.h @@ -216,7 +216,7 @@ struct link_map /* Size of array allocated for 'l_scope'. */ size_t l_scope_max; /* This is an array defining the lookup scope for this link map. - There are at most three different scope lists. */ + There are initially at most three different scope lists. */ struct r_scope_elem **l_scope; /* A similar array, this time only with the local scope. This is diff --git a/inet/inet6_option.c b/inet/inet6_option.c index cae9ae5797..b34eb22b7d 100644 --- a/inet/inet6_option.c +++ b/inet/inet6_option.c @@ -97,6 +97,8 @@ inet6_option_space (nbytes) return CMSG_SPACE (roundup (nbytes, 8)); } +link_warning (inet6_option_space, + "inet6_option_space is obsolete, use the RFC 3542 interfaces") /* RFC 2292, 6.3.2 @@ -131,6 +133,8 @@ inet6_option_init (bp, cmsgp, type) return 0; } +link_warning (inet6_option_init, + "inet6_option_init is obsolete, use the RFC 3542 interfaces") /* RFC 2292, 6.3.3 @@ -164,6 +168,8 @@ inet6_option_append (cmsg, typep, multx, plusy) return 0; } +link_warning (inet6_option_append, + "inet6_option_append is obsolete, use the RFC 3542 interfaces") /* RFC 2292, 6.3.4 @@ -225,6 +231,8 @@ inet6_option_alloc (cmsg, datalen, multx, plusy) { return option_alloc (cmsg, datalen, multx, plusy); } +link_warning (inet6_option_alloc, + "inet6_option_alloc is obsolete, use the RFC 3542 interfaces") /* RFC 2292, 6.3.5 @@ -282,6 +290,8 @@ inet6_option_next (cmsg, tptrp) /* Check the option is fully represented in the message. */ return get_opt_end (&result, result, endp); } +link_warning (inet6_option_next, + "inet6_option_next is obsolete, use the RFC 3542 interfaces") /* RFC 2292, 6.3.6 @@ -351,3 +361,5 @@ inet6_option_find (cmsg, tptrp, type) /* Success. */ return 0; } +link_warning (inet6_option_find, + "inet6_option_find is obsolete, use the RFC 3542 interfaces") diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index a1401013e0..cf1bff130f 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -1295,7 +1295,7 @@ order for `%.*s' already defined at %s:%Zu"), { invalid_range: lr_error (ldfile, _("\ -`%s' and `%.*s' are no valid names for symbolic range"), +`%s' and `%.*s' are not valid names for symbolic range"), startp->name, (int) lento, endp->name); return; } diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index b1a28b9280..ca1ec7995a 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -1472,7 +1472,7 @@ charclass_symbolic_ellipsis (struct linereader *ldfile, { invalid_range: lr_error (ldfile, - _("`%s' and `%.*s' are no valid names for symbolic range"), + _("`%s' and `%.*s' are not valid names for symbolic range"), last_str, (int) now->val.str.lenmb, nowstr); return; } diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index 5df07e94c6..9c3acbebcc 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -288,7 +288,7 @@ cannot write output files to `%s'"), output_path)); } else WITH_CUR_LOCALE (error (4, 0, _("\ -no output file produced because warning were issued"))); +no output file produced because warnings were issued"))); /* This exit status is prescribed by POSIX.2 4.35.7. */ exit (error_message_count != 0); diff --git a/locale/programs/repertoire.c b/locale/programs/repertoire.c index 7f7ba713b2..e9bdf9e7ba 100644 --- a/locale/programs/repertoire.c +++ b/locale/programs/repertoire.c @@ -328,7 +328,7 @@ argument to <%s> must be a single character"), if (tsearch (result, &known, &repertoire_compare) == NULL) /* Something went wrong. */ - WITH_CUR_LOCALE (error (0, errno, _("cannot safe new repertoire map"))); + WITH_CUR_LOCALE (error (0, errno, _("cannot save new repertoire map"))); return result; } diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 936ae8b256..f72b177038 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,10 @@ +2006-09-20 Ulrich Drepper + + [BZ #2823] + * locales/mk_MK: Fix date_fmt. Add week, first_weekday, and + first_workday information. + Patch by Damjan Georgievski. + 2006-09-05 Ulrich Drepper * locales/or_IN (mon): Fix February string. diff --git a/localedata/locales/mk_MK b/localedata/locales/mk_MK index 55a4ec70db..85f972c6e5 100644 --- a/localedata/locales/mk_MK +++ b/localedata/locales/mk_MK @@ -1,8 +1,8 @@ comment_char % escape_char / % Macedonian language locale for Macedonia -% Damjan Georgievski -% Revision: 1.8 (2000-11-07) +% Damjan Georgievski { gdamjan %% gmail.com } +% Revision: 2.2 (2006-09-12) % Charsets: UTF-8, ISO-8859-5, CP1251 % Distribution and use is free, also % for commercial purposes. @@ -12,13 +12,13 @@ title "Macedonian locale for Macedonia" source "" address "" contact "Damjan Georgievski" -email "gdamjan@freemail.org.mk" +email "bug-glibc-locales@gnu.org" tel "" fax "" language "Macedonian" territory "Macedonia" -revision "1.8" -date "2000-11-07" +revision "2.2" +date "2006-09-12" % category "mk_MK:2000";LC_IDENTIFICATION category "mk_MK:2000";LC_CTYPE @@ -82,9 +82,12 @@ d_fmt "" t_fmt "" am_pm "";"" t_fmt_ampm "" -date_fmt "/ +date_fmt "/ / " +week 7;19971201;4 +first_weekday 1 % Monday +first_workday 1 % Monday END LC_TIME LC_MONETARY diff --git a/math/libm-test.inc b/math/libm-test.inc index b99255fd6d..23ee6beaa8 100644 --- a/math/libm-test.inc +++ b/math/libm-test.inc @@ -3272,6 +3272,166 @@ lrint_test (void) } +static void +lrint_test_tonearest (void) +{ + int save_round_mode; + START (lrint_tonearest); + + save_round_mode = fegetround (); + + if (!fesetround (FE_TONEAREST)) + { + TEST_f_l (lrint, 0.0, 0); + TEST_f_l (lrint, minus_zero, 0); + TEST_f_l (lrint, 0.2L, 0); + TEST_f_l (lrint, -0.2L, 0); + TEST_f_l (lrint, 0.5L, 0); + TEST_f_l (lrint, -0.5L, 0); + TEST_f_l (lrint, 0.8L, 1); + TEST_f_l (lrint, -0.8L, -1); + + TEST_f_l (lrint, 1.4L, 1); + TEST_f_l (lrint, -1.4L, -1); + + TEST_f_l (lrint, 8388600.3L, 8388600); + TEST_f_l (lrint, -8388600.3L, -8388600); + + TEST_f_l (lrint, 1071930.0008, 1071930); +#ifndef TEST_FLOAT + TEST_f_l (lrint, 1073741824.01, 1073741824); +# if LONG_MAX > 281474976710656 + TEST_f_l (lrint, 281474976710656.025, 281474976710656); +# endif +#endif + } + + fesetround (save_round_mode); + + END (lrint_tonearest); +} + + +static void +lrint_test_towardzero (void) +{ + int save_round_mode; + START (lrint_towardzero); + + save_round_mode = fegetround (); + + if (!fesetround (FE_TOWARDZERO)) + { + TEST_f_l (lrint, 0.0, 0); + TEST_f_l (lrint, minus_zero, 0); + TEST_f_l (lrint, 0.2L, 0); + TEST_f_l (lrint, -0.2L, 0); + TEST_f_l (lrint, 0.5L, 0); + TEST_f_l (lrint, -0.5L, 0); + TEST_f_l (lrint, 0.8L, 0); + TEST_f_l (lrint, -0.8L, 0); + + TEST_f_l (lrint, 1.4L, 1); + TEST_f_l (lrint, -1.4L, -1); + + TEST_f_l (lrint, 8388600.3L, 8388600); + TEST_f_l (lrint, -8388600.3L, -8388600); + + TEST_f_l (lrint, 1071930.0008, 1071930); +#ifndef TEST_FLOAT + TEST_f_l (lrint, 1073741824.01, 1073741824); +# if LONG_MAX > 281474976710656 + TEST_f_l (lrint, 281474976710656.025, 281474976710656); +# endif +#endif + } + + fesetround (save_round_mode); + + END (lrint_towardzero); +} + + +static void +lrint_test_downward (void) +{ + int save_round_mode; + START (lrint_downward); + + save_round_mode = fegetround (); + + if (!fesetround (FE_DOWNWARD)) + { + TEST_f_l (lrint, 0.0, 0); + TEST_f_l (lrint, minus_zero, 0); + TEST_f_l (lrint, 0.2L, 0); + TEST_f_l (lrint, -0.2L, -1); + TEST_f_l (lrint, 0.5L, 0); + TEST_f_l (lrint, -0.5L, -1); + TEST_f_l (lrint, 0.8L, 0); + TEST_f_l (lrint, -0.8L, -1); + + TEST_f_l (lrint, 1.4L, 1); + TEST_f_l (lrint, -1.4L, -2); + + TEST_f_l (lrint, 8388600.3L, 8388600); + TEST_f_l (lrint, -8388600.3L, -8388601); + + TEST_f_l (lrint, 1071930.0008, 1071930); +#ifndef TEST_FLOAT + TEST_f_l (lrint, 1073741824.01, 1073741824); +# if LONG_MAX > 281474976710656 + TEST_f_l (lrint, 281474976710656.025, 281474976710656); +# endif +#endif + } + + fesetround (save_round_mode); + + END (lrint_downward); +} + + +static void +lrint_test_upward (void) +{ + int save_round_mode; + START (lrint_upward); + + save_round_mode = fegetround (); + + if (!fesetround (FE_UPWARD)) + { + TEST_f_l (lrint, 0.0, 0); + TEST_f_l (lrint, minus_zero, 0); + TEST_f_l (lrint, 0.2L, 1); + TEST_f_l (lrint, -0.2L, 0); + TEST_f_l (lrint, 0.5L, 1); + TEST_f_l (lrint, -0.5L, 0); + TEST_f_l (lrint, 0.8L, 1); + TEST_f_l (lrint, -0.8L, 0); + + TEST_f_l (lrint, 1.4L, 2); + TEST_f_l (lrint, -1.4L, -1); + + TEST_f_l (lrint, 8388600.3L, 8388601); + TEST_f_l (lrint, -8388600.3L, -8388600); + +#ifndef TEST_FLOAT + TEST_f_l (lrint, 1071930.0008, 1071931); + TEST_f_l (lrint, 1073741824.01, 1073741825); +# if LONG_MAX > 281474976710656 && defined (TEST_LDOUBLE) + TEST_f_l (lrint, 281474976710656.025, 281474976710656); +# endif +#endif + } + + fesetround (save_round_mode); + + END (lrint_upward); +} + + static void llrint_test (void) { @@ -5937,6 +6097,10 @@ main (int argc, char **argv) rint_test_downward (); rint_test_upward (); lrint_test (); + lrint_test_tonearest (); + lrint_test_towardzero (); + lrint_test_downward (); + lrint_test_upward (); llrint_test (); llrint_test_tonearest (); llrint_test_towardzero (); diff --git a/nscd/connections.c b/nscd/connections.c index 307337bffe..3b2558d244 100644 --- a/nscd/connections.c +++ b/nscd/connections.c @@ -1079,7 +1079,7 @@ cannot handle old request version %d; current version is %d"), { char buf[256]; - dbg_log (_("error getting callers id: %s"), + dbg_log (_("error getting caller's id: %s"), strerror_r (errno, buf, sizeof (buf))); break; } diff --git a/po/be.po b/po/be.po index 8f1dc9eb34..b69264a1ee 100644 --- a/po/be.po +++ b/po/be.po @@ -260,7 +260,7 @@ msgstr "немагчыма адчыніць файл вываду" #: iconv/iconv_prog.c:241 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "" #: iconv/iconv_prog.c:246 @@ -352,7 +352,7 @@ msgid "Prefix used for all file accesses" msgstr "" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "" #: iconv/iconvconfig.c:405 @@ -727,7 +727,7 @@ msgstr "" #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "" #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712 @@ -1620,7 +1620,7 @@ msgid "no or value given" msgstr "" #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "" #: locale/programs/repertoire.c:343 @@ -3028,7 +3028,7 @@ msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n" msgstr "" #: timezone/zdump.c:268 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "Памылка запісу стандартнага вываду" #: timezone/zic.c:365 @@ -5047,7 +5047,7 @@ msgstr "немагчыма запісаць вынік: %s" #: nscd/connections.c:405 nscd/connections.c:499 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "" #: nscd/connections.c:471 diff --git a/po/ca.po b/po/ca.po index d11a4c787e..07c0143528 100644 --- a/po/ca.po +++ b/po/ca.po @@ -268,7 +268,7 @@ msgstr "no s'ha pogut obrir el fitxer d'eixida" #: iconv/iconv_prog.c:243 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "no es suporta la conversió de «%s» ni a «%s»" #: iconv/iconv_prog.c:248 @@ -373,7 +373,7 @@ msgid "Prefix used for all file accesses" msgstr "Prefix a usar en tots els accessos a fitxer." #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "no s'ha generat el fitxer d'eixida perquè s'han produït avisos" #: iconv/iconvconfig.c:405 @@ -760,7 +760,7 @@ msgstr "%s: un rang simbòlic amb eŀlipsi no pot anar just davant d'«order_end #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "«%s» i «%.*s» no són noms vàlids de rangs simbòlics" #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737 @@ -1695,7 +1695,7 @@ msgstr "no s'ha especificat un valor o " # ivb (2001/11/05) # ivb Apareix quan no es troba el repertori en un arbre de repertoris. #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "no s'ha pogut afegir el nou mapa de repertori" #: locale/programs/repertoire.c:343 @@ -3133,7 +3133,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n" msgstr "%s: la forma d'ús és %s [--version] [-v] [-c ANY_DE_TALL] NOM_DE_ZONA...\n" #: timezone/zdump.c:269 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "error en escriure en l'eixida estàndard" #: timezone/zic.c:361 @@ -5234,7 +5234,7 @@ msgstr "no s'ha pogut escriure el resultat: %s" # ivb «chronyc» amb «chronyd»). #: nscd/connections.c:392 nscd/connections.c:514 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "error en obtenir l'identificador del programa de control: %s" #: nscd/connections.c:485 diff --git a/po/cs.po b/po/cs.po index ea45e59f51..d5dfdaec8c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -3709,7 +3709,7 @@ msgstr "koncov #: nscd/connections.c:357 nscd/connections.c:444 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "chyba pi zjiovn id volajcho: %s" #: iconv/iconv_prog.c:193 @@ -4144,7 +4144,7 @@ msgid "no other keyword shall be specified when `copy' is used" msgstr "pi pouit `copy' nen dovoleno pout dn jin klov slovo" #: locale/programs/localedef.c:331 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "vstupn soubor nebyl vytvoen, protoe se vyskytla varovn" #: locale/programs/locfile.c:283 locale/programs/locfile.c:302 diff --git a/po/da.po b/po/da.po index 3ccbc88cbf..bf62fd54cc 100644 --- a/po/da.po +++ b/po/da.po @@ -259,7 +259,7 @@ msgstr "kan ikke #: iconv/iconv_prog.c:241 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "konvertering fra '%s' og til '%s' er ikke understttet" #: iconv/iconv_prog.c:246 @@ -361,7 +361,7 @@ msgid "Prefix used for all file accesses" msgstr "Prfiks brugt for alle filadgange" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "p grund af advarsler blev ingen udfil oprettet" #: iconv/iconvconfig.c:405 @@ -738,7 +738,7 @@ msgstr "%s: symbolsk interval-ellipse m #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "'%s' og '%.*s' er ikke gyldige navne for tegnomrde" #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712 @@ -1639,7 +1639,7 @@ msgid "no or value given" msgstr "ingen - eller -vrdi givet" #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "kan ikke gemme ny repertoiretabel" #: locale/programs/repertoire.c:343 @@ -3051,7 +3051,7 @@ msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n" msgstr "%s: brug er %s [ -v ] [ -c grnse ] zonenavn ...\n" #: timezone/zdump.c:268 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "Fejl ved skrivning til standard ud" #: timezone/zic.c:365 @@ -5073,7 +5073,7 @@ msgstr "kan ikke udskrive resultat: '%s'" #: nscd/connections.c:405 nscd/connections.c:499 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "fejl ved foresprgsel p opkaldets id: %s" #: nscd/connections.c:471 diff --git a/po/de.po b/po/de.po index 9c47575ecc..346cc8435b 100644 --- a/po/de.po +++ b/po/de.po @@ -304,7 +304,7 @@ msgstr "Kann die Ausgabedatei nicht öffnen" #: iconv/iconv_prog.c:243 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "Konvertierung von »%s« nach »%s« wird nicht unterstützt" #: iconv/iconv_prog.c:248 @@ -406,7 +406,7 @@ msgid "Prefix used for all file accesses" msgstr "Prefix für jeden Dateizugriff" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "Es wurde keine Ausgabedatei erzeugt, weil Warnungen ausgegeben wurden" #: iconv/iconvconfig.c:405 @@ -787,7 +787,7 @@ msgstr "%s: Das Symbol für Auslassungen darf nicht unmittelbar vor »order_end #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "»%s« und »%.*s« sind ungültige Namen für eine symbolischen Zeichenbereich" #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737 @@ -1716,7 +1716,7 @@ msgid "no or value given" msgstr "Kein oder Wert angegeben" #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "Kann die neue »repertoire«-Map »%s« nicht speichern" #: locale/programs/repertoire.c:343 @@ -3149,7 +3149,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n" msgstr "%s: Syntax: %s [ --version ] [ -v ] [ -c cutoff ] Zonenname ...\n" #: timezone/zdump.c:269 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "Fehler beim Schreiben zur Standardausgabe" #: timezone/zic.c:361 @@ -5208,7 +5208,7 @@ msgstr "Das Ergebnis kann nicht geschrieben werden: %s" #: nscd/connections.c:392 nscd/connections.c:514 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "Fehler beim Feststellen der Identität des Aufrufers: %s" #: nscd/connections.c:485 diff --git a/po/el.po b/po/el.po index ee08b7efcb..7a1c349d61 100644 --- a/po/el.po +++ b/po/el.po @@ -3801,7 +3801,7 @@ msgstr " #: locale/programs/ld-collate.c:1268 locale/programs/ld-ctype.c:1454 #, fuzzy, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr " <%s> <%s> " #: elf/sprof.c:762 @@ -4118,7 +4118,7 @@ msgstr " #: locale/programs/repertoire.c:331 #, fuzzy -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr " `%s'" #: elf/dl-load.c:776 @@ -4329,7 +4329,7 @@ msgstr " #: nscd/connections.c:361 nscd/connections.c:453 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr " : %s" #: locale/programs/ld-collate.c:3013 @@ -4771,7 +4771,7 @@ msgid "no output digits defined and none of the standard names in the charmap" msgstr "" #: locale/programs/localedef.c:236 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr " " #: locale/programs/charmap.c:488 locale/programs/charmap.c:668 locale/programs/charmap.c:764 @@ -5587,7 +5587,7 @@ msgstr "yp_update: #~ msgid "while writing database file" #~ msgstr " " -#~ msgid "%s: Error writing standard output " +#~ msgid "%s: Error writing to standard output " #~ msgstr "%s: " #~ msgid "Cputime limit exceeded" diff --git a/po/en_GB.po b/po/en_GB.po index c26589be75..2470e8205a 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -3768,7 +3768,7 @@ msgstr "" #: locale/programs/ld-collate.c:1184 locale/programs/ld-ctype.c:1263 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "" #: elf/sprof.c:763 @@ -3988,7 +3988,7 @@ msgid "cannot read statistics data" msgstr "" #: locale/programs/repertoire.c:331 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "" #: nscd/cache.c:150 nscd/connections.c:151 @@ -4188,7 +4188,7 @@ msgstr "" #: nscd/connections.c:360 nscd/connections.c:451 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "" #: locale/programs/ld-collate.c:2787 @@ -4600,7 +4600,7 @@ msgid "" msgstr "" #: locale/programs/localedef.c:229 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "" #: locale/programs/charmap.c:438 locale/programs/charmap.c:589 diff --git a/po/es.po b/po/es.po index ba6a1fbd83..14d547fc97 100644 --- a/po/es.po +++ b/po/es.po @@ -302,7 +302,7 @@ msgstr "no se puede abrir el fichero de salida" #: iconv/iconv_prog.c:243 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "no se admite la conversin de `%s' a `%s'" #: iconv/iconv_prog.c:248 @@ -411,7 +411,7 @@ msgid "Prefix used for all file accesses" msgstr "Prefijo utilizado para todos los accesos a ficheros" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "no se ha producido ningn fichero de salida debido a la existencia de avisos" #: iconv/iconvconfig.c:405 @@ -798,7 +798,7 @@ msgstr "%s: el rango simb #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "`%s' y `%.*s' no son nombres vlidos para el rango simblico" #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737 @@ -1748,7 +1748,7 @@ msgstr "no se ha dado ning # No s qu es eso del "repertoire map", pero creo que el repertoire # es una simple aclaracin. sv #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "no se puede asegurar el nuevo repertorio" #: locale/programs/repertoire.c:343 @@ -3416,7 +3416,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n" msgstr "%s: el modo de empleo es %s [ --version ] [ -v ] [ -c cutoff ] nombrezona ...\n" #: timezone/zdump.c:269 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "Error al escribir en la salida estndar" #: timezone/zic.c:361 @@ -5638,7 +5638,7 @@ msgstr "no se puede escribir el resultado: %s" #: nscd/connections.c:392 nscd/connections.c:514 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "error al obtener el id de los llamantes: %s" #: nscd/connections.c:485 diff --git a/po/fi.po b/po/fi.po index 06a2fd75bd..66d9111037 100644 --- a/po/fi.po +++ b/po/fi.po @@ -273,7 +273,7 @@ msgstr "tulostiedostoa ei voi avata" #: iconv/iconv_prog.c:241 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "muunnos \"%s\" <-> \"%s\" ei ole tuettu" #: iconv/iconv_prog.c:246 @@ -376,7 +376,7 @@ msgid "Prefix used for all file accesses" msgstr "Jokaisen tiedoston ksittelyss kytettv etuliite" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "tulostiedostoa ei tuotettu varoituksen takia" #: iconv/iconvconfig.c:405 @@ -751,7 +751,7 @@ msgstr "%s: symbolisen v #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "\"%s\" ja \"%.*s\" eivt ole kelvollisia nimi symboliselle vlille" #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712 @@ -1652,7 +1652,7 @@ msgid "no or value given" msgstr "ei - tai -arvoa annettu" #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "uutta valikoimakarttaa ei voi turvata" #: locale/programs/repertoire.c:343 @@ -3065,7 +3065,7 @@ msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n" msgstr "%s: kytt: %s [ -v ] [ -c katkaisu ] vyhykenimi ...\n" #: timezone/zdump.c:268 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "Virhe kirjoitettaessa vakiotulosteeseen" #: timezone/zic.c:365 @@ -5086,7 +5086,7 @@ msgstr "tulosta ei voi kirjoittaa: %s" #: nscd/connections.c:405 nscd/connections.c:499 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "virhe kutsujan tunnisteen hakemisessa: %s" #: nscd/connections.c:471 diff --git a/po/fr.po b/po/fr.po index 793f9e0b7f..c5e1d65353 100644 --- a/po/fr.po +++ b/po/fr.po @@ -260,7 +260,7 @@ msgstr "Ne peut ouvrir le fichier de sortie" #: iconv/iconv_prog.c:243 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "conversions de %s et de , vers %s ne sont pas supportes" #: iconv/iconv_prog.c:248 @@ -362,7 +362,7 @@ msgid "Prefix used for all file accesses" msgstr "Prfixe utilis pour tous les accs fichiers" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "Aucun fichier de sortie gnr en raison d'un avertissement dj mis" #: iconv/iconvconfig.c:405 @@ -741,7 +741,7 @@ msgstr "%s: plage de l'ellipse symbolique ne doit pas #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr " %s et %.*s sont des noms invalides pour un intervalle symbolique." #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737 @@ -1664,7 +1664,7 @@ msgid "no or value given" msgstr "Aucune valeur ou fournie" #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "Ne peut sauvegarder la nouvelle table des rpertoires" #: locale/programs/repertoire.c:343 @@ -3087,7 +3087,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n" msgstr "%s: usage est %s [ --version ] [ -v ] [ -c seuil ] nom_du_fuseau_horaire ...\n" #: timezone/zdump.c:269 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "ERREUR d'criture sur la sortie standard" #: timezone/zic.c:361 @@ -5131,7 +5131,7 @@ msgstr "Ne peut #: nscd/connections.c:392 nscd/connections.c:514 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "erreur lors de la recherche de l'identificateur de l'appelant: %s" #: nscd/connections.c:485 diff --git a/po/gl.po b/po/gl.po index e5eeeb735f..9ac322e206 100644 --- a/po/gl.po +++ b/po/gl.po @@ -259,7 +259,7 @@ msgstr "non se pode abri-lo ficheiro de sa #: iconv/iconv_prog.c:241 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "as conversins de `%s' e a `%s' non estn soportadas" #: iconv/iconv_prog.c:246 @@ -360,7 +360,7 @@ msgid "Prefix used for all file accesses" msgstr "Prefixo a empregar para tdolos accesos a ficheiro" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "non se producu un ficheiro de sada porque se deron avisos" #: iconv/iconvconfig.c:405 @@ -735,7 +735,7 @@ msgstr "%s: os puntos suspensivos do rango simb #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "`%s' e `%.*s' non son nomes vlidos para o rango simblico" #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712 @@ -1636,7 +1636,7 @@ msgid "no or value given" msgstr "non se deu un valor ou " #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "non se pode grava-lo novo mapa de repertorios" #: locale/programs/repertoire.c:343 @@ -3049,7 +3049,7 @@ msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n" msgstr "%s: sase %s [ -v ] [ -c corte ] nomezona ...\n" #: timezone/zdump.c:268 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "Erro ao escribir na sada estndar" #: timezone/zic.c:365 @@ -5070,7 +5070,7 @@ msgstr "non se pode escribi-lo resultado: %s" #: nscd/connections.c:405 nscd/connections.c:499 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "erro ao obte-lo identificador do chamante: %s" #: nscd/connections.c:471 diff --git a/po/hr.po b/po/hr.po index 940bfccee4..68e7c4f3f3 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1870,7 +1870,7 @@ msgid "Error while talking to callback proc" msgstr "" #: timezone/zdump.c:268 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "" #: inet/ruserpass.c:184 @@ -3828,7 +3828,7 @@ msgstr "`%1$s' definicija ne završava sa `END %1$s'" #: locale/programs/ld-collate.c:1281 locale/programs/ld-ctype.c:1455 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "" #: elf/sprof.c:762 @@ -4117,7 +4117,7 @@ msgid "cannot read statistics data" msgstr "ne moogu pročitati statistike" #: locale/programs/repertoire.c:331 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "" #: elf/dl-load.c:784 @@ -4339,7 +4339,7 @@ msgstr "enkoding izvornog teksta" #: nscd/connections.c:366 nscd/connections.c:460 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "greška pri dohvatu broja pozivatelja: %s" #: locale/programs/ld-collate.c:3032 @@ -4777,7 +4777,7 @@ msgid "no output digits defined and none of the standard names in the charmap" msgstr "" #: iconv/iconvconfig.c:308 locale/programs/localedef.c:236 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "" #: locale/programs/charmap.c:493 locale/programs/charmap.c:673 locale/programs/charmap.c:769 locale/programs/repertoire.c:231 diff --git a/po/hu.po b/po/hu.po index c17fd4026d..054fadcb9e 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1968,7 +1968,7 @@ msgid "Error while talking to callback proc" msgstr "Hiba amg kommunikltam a visszahv folyamattal" #: timezone/zdump.c:268 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "Hiba az alaprtelmezett kimenetre rs sorn" #: inet/ruserpass.c:184 @@ -4025,7 +4025,7 @@ msgstr "a `%1$s' meghat #: locale/programs/ld-collate.c:1281 locale/programs/ld-ctype.c:1455 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "a `%s' s a `%.*s' nem rvnyesek a szimbolikus tartomnyban" #: elf/sprof.c:762 @@ -4318,7 +4318,7 @@ msgid "cannot read statistics data" msgstr "nem lehet olvasni a statisztikai adatokat" #: locale/programs/repertoire.c:331 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "nem biztonsgos j repertor" #: elf/dl-load.c:784 @@ -4540,7 +4540,7 @@ msgstr "az eredeti sz #: nscd/connections.c:366 nscd/connections.c:460 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "hiba a hv azonosts sorn: %s" #: locale/programs/ld-collate.c:3032 @@ -4984,7 +4984,7 @@ msgid "no output digits defined and none of the standard names in the charmap" msgstr "nincs kimeneti szm meghatrozva s nincs szabvnyos nv a karakterkszletben" #: iconv/iconvconfig.c:308 locale/programs/localedef.c:236 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "nem jtt ltre kimeneti fjl, mert figyelmeztetst kaptam" #: locale/programs/charmap.c:493 locale/programs/charmap.c:673 diff --git a/po/ja.po b/po/ja.po index fe9a913b5a..6a4036bc53 100644 --- a/po/ja.po +++ b/po/ja.po @@ -259,7 +259,7 @@ msgstr " #: iconv/iconv_prog.c:243 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "`%s'Ѵ`%s'ؤѴϤɤ⥵ݡȤƤޤ" #: iconv/iconv_prog.c:248 @@ -362,7 +362,7 @@ msgid "Prefix used for all file accesses" msgstr "եΥ˥ץեåѤޤ" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "ٹ𤬽Ф줿ե˽ϤޤǤ" #: iconv/iconvconfig.c:405 @@ -737,7 +737,7 @@ msgstr "%s: #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "`%s' `%.*s' ϥܥϰϤȤ̾Ǥ" #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737 @@ -1654,7 +1654,7 @@ msgid "no or value given" msgstr " ޤ ͤͿޤǤ" #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "ѡȥޥåפϰǤϤޤ" #: locale/programs/repertoire.c:343 @@ -3075,7 +3075,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n" msgstr "%s: ˡ %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n" #: timezone/zdump.c:269 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "顼ɸϤ˽񤭽Ф" #: timezone/zic.c:361 @@ -5112,7 +5112,7 @@ msgstr " #: nscd/connections.c:392 nscd/connections.c:514 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "ƤӽФIDμǥ顼: %s" #: nscd/connections.c:485 diff --git a/po/ko.po b/po/ko.po index 0acb170c47..bb8ae322df 100644 --- a/po/ko.po +++ b/po/ko.po @@ -260,7 +260,7 @@ msgstr " #: iconv/iconv_prog.c:243 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "`%s' ȯ `%s' ȯ ʽϴ" #: iconv/iconv_prog.c:248 @@ -361,7 +361,7 @@ msgid "Prefix used for all file accesses" msgstr " ٿ ϴ ξ" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr " Ǿ ʾҽϴ" #: iconv/iconvconfig.c:405 @@ -739,7 +739,7 @@ msgstr "%s: #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "`%s'() `%.*s'() ȣ 밡 ̸ ƴմϴ" #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737 @@ -1667,7 +1667,7 @@ msgstr " Ȥ # : safe ??? #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "ο 丮 ϴ" #: locale/programs/repertoire.c:343 @@ -3096,7 +3096,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n" msgstr "%s: %s [ --version ] [ -v ] [ -c ] ... Դϴ\n" #: timezone/zdump.c:269 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "ǥ ¿ " #: timezone/zic.c:361 @@ -5131,7 +5131,7 @@ msgstr " #: nscd/connections.c:392 nscd/connections.c:514 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "ȣ ID µ : %s" #: nscd/connections.c:485 diff --git a/po/libc.pot b/po/libc.pot index 77407a1f61..b8cfc3d200 100644 --- a/po/libc.pot +++ b/po/libc.pot @@ -1208,7 +1208,7 @@ msgstr "" #: iconv/iconv_prog.c:241 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "" #: iconv/iconv_prog.c:246 @@ -1295,7 +1295,7 @@ msgstr "" #: iconv/iconvconfig.c:342 locale/programs/localedef.c:290 #, c-format -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "" #: iconv/iconvconfig.c:428 @@ -1774,7 +1774,7 @@ msgstr "" #: locale/programs/ld-collate.c:1297 locale/programs/ld-ctype.c:1475 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "" #: locale/programs/ld-collate.c:1346 locale/programs/ld-collate.c:3737 @@ -2720,7 +2720,7 @@ msgstr "" #: locale/programs/repertoire.c:331 #, c-format -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "" #: locale/programs/repertoire.c:342 @@ -3637,7 +3637,7 @@ msgstr "" #: nscd/connections.c:1066 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "" #: nscd/connections.c:1124 nscd/connections.c:1138 @@ -6012,7 +6012,7 @@ msgid "%s: wild -c argument %s\n" msgstr "" #: timezone/zdump.c:392 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "" #: timezone/zdump.c:415 diff --git a/po/nb.po b/po/nb.po index 5cd99940e0..9b5cfef641 100644 --- a/po/nb.po +++ b/po/nb.po @@ -264,7 +264,7 @@ msgstr "kan ikke #: iconv/iconv_prog.c:241 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "konvertering fra %s til %s er ikke stttet" #: iconv/iconv_prog.c:246 @@ -366,7 +366,7 @@ msgid "Prefix used for all file accesses" msgstr "Prefiks brukt for all filaksessering" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "p grunn av advarsler ble ingen utfil opprettet" #: iconv/iconvconfig.c:405 @@ -742,7 +742,7 @@ msgstr "%s: symbolsk omr #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "%s og %.*s er ulovlige navn for symbolsk omrde" #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712 @@ -1662,7 +1662,7 @@ msgstr "ingen - eller -verdi gitt" #: locale/programs/repertoire.c:332 #, fuzzy -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "kan ikke lese ferdighetskart %s" #: locale/programs/repertoire.c:343 @@ -3148,7 +3148,7 @@ msgstr "%s: bruk er %s [ -v ] [ -c grense ] sonenavn ...\n" #: timezone/zdump.c:268 #, fuzzy -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "%s: Feil ved skriving til standard ut " #: timezone/zic.c:365 @@ -5208,7 +5208,7 @@ msgstr "kan ikke skrive ut resultat: #: nscd/connections.c:405 nscd/connections.c:499 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "" #: nscd/connections.c:471 diff --git a/po/nl.po b/po/nl.po index ed8944580f..69c479514e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -261,7 +261,7 @@ msgstr "kan uitvoerbestand niet openen" #: iconv/iconv_prog.c:243 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "conversie van `%s' en naar `%s' wordt niet ondersteund" #: iconv/iconv_prog.c:248 @@ -367,7 +367,7 @@ msgid "Prefix used for all file accesses" msgstr "Voorvoegsel gebruikt voor alle bestandstoegang" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "geen uitvoerbestand gemaakt omdat waarschuwing is gegeven" #: iconv/iconvconfig.c:405 @@ -742,7 +742,7 @@ msgstr "%s: weglatingsteken van symbolisch bereik mag niet direct gevolgd worden #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "`%s' en `%.*s' zijn geen geldige namen voor een symbolisch bereik" #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737 @@ -1659,7 +1659,7 @@ msgid "no or value given" msgstr "geen of waarde gegeven" #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "kan nieuwe repertoire afbeelding niet opslaan" #: locale/programs/repertoire.c:343 @@ -3080,7 +3080,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n" msgstr "%s: gebruik is %s [ --version ] [ -v ] [ -c afkapwaarde ] zonenaam ...\n" #: timezone/zdump.c:269 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "Fout bij schrijven naar standaard uitvoer" #: timezone/zic.c:361 @@ -5117,7 +5117,7 @@ msgstr "kan resultaat niet schrijven: %s" #: nscd/connections.c:392 nscd/connections.c:514 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "fout bij opvragen ID van aanroeper: %s" #: nscd/connections.c:485 diff --git a/po/pl.po b/po/pl.po index 84914a140b..b4f9b29285 100644 --- a/po/pl.po +++ b/po/pl.po @@ -261,7 +261,7 @@ msgstr "nie mo #: iconv/iconv_prog.c:243 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "konwersja z `%s' oraz do `%s' nie jest obsugiwana" #: iconv/iconv_prog.c:248 @@ -364,7 +364,7 @@ msgid "Prefix used for all file accesses" msgstr "Prefiks uywany przy kadym dostpie do pliku" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "nie utworzono pliku wyjciowego, poniewa wystpiy ostrzeenia" #: iconv/iconvconfig.c:405 @@ -743,7 +743,7 @@ msgstr "%s: wyrzutnia symbolicznego przedzia #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "`%s' i `%.*s' nie s poprawnymi nazwami dla symbolicznego przedziau" #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737 @@ -1662,7 +1662,7 @@ msgid "no or value given" msgstr "nie podano adnych wartoci lub " #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "nie mona zachowa nowej tablicy repertuaru" #: locale/programs/repertoire.c:343 @@ -3086,7 +3086,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n" msgstr "%s: skadnia: %s [ --version ] [ -v ] [ -c rok ] nazwa_strefy...\n" #: timezone/zdump.c:269 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "Bd podczas pisania na standardowe wyjcie" #: timezone/zic.c:361 @@ -5129,7 +5129,7 @@ msgstr "nie mo #: nscd/connections.c:392 nscd/connections.c:514 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "bd podczas pobierania identyfikatorw wywoujcych: %s" #: nscd/connections.c:485 diff --git a/po/pt_BR.po b/po/pt_BR.po index d4e4e8b445..47bd0a4adc 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -323,7 +323,7 @@ msgstr "%s: Erro escrevendo %s\n" #: timezone/zdump.c:266 #, c-format -msgid "%s: Error writing standard output " +msgid "%s: Error writing to standard output " msgstr "%s: Erro escrevendo para sada padro " #: timezone/zic.c:841 @@ -3642,7 +3642,7 @@ msgid "no other keyword shall be specified when `copy' is used" msgstr "nehuma outra palavra-chave deve ser especificada quando `copy' usado" #: locale/programs/localedef.c:334 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "nenhum arquivo de sada foi produzido porque avisos foram emitidos" #: locale/programs/locfile.c:283 locale/programs/locfile.c:301 diff --git a/po/ru.po b/po/ru.po index bc7650b39d..d1b3efc8cb 100644 --- a/po/ru.po +++ b/po/ru.po @@ -259,7 +259,7 @@ msgstr " #: iconv/iconv_prog.c:243 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr " `%s' `%s' " #: iconv/iconv_prog.c:248 @@ -361,7 +361,7 @@ msgid "Prefix used for all file accesses" msgstr ", " #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr " , " #: iconv/iconvconfig.c:405 @@ -736,7 +736,7 @@ msgstr "%s: #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "`%s' `%.*s' " #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737 @@ -1649,7 +1649,7 @@ msgid "no or value given" msgstr " " #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "" #: locale/programs/repertoire.c:343 @@ -3074,7 +3074,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n" msgstr "%s: : %s [ --version ] [ -v ] [ -c cutoff ] - ...\n" #: timezone/zdump.c:269 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr " " #: timezone/zic.c:361 @@ -5112,7 +5112,7 @@ msgstr " #: nscd/connections.c:392 nscd/connections.c:514 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr " : %s" #: nscd/connections.c:485 diff --git a/po/rw.po b/po/rw.po index 49f1b50f5a..1216e74ad6 100644 --- a/po/rw.po +++ b/po/rw.po @@ -302,7 +302,7 @@ msgstr "Gufungura Ibisohoka IDOSIYE" #: iconv/iconv_prog.c:243 #, fuzzy, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "Ihindurangero Bivuye Na Kuri OYA" #: iconv/iconv_prog.c:248 @@ -403,7 +403,7 @@ msgstr "kugirango Byose IDOSIYE" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 #, fuzzy -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "Oya Ibisohoka IDOSIYE Iburira Byasohowe" #: iconv/iconvconfig.c:405 @@ -825,7 +825,7 @@ msgstr "%s:Urutonde OYA ku" #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476 #, fuzzy, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "`%s'Na." #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737 @@ -1823,7 +1823,7 @@ msgstr "Oya Cyangwa Agaciro" #: locale/programs/repertoire.c:332 #, fuzzy -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "Gishya" #: locale/programs/repertoire.c:343 @@ -3440,7 +3440,7 @@ msgstr "%s:Ikoresha: ni Verisiyo v C" #: timezone/zdump.c:269 #, fuzzy -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "Bisanzwe Ibisohoka" #: timezone/zic.c:361 @@ -5785,7 +5785,7 @@ msgstr "Kwandika Igisubizo" #: nscd/connections.c:392 nscd/connections.c:514 #, fuzzy, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "Ikosa ID" #: nscd/connections.c:485 diff --git a/po/sk.po b/po/sk.po index 45bb186179..ca25159381 100644 --- a/po/sk.po +++ b/po/sk.po @@ -260,7 +260,7 @@ msgstr "nie je možné otvoriť výstupný súbor" #: iconv/iconv_prog.c:243 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "konverzie z `%s' a do `%s' nie sú podporované" #: iconv/iconv_prog.c:248 @@ -361,7 +361,7 @@ msgid "Prefix used for all file accesses" msgstr "Predpona použitá pre všetky prístupy k súborom" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "výstupný súbor nebol vytvorený kvôli výskytu varovaní" #: iconv/iconvconfig.c:405 @@ -736,7 +736,7 @@ msgstr "%s: pokračovanie symbolického rozsahu nesmie byť priamo nasledované #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "`%s' a `%.*s' sú neprípustné názvy pre symbolický rozsah" #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737 @@ -1653,7 +1653,7 @@ msgid "no or value given" msgstr "nezadaná alebo hodnota" #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "nie je možné uchovať mapu repertoáru" #: locale/programs/repertoire.c:343 @@ -3074,7 +3074,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n" msgstr "%s: použitie je %s [ --version ] [ -v ] [ -c limit ] meno_zóny ...\n" #: timezone/zdump.c:269 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "Chyba pri zápise na štandardný výstup" #: timezone/zic.c:361 @@ -5115,7 +5115,7 @@ msgstr "nie je možné zapísať výsledok: %s" #: nscd/connections.c:392 nscd/connections.c:514 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "chyba pri získaní id volajúceho: %s" #: nscd/connections.c:485 diff --git a/po/sv.po b/po/sv.po index 1c532b72d9..0bd2f977c6 100644 --- a/po/sv.po +++ b/po/sv.po @@ -260,7 +260,7 @@ msgstr "kan inte #: iconv/iconv_prog.c:243 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "konvertering frn \"%s\" och till \"%s\" stds ej" #: iconv/iconv_prog.c:248 @@ -364,7 +364,7 @@ msgid "Prefix used for all file accesses" msgstr "Prefix att anvnda fr alla filtkomster" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "ingen utfil skapad p grund av varningar" #: iconv/iconvconfig.c:405 @@ -741,7 +741,7 @@ msgstr "%s: symboliskt intervall kan inte omedelbart f #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "\"%s\" och \"%.*s\" r otilltna namn fr symboliskt intervall" #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737 @@ -1658,7 +1658,7 @@ msgid "no or value given" msgstr "inget eller vrde angivet" #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "kan inte skra repertoartabell" #: locale/programs/repertoire.c:343 @@ -3079,7 +3079,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n" msgstr "%s: anvndning r %s [ --version ] [ -v ] [ -c grns ] zonnamn ...\n" #: timezone/zdump.c:269 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "Fel vid skrivning till standard ut" #: timezone/zic.c:361 @@ -5114,7 +5114,7 @@ msgstr "kan inte skriva resultat: %s" #: nscd/connections.c:392 nscd/connections.c:514 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "kunde inte hmta anropandes identitet: %s" #: nscd/connections.c:485 diff --git a/po/tr.po b/po/tr.po index 9271c3c087..10e6de8f35 100644 --- a/po/tr.po +++ b/po/tr.po @@ -261,7 +261,7 @@ msgstr "çıktı dosyası açılamıyor" #: iconv/iconv_prog.c:243 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "`%s'den ve `%s'e dönüşüm desteklenmiyor" #: iconv/iconv_prog.c:248 @@ -366,7 +366,7 @@ msgid "Prefix used for all file accesses" msgstr "Tüm dosya erişimlerinde kullanılan önek" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "uyarı yayınlandığından üretilen bir çıktı dosyası yok" #: iconv/iconvconfig.c:405 @@ -741,7 +741,7 @@ msgstr "%s: sembolik kapsam elipslerinin hemen ardından `order_end' gelmemelidi #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "`%s' ve `%.*s' sembolik kapsam için geçerli isimler değil" #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737 @@ -1658,7 +1658,7 @@ msgid "no or value given" msgstr " ya da değeri verilmeliydi" #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "yeni repertuvar eşlemin doğruluğundan emin olunamaz " #: locale/programs/repertoire.c:343 @@ -3084,7 +3084,7 @@ msgstr "" "zamanDilimiİsmi ...\n" #: timezone/zdump.c:269 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "Standart çıktıya yazarken hata" #: timezone/zic.c:361 @@ -5122,7 +5122,7 @@ msgstr "sonuç yazılamıyor: %s" #: nscd/connections.c:392 nscd/connections.c:514 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "çağrıcı kimliği alınırken hata: %s" #: nscd/connections.c:485 diff --git a/po/zh_CN.po b/po/zh_CN.po index 9754fb30f5..30f2722073 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -259,7 +259,7 @@ msgstr " #: iconv/iconv_prog.c:241 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "ִ֧ӡ%s%sת" #: iconv/iconv_prog.c:246 @@ -351,7 +351,7 @@ msgid "Prefix used for all file accesses" msgstr "ļʵǰ׺" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "ڳ־δļ" #: iconv/iconvconfig.c:405 @@ -726,7 +726,7 @@ msgstr "" #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "" #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712 @@ -1623,7 +1623,7 @@ msgid "no or value given" msgstr "δ Ҳδ " #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "" #: locale/programs/repertoire.c:343 @@ -3033,7 +3033,7 @@ msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n" msgstr "%s÷Ϊ %s [ -v ] [ -c cutoff ] ...\n" #: timezone/zdump.c:268 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "д׼" #: timezone/zic.c:365 @@ -5054,7 +5054,7 @@ msgstr " #: nscd/connections.c:405 nscd/connections.c:499 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "" #: nscd/connections.c:471 diff --git a/po/zh_TW.po b/po/zh_TW.po index a117c9f5ff..7fbf3c7118 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -262,7 +262,7 @@ msgstr "無法開啟輸出檔" #: iconv/iconv_prog.c:243 #, c-format -msgid "conversion from `%s' and to `%s' are not supported" +msgid "conversions from `%s' and to `%s' are not supported" msgstr "不支援從 `%s' 以及到 `%s' 的轉換" #: iconv/iconv_prog.c:248 @@ -362,7 +362,7 @@ msgid "Prefix used for all file accesses" msgstr "使用於所有檔案存取時的前置文字" #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 -msgid "no output file produced because warning were issued" +msgid "no output file produced because warnings were issued" msgstr "因為發出過警告訊息，所以沒有製造任何輸出檔" #: iconv/iconvconfig.c:405 @@ -737,7 +737,7 @@ msgstr "%s: 符號範圍的省略不可以直接在 `order_end' 之前" #: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476 #, c-format -msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "`%s' 和 `%.*s' 皆非符號範圍中適用的名稱" #: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737 @@ -1654,7 +1654,7 @@ msgid "no or value given" msgstr "沒有給定 或 的值" #: locale/programs/repertoire.c:332 -msgid "cannot safe new repertoire map" +msgid "cannot save new repertoire map" msgstr "無法儲存新的編碼對映檔" #: locale/programs/repertoire.c:343 @@ -3107,7 +3107,7 @@ msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n" msgstr "%s: 用法是 %s [ --version ] [ -v ] [ -c 切斷 ] 地區名稱 ...\n" #: timezone/zdump.c:269 -msgid "Error writing standard output" +msgid "Error writing to standard output" msgstr "寫入標準輸出時錯誤" #: timezone/zic.c:361 @@ -5142,7 +5142,7 @@ msgstr "無法寫入結果: %s" #: nscd/connections.c:392 nscd/connections.c:514 #, c-format -msgid "error getting callers id: %s" +msgid "error getting caller's id: %s" msgstr "取得呼叫程式識別碼時發生錯誤: %s" #: nscd/connections.c:485 diff --git a/sysdeps/ieee754/dbl-64/s_llrint.c b/sysdeps/ieee754/dbl-64/s_llrint.c index 893bd716b5..64c870eaaa 100644 --- a/sysdeps/ieee754/dbl-64/s_llrint.c +++ b/sysdeps/ieee754/dbl-64/s_llrint.c @@ -1,6 +1,6 @@ /* Round argument to nearest integral value according to current rounding direction. - Copyright (C) 1997, 2004 Free Software Foundation, Inc. + Copyright (C) 1997, 2004, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -23,7 +23,7 @@ #include "math_private.h" -static const long double two52[2] = +static const double two52[2] = { 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */ @@ -48,19 +48,14 @@ __llrint (double x) if (j0 < 20) { - if (j0 < -1) - return 0; - else - { - w = two52[sx] + x; - t = w - two52[sx]; - EXTRACT_WORDS (i0, i1, t); - j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; - i0 &= 0xfffff; - i0 |= 0x100000; + w = two52[sx] + x; + t = w - two52[sx]; + EXTRACT_WORDS (i0, i1, t); + j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; + i0 &= 0xfffff; + i0 |= 0x100000; - result = i0 >> (20 - j0); - } + result = (j0 < 0 ? 0 : i0 >> (20 - j0)); } else if (j0 < (int32_t) (8 * sizeof (long long int)) - 1) { diff --git a/sysdeps/ieee754/dbl-64/s_lrint.c b/sysdeps/ieee754/dbl-64/s_lrint.c index 2da68d4dcd..1084ed6e2d 100644 --- a/sysdeps/ieee754/dbl-64/s_lrint.c +++ b/sysdeps/ieee754/dbl-64/s_lrint.c @@ -1,6 +1,6 @@ /* Round argument to nearest integral value according to current rounding direction. - Copyright (C) 1997, 2004 Free Software Foundation, Inc. + Copyright (C) 1997, 2004, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -48,19 +48,14 @@ __lrint (double x) if (j0 < 20) { - if (j0 < -1) - return 0; - else - { - w = two52[sx] + x; - t = w - two52[sx]; - EXTRACT_WORDS (i0, i1, t); - j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; - i0 &= 0xfffff; - i0 |= 0x100000; + w = two52[sx] + x; + t = w - two52[sx]; + EXTRACT_WORDS (i0, i1, t); + j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; + i0 &= 0xfffff; + i0 |= 0x100000; - result = i0 >> (20 - j0); - } + result = (j0 < 0 ? 0 : i0 >> (20 - j0)); } else if (j0 < (int32_t) (8 * sizeof (long int)) - 1) { diff --git a/sysdeps/ieee754/flt-32/s_llrintf.c b/sysdeps/ieee754/flt-32/s_llrintf.c index 3b9a484a8d..7c6e4bcda4 100644 --- a/sysdeps/ieee754/flt-32/s_llrintf.c +++ b/sysdeps/ieee754/flt-32/s_llrintf.c @@ -1,6 +1,6 @@ /* Round argument to nearest integral value according to current rounding direction. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -23,7 +23,7 @@ #include "math_private.h" -static const double two23[2] = +static const float two23[2] = { 8.3886080000e+06, /* 0x4B000000 */ -8.3886080000e+06, /* 0xCB000000 */ @@ -49,9 +49,7 @@ __llrintf (float x) if (j0 < (int32_t) (sizeof (long long int) * 8) - 1) { - if (j0 < -1) - return 0; - else if (j0 >= 23) + if (j0 >= 23) result = (long long int) i0 << (j0 - 23); else { @@ -62,7 +60,7 @@ __llrintf (float x) i0 &= 0x7fffff; i0 |= 0x800000; - result = i0 >> (23 - j0); + result = (j0 < 0 ? 0 : i0 >> (23 - j0)); } } else diff --git a/sysdeps/ieee754/flt-32/s_lrintf.c b/sysdeps/ieee754/flt-32/s_lrintf.c index 2a156f7ce2..64486a4c3e 100644 --- a/sysdeps/ieee754/flt-32/s_lrintf.c +++ b/sysdeps/ieee754/flt-32/s_lrintf.c @@ -1,6 +1,6 @@ /* Round argument to nearest integral value according to current rounding direction. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -23,7 +23,7 @@ #include "math_private.h" -static const double two23[2] = +static const float two23[2] = { 8.3886080000e+06, /* 0x4B000000 */ -8.3886080000e+06, /* 0xCB000000 */ @@ -49,9 +49,7 @@ __lrintf (float x) if (j0 < (int32_t) (sizeof (long int) * 8) - 1) { - if (j0 < -1) - return 0; - else if (j0 >= 23) + if (j0 >= 23) result = (long int) i0 << (j0 - 23); else { @@ -62,7 +60,7 @@ __lrintf (float x) i0 &= 0x7fffff; i0 |= 0x800000; - result = i0 >> (23 - j0); + result = (j0 < 0 ? 0 : i0 >> (23 - j0)); } } else diff --git a/sysdeps/ieee754/ldbl-128/s_llrintl.c b/sysdeps/ieee754/ldbl-128/s_llrintl.c index ee66454e2f..5804f57d11 100644 --- a/sysdeps/ieee754/ldbl-128/s_llrintl.c +++ b/sysdeps/ieee754/ldbl-128/s_llrintl.c @@ -48,8 +48,6 @@ __llrintl (long double x) if (j0 < (int32_t) (8 * sizeof (long long int)) - 1) { - if (j0 < -1) - return 0; w = two112[sx] + x; t = w - two112[sx]; GET_LDOUBLE_WORDS64 (i0, i1, t); @@ -57,7 +55,9 @@ __llrintl (long double x) i0 &= 0x0000ffffffffffffLL; i0 |= 0x0001000000000000LL; - if (j0 <= 48) + if (j0 < 0) + result = 0; + else if (j0 <= 48) result = i0 >> (48 - j0); else result = ((long long int) i0 << (j0 - 48)) | (i1 >> (112 - j0)); diff --git a/sysdeps/ieee754/ldbl-128/s_lrintl.c b/sysdeps/ieee754/ldbl-128/s_lrintl.c index 66f9a429fc..53835a4bbc 100644 --- a/sysdeps/ieee754/ldbl-128/s_lrintl.c +++ b/sysdeps/ieee754/ldbl-128/s_lrintl.c @@ -1,6 +1,6 @@ /* Round argument to nearest integral value according to current rounding direction. - Copyright (C) 1997, 1999, 2004 Free Software Foundation, Inc. + Copyright (C) 1997, 1999, 2004, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997 and Jakub Jelinek , 1999. @@ -48,19 +48,14 @@ __lrintl (long double x) if (j0 < 48) { - if (j0 < -1) - return 0; - else - { - w = two112[sx] + x; - t = w - two112[sx]; - GET_LDOUBLE_WORDS64 (i0, i1, x); - j0 = ((i0 >> 48) & 0x7fff) - 0x3fff; - i0 &= 0x0000ffffffffffffLL; - i0 |= 0x0001000000000000LL; + w = two112[sx] + x; + t = w - two112[sx]; + GET_LDOUBLE_WORDS64 (i0, i1, x); + j0 = ((i0 >> 48) & 0x7fff) - 0x3fff; + i0 &= 0x0000ffffffffffffLL; + i0 |= 0x0001000000000000LL; - result = i0 >> (48 - j0); - } + result = (j0 < 0 ? 0 : i0 >> (48 - j0)); } else if (j0 < (int32_t) (8 * sizeof (long int)) - 1) { diff --git a/sysdeps/ieee754/ldbl-96/s_llrintl.c b/sysdeps/ieee754/ldbl-96/s_llrintl.c index e927a8af40..d6eedf1f33 100644 --- a/sysdeps/ieee754/ldbl-96/s_llrintl.c +++ b/sysdeps/ieee754/ldbl-96/s_llrintl.c @@ -1,6 +1,6 @@ /* Round argument to nearest integral value according to current rounding direction. - Copyright (C) 1997, 2004 Free Software Foundation, Inc. + Copyright (C) 1997, 2004, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -47,9 +47,7 @@ __llrintl (long double x) if (j0 < (int32_t) (8 * sizeof (long long int)) - 1) { - if (j0 < -1) - return 0; - else if (j0 >= 63) + if (j0 >= 63) result = (((long long int) i0 << 32) | i1) << (j0 - 63); else { @@ -58,7 +56,9 @@ __llrintl (long double x) GET_LDOUBLE_WORDS (se, i0, i1, t); j0 = (se & 0x7fff) - 0x3fff; - if (j0 <= 31) + if (j0 < 0) + result = 0; + else if (j0 <= 31) result = i0 >> (31 - j0); else result = ((long long int) i0 << (j0 - 31)) | (i1 >> (63 - j0)); diff --git a/sysdeps/ieee754/ldbl-96/s_lrintl.c b/sysdeps/ieee754/ldbl-96/s_lrintl.c index 4212093989..621951d87b 100644 --- a/sysdeps/ieee754/ldbl-96/s_lrintl.c +++ b/sysdeps/ieee754/ldbl-96/s_lrintl.c @@ -1,6 +1,6 @@ /* Round argument to nearest integral value according to current rounding direction. - Copyright (C) 1997, 2004 Free Software Foundation, Inc. + Copyright (C) 1997, 2004, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -47,17 +47,12 @@ __lrintl (long double x) if (j0 < 31) { - if (j0 < -1) - return 0; - else - { - w = two63[sx] + x; - t = w - two63[sx]; - GET_LDOUBLE_WORDS (se, i0, i1, t); - j0 = (se & 0x7fff) - 0x3fff; + w = two63[sx] + x; + t = w - two63[sx]; + GET_LDOUBLE_WORDS (se, i0, i1, t); + j0 = (se & 0x7fff) - 0x3fff; - result = i0 >> (31 - j0); - } + result = (j0 < 0 ? 0 : i0 >> (31 - j0)); } else if (j0 < (int32_t) (8 * sizeof (long int)) - 1) { diff --git a/sysdeps/powerpc/powerpc32/__longjmp-common.S b/sysdeps/powerpc/powerpc32/__longjmp-common.S index 411b6a20cb..2093b7e337 100644 --- a/sysdeps/powerpc/powerpc32/__longjmp-common.S +++ b/sysdeps/powerpc/powerpc32/__longjmp-common.S @@ -31,7 +31,11 @@ ENTRY (BP_SYM (__longjmp)) CHECK_BOUNDS_BOTH_WIDE_LIT (r3, r8, r9, JB_SIZE) +#ifdef PTR_DEMANGLE + lwz r24,(JB_GPR1*4)(r3) +#else lwz r1,(JB_GPR1*4)(r3) +#endif lwz r0,(JB_LR*4)(r3) lwz r14,((JB_GPRS+0)*4)(r3) lwz r15,((JB_GPRS+1)*4)(r3) @@ -41,8 +45,8 @@ ENTRY (BP_SYM (__longjmp)) lwz r19,((JB_GPRS+5)*4)(r3) lwz r20,((JB_GPRS+6)*4)(r3) #ifdef PTR_DEMANGLE - PTR_DEMANGLE (r0, r25) - PTR_DEMANGLE2 (r1, r25) + PTR_DEMANGLE3 (r1, r24, r25) + PTR_DEMANGLE2 (r0, r25) #endif mtlr r0 lwz r21,((JB_GPRS+7)*4)(r3) diff --git a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S index aa24b059d1..404f403855 100644 --- a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S +++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S @@ -114,7 +114,11 @@ aligned_restore_vmx: lvx v31,0,r6 L(no_vmx): #endif +#ifdef PTR_DEMANGLE + lwz r24,(JB_GPR1*4)(r3) +#else lwz r1,(JB_GPR1*4)(r3) +#endif lwz r0,(JB_LR*4)(r3) lwz r14,((JB_GPRS+0)*4)(r3) lfd fp14,((JB_FPRS+0*2)*4)(r3) @@ -131,8 +135,8 @@ L(no_vmx): lwz r20,((JB_GPRS+6)*4)(r3) lfd fp20,((JB_FPRS+6*2)*4)(r3) #ifdef PTR_DEMANGLE - PTR_DEMANGLE (r0, r25) - PTR_DEMANGLE2 (r1, r25) + PTR_DEMANGLE3 (r1, r24, r25) + PTR_DEMANGLE2 (r0, r25) #endif mtlr r0 lwz r21,((JB_GPRS+7)*4)(r3) diff --git a/sysdeps/powerpc/powerpc64/__longjmp-common.S b/sysdeps/powerpc/powerpc64/__longjmp-common.S index 31b1af34f9..700a2a543c 100644 --- a/sysdeps/powerpc/powerpc64/__longjmp-common.S +++ b/sysdeps/powerpc/powerpc64/__longjmp-common.S @@ -108,9 +108,11 @@ aligned_restore_vmx: lvx v31,0,r6 L(no_vmx): #endif - ld r1,(JB_GPR1*8)(r3) #ifdef PTR_DEMANGLE - PTR_DEMANGLE (r1, r25) + ld r22,(JB_GPR1*8)(r3) + PTR_DEMANGLE3 (r1, r22, r25) +#else + ld r1,(JB_GPR1*8)(r3) #endif ld r2,(JB_GPR2*8)(r3) ld r0,(JB_LR*8)(r3) diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h index 470da5aa6e..c42efbabdd 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1992,1997-2003,2004,2005 Free Software Foundation, Inc. +/* Copyright (C) 1992,1997-2003,2004,2005,2006 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 @@ -285,8 +285,12 @@ xor reg,tmpreg,reg # define PTR_MANGLE2(reg, tmpreg) \ xor reg,tmpreg,reg +# define PTR_MANGLE3(destreg, reg, tmpreg) \ + lwz tmpreg,POINTER_GUARD(r2); \ + xor destreg,tmpreg,reg # define PTR_DEMANGLE(reg, tmpreg) PTR_MANGLE (reg, tmpreg) # define PTR_DEMANGLE2(reg, tmpreg) PTR_MANGLE2 (reg, tmpreg) +# define PTR_DEMANGLE3(destreg, reg, tmpreg) PTR_MANGLE3 (destreg, reg, tmpreg) # else # define PTR_MANGLE(var) \ (var) = (__typeof (var)) ((uintptr_t) (var) ^ THREAD_GET_POINTER_GUARD ()) diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h index fd67f56983..aab4b721c0 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h @@ -299,8 +299,12 @@ xor reg,tmpreg,reg # define PTR_MANGLE2(reg, tmpreg) \ xor reg,tmpreg,reg +# define PTR_MANGLE3(destreg, reg, tmpreg) \ + ld tmpreg,POINTER_GUARD(r13); \ + xor destreg,tmpreg,reg # define PTR_DEMANGLE(reg, tmpreg) PTR_MANGLE (reg, tmpreg) # define PTR_DEMANGLE2(reg, tmpreg) PTR_MANGLE2 (reg, tmpreg) +# define PTR_DEMANGLE3(destreg, reg, tmpreg) PTR_MANGLE3 (destreg, reg, tmpreg) # else # define PTR_MANGLE(var) \ (var) = (__typeof (var)) ((uintptr_t) (var) ^ THREAD_GET_POINTER_GUARD ()) diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c b/sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c index 29c8640e92..94760e0c2b 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c +++ b/sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c @@ -37,8 +37,6 @@ +-----------------------+ n | overflow parameters | 96 +-----------------------+ - 8 | trampoline | 96+n - +-----------------------+ The registers are set up like this: %r2-%r6: parameters 1 to 5 %r7 : (*func) pointer @@ -55,18 +53,16 @@ void __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...) { + extern void __makecontext_ret (void); unsigned long *sp; va_list ap; int i; - sp = (long *) (((long) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size) & -8L); - - /* Setup the trampoline. */ - *--sp = 0x07f90000; - *--sp = 0x0de71828; + sp = (unsigned long *) (((unsigned long) ucp->uc_stack.ss_sp + + ucp->uc_stack.ss_size) & -8L); /* Set the return address to trampoline. */ - ucp->uc_mcontext.gregs[14] = (long) sp; + ucp->uc_mcontext.gregs[14] = (long) __makecontext_ret; /* Set register parameters. */ va_start (ap, argc); @@ -98,4 +94,12 @@ __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...) ucp->uc_mcontext.gregs[15] = (long) sp; } +asm(".text\n" + ".type __makecontext_ret,@function\n" + "__makecontext_ret:\n" + " basr %r14,%r7\n" + " lr %r2,%r8\n" + " br %r9\n" + ".size __makecontext_ret, .-__makecontext_ret"); + weak_alias (__makecontext, makecontext) diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c b/sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c index cdff9a4f21..b08f1b4047 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c +++ b/sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c @@ -37,8 +37,6 @@ +-----------------------+ n | overflow parameters | 160 +-----------------------+ - 8 | trampoline | 160+n - +-----------------------+ The registers are set up like this: %r2-%r6: parameters 1 to 5 %r7 : (*func) pointer @@ -55,17 +53,16 @@ void __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...) { + extern void __makecontext_ret (void); unsigned long *sp; va_list ap; int i; - sp = (long *) (((long) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size) & -8L); - - /* Setup the trampoline. */ - *--sp = 0x0de7b904002807f9; + sp = (unsigned long *) (((unsigned long) ucp->uc_stack.ss_sp + + ucp->uc_stack.ss_size) & -8L); /* Set the return address to trampoline. */ - ucp->uc_mcontext.gregs[14] = (long) sp; + ucp->uc_mcontext.gregs[14] = (long) __makecontext_ret; /* Set register parameters. */ va_start (ap, argc); @@ -97,4 +94,12 @@ __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...) ucp->uc_mcontext.gregs[15] = (long) sp; } +asm(".text\n" + ".type __makecontext_ret,@function\n" + "__makecontext_ret:\n" + " basr %r14,%r7\n" + " lgr %r2,%r8\n" + " br %r9\n" + ".size __makecontext_ret, .-__makecontext_ret"); + weak_alias (__makecontext, makecontext) diff --git a/timezone/zdump.c b/timezone/zdump.c index 45ce64157c..d525da1bae 100644 --- a/timezone/zdump.c +++ b/timezone/zdump.c @@ -389,7 +389,7 @@ _("%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"), } if (fflush(stdout) || ferror(stdout)) { (void) fprintf(stderr, "%s: ", progname); - (void) perror(_("Error writing standard output")); + (void) perror(_("Error writing to standard output")); exit(EXIT_FAILURE); } exit(EXIT_SUCCESS); -- cgit v1.2.3