From 31f622b5c7ea544de23cfb85f0023069b613a8d5 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 20 May 2005 09:40:04 +0000 Subject: Updated to fedora-glibc-20050520T0919 --- ChangeLog | 46 +++++ MakeTAGS | 5 +- elf/dl-support.c | 4 +- elf/elf.h | 18 +- fedora/branch.mk | 4 +- intl/libintl.h | 10 +- linuxthreads/ChangeLog | 5 + .../sysdeps/unix/sysv/linux/i386/sysdep-cancel.h | 37 ++-- .../sysdeps/unix/sysv/linux/powerpc/lowlevellock.h | 2 +- po/libc.pot | 215 ++++++++++++++++++--- posix/regcomp.c | 2 + posix/regex_internal.h | 9 + posix/regexec.c | 14 +- sysdeps/generic/dl-sysdep.c | 8 +- sysdeps/i386/i686/memcpy_chk.S | 2 +- sysdeps/posix/getaddrinfo.c | 8 +- sysdeps/powerpc/powerpc64/dl-machine.h | 16 +- sysdeps/unix/sysv/linux/clock_getres.c | 1 + sysdeps/unix/sysv/linux/clock_gettime.c | 1 + 19 files changed, 332 insertions(+), 75 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16b258d315..bfce84436a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,49 @@ +2005-05-17 Neal H. Walfield + + * sysdeps/posix/getaddrinfo.c (gaih_local): Check [_HAVE_SA_LEN] + instead of [SALEN]. + (gaih_inet): Likewise. + +2005-05-11 Ulrich Drepper + + * elf/elf.h (Elf32_auxv_t): Make cross-compile safe. + (Elf64_auxv_t): Likewise. + * sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Adjust for + removal of a_ptr element in ElfXX_auxv_t. + * elf/dl-support.c (_dl_aux_init): Likewise. + +2005-05-09 Daniel Jacobowitz + + * sysdeps/unix/sysv/linux/clock_getres.c: Include . + * sysdeps/unix/sysv/linux/clock_gettime.c: Likewise. + +2005-05-09 Alan Modra + + * sysdeps/powerpc/powerpc64/dl-machine.h (RTLD_START): Use + .pushsection/.popsection in place of .section/.previous. + +2005-05-08 Ulrich Drepper + + * MakeTAGS: Make xgettext not look into test cases. + + * MakeTAGS: Make sure translations in error calls are marked with + c-format by xgettext. + +2005-05-07 Ulrich Drepper + + * intl/libintl.h: Always use __attribute_format_arg__ for gettext + functions since gcc sometimes forgets the attribute for the + standard functions. + +2005-05-06 Jakub Jelinek + + [BZ #934] + * posix/regex_internal.h: Include bits/libc-lock.h or define dummy + __libc_lock_* macros if not _LIBC. + (struct re_dfa_t): Add lock. + * posix/regcomp.c (re_compile_internal): Add __libc_lock_init. + * posix/regexec.c (regexec, re_search_stub): Add locking. + 2005-05-04 Jakub Jelinek * intl/Makefile (tst-gettext[45].out): Pass also $(run-program-prefix) diff --git a/MakeTAGS b/MakeTAGS index fff6851c91..1ffdd64000 100644 --- a/MakeTAGS +++ b/MakeTAGS @@ -146,8 +146,9 @@ endif define extract @rm -f $@.new $(XGETTEXT) --keyword=_ --keyword=N_ --add-comments=TRANS --sort-by-file \ - --omit-header -E -n -d - $(XGETTEXTFLAGS-$(@F)) > $@.new \ - $(filter-out $(objpfx)distinfo,$^) + --omit-header -E -n -d - --flag=error:3:c-format \ + $(XGETTEXTFLAGS-$(@F)) > $@.new \ + $(filter-out tst-%,$(filter-out $(objpfx)distinfo,$^)) /dev/null mv -f $@.new $@ endef diff --git a/elf/dl-support.c b/elf/dl-support.c index d20e9a4048..483b132b43 100644 --- a/elf/dl-support.c +++ b/elf/dl-support.c @@ -173,7 +173,7 @@ _dl_aux_init (ElfW(auxv_t) *av) GLRO(dl_clktck) = av->a_un.a_val; break; case AT_PHDR: - GL(dl_phdr) = av->a_un.a_ptr; + GL(dl_phdr) = (void *) av->a_un.a_val; break; case AT_PHNUM: GL(dl_phnum) = av->a_un.a_val; @@ -188,7 +188,7 @@ _dl_aux_init (ElfW(auxv_t) *av) #endif #if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO case AT_SYSINFO_EHDR: - GL(dl_sysinfo_dso) = av->a_un.a_ptr; + GL(dl_sysinfo_dso) = (void *) av->a_un.a_val; break; #endif case AT_UID: diff --git a/elf/elf.h b/elf/elf.h index 8a9f7fd482..e246519fab 100644 --- a/elf/elf.h +++ b/elf/elf.h @@ -899,23 +899,25 @@ typedef struct typedef struct { - int a_type; /* Entry type */ + uint32_t a_type; /* Entry type */ union { - long int a_val; /* Integer value */ - void *a_ptr; /* Pointer value */ - void (*a_fcn) (void); /* Function pointer value */ + uint32_t a_val; /* Integer value */ + /* We use to have pointer elements added here. We cannot do that, + though, since it does not work when using 32-bit definitions + on 64-bit platforms and vice versa. */ } a_un; } Elf32_auxv_t; typedef struct { - long int a_type; /* Entry type */ + uint64_t a_type; /* Entry type */ union { - long int a_val; /* Integer value */ - void *a_ptr; /* Pointer value */ - void (*a_fcn) (void); /* Function pointer value */ + uint64_t a_val; /* Integer value */ + /* We use to have pointer elements added here. We cannot do that, + though, since it does not work when using 32-bit definitions + on 64-bit platforms and vice versa. */ } a_un; } Elf64_auxv_t; diff --git a/fedora/branch.mk b/fedora/branch.mk index e86d4c1587..fc9ad2aeef 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -1,5 +1,5 @@ # This file is updated automatically by Makefile. glibc-branch := fedora glibc-base := HEAD -fedora-sync-date := 2005-05-04 18:18 UTC -fedora-sync-tag := fedora-glibc-20050504T1818 +fedora-sync-date := 2005-05-20 09:19 UTC +fedora-sync-tag := fedora-glibc-20050520T0919 diff --git a/intl/libintl.h b/intl/libintl.h index 6561c78370..544dec3533 100644 --- a/intl/libintl.h +++ b/intl/libintl.h @@ -1,5 +1,5 @@ /* Message catalogs for internationalization. - Copyright (C) 1995-1999, 2000-2002, 2004 Free Software Foundation, Inc. + Copyright (C) 1995-2002, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. This file is derived from the file libgettext.h in the GNU gettext package. @@ -37,19 +37,21 @@ __BEGIN_DECLS /* Look up MSGID in the current default message catalog for the current LC_MESSAGES locale. If not found, returns MSGID itself (the default text). */ -extern char *gettext (__const char *__msgid) __THROW; +extern char *gettext (__const char *__msgid) + __THROW __attribute_format_arg__ (1); /* Look up MSGID in the DOMAINNAME message catalog for the current LC_MESSAGES locale. */ extern char *dgettext (__const char *__domainname, __const char *__msgid) - __THROW; + __THROW __attribute_format_arg__ (2); extern char *__dgettext (__const char *__domainname, __const char *__msgid) __THROW __attribute_format_arg__ (2); /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY locale. */ extern char *dcgettext (__const char *__domainname, - __const char *__msgid, int __category) __THROW; + __const char *__msgid, int __category) + __THROW __attribute_format_arg__ (2); extern char *__dcgettext (__const char *__domainname, __const char *__msgid, int __category) __THROW __attribute_format_arg__ (2); diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 175e4faffb..e3f6123777 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,8 @@ +2005-05-05 Daniel Jacobowitz + + * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Remove explicit + .eh_frame section, use cfi_* directives. + 2005-04-27 Jakub Jelinek * sysdeps/pthread/getcpuclockid.c: Include spinlock.h. diff --git a/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h index 7865f7165e..c8be0fdd39 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek , 2002. @@ -51,7 +51,7 @@ # define SAVE_OLDTYPE_0 movl %eax, %ecx; # define SAVE_OLDTYPE_1 SAVE_OLDTYPE_0 -# define SAVE_OLDTYPE_2 pushl %eax; +# define SAVE_OLDTYPE_2 pushl %eax; cfi_adjust_cfa_offset (4); # define SAVE_OLDTYPE_3 SAVE_OLDTYPE_2 # define SAVE_OLDTYPE_4 SAVE_OLDTYPE_2 # define SAVE_OLDTYPE_5 SAVE_OLDTYPE_2 @@ -62,11 +62,13 @@ # define _PUSHCARGS_0 /* No arguments to push. */ # define _POPCARGS_0 /* No arguments to pop. */ -# define PUSHCARGS_1 movl %ebx, %edx; PUSHCARGS_0 +# define PUSHCARGS_1 movl %ebx, %edx; cfi_register (ebx, edx); PUSHCARGS_0 # define DOCARGS_1 _DOARGS_1 (4) -# define POPCARGS_1 POPCARGS_0; movl %edx, %ebx -# define _PUSHCARGS_1 pushl %ebx; L(PUSHBX2): _PUSHCARGS_0 -# define _POPCARGS_1 _POPCARGS_0; popl %ebx; L(POPBX2): +# define POPCARGS_1 POPCARGS_0; movl %edx, %ebx; cfi_restore (ebx); +# define _PUSHCARGS_1 pushl %ebx; cfi_adjust_cfa_offset (4); \ + cfi_rel_offset (ebx, 0); _PUSHCARGS_0 +# define _POPCARGS_1 _POPCARGS_0; popl %ebx; \ + cfi_adjust_cfa_offset (-4); cfi_restore (ebx); # define PUSHCARGS_2 PUSHCARGS_1 # define DOCARGS_2 _DOARGS_2 (12) @@ -83,14 +85,18 @@ # define PUSHCARGS_4 _PUSHCARGS_4 # define DOCARGS_4 _DOARGS_4 (28) # define POPCARGS_4 _POPCARGS_4 -# define _PUSHCARGS_4 pushl %esi; L(PUSHSI2): _PUSHCARGS_3 -# define _POPCARGS_4 _POPCARGS_3; popl %esi; L(POPSI2): +# define _PUSHCARGS_4 pushl %esi; cfi_adjust_cfa_offset (4); \ + cfi_rel_offset (esi, 0); _PUSHCARGS_3 +# define _POPCARGS_4 _POPCARGS_3; popl %esi; \ + cfi_adjust_cfa_offset (-4); cfi_restore (esi); # define PUSHCARGS_5 _PUSHCARGS_5 # define DOCARGS_5 _DOARGS_5 (36) # define POPCARGS_5 _POPCARGS_5 -# define _PUSHCARGS_5 pushl %edi; L(PUSHDI2): _PUSHCARGS_4 -# define _POPCARGS_5 _POPCARGS_4; popl %edi; L(POPDI2): +# define _PUSHCARGS_5 pushl %edi; cfi_adjust_cfa_offset (4); \ + cfi_rel_offset (edi, 0); _PUSHCARGS_4 +# define _POPCARGS_5 _POPCARGS_4; popl %edi; \ + cfi_adjust_cfa_offset (-4); cfi_restore (edi); # ifdef IS_IN_libpthread # define CENABLE call __pthread_enable_asynccancel; @@ -115,12 +121,15 @@ # define CENABLE call __libc_enable_asynccancel; # define CDISABLE call __libc_disable_asynccancel # endif -# define POPSTATE_0 pushl %eax; movl %ecx, %eax; CDISABLE; popl %eax; +# define POPSTATE_0 \ + pushl %eax; cfi_adjust_cfa_offset (4); movl %ecx, %eax; \ + CDISABLE; popl %eax; cfi_adjust_cfa_offset (-4); # define POPSTATE_1 POPSTATE_0 -# define POPSTATE_2 xchgl (%esp), %eax; CDISABLE; popl %eax; +# define POPSTATE_2 xchgl (%esp), %eax; CDISABLE; popl %eax; \ + cfi_adjust_cfa_offset (-4); # define POPSTATE_3 POPSTATE_2 -# define POPSTATE_4 POPSTATE_2 -# define POPSTATE_5 POPSTATE_2 +# define POPSTATE_4 POPSTATE_3 +# define POPSTATE_5 POPSTATE_4 #if !defined NOT_IN_libc # define __local_multiple_threads __libc_multiple_threads diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h index 2bee000730..1f2f481d64 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h @@ -13,7 +13,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with the GNU C Libr \ary; if not, write to the Free + License along with the GNU C Library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ diff --git a/po/libc.pot b/po/libc.pot index fa5a221435..b2024e3c46 100644 --- a/po/libc.pot +++ b/po/libc.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: libc 2.3.90\n" -"POT-Creation-Date: 2005-04-07 21:55-0700\n" +"POT-Creation-Date: 2005-05-08 09:40-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -193,15 +193,18 @@ msgid "illegal input sequence at position %Zd" msgstr "" #: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:527 +#, c-format msgid "incomplete character or shift sequence at end of buffer" msgstr "" #: iconv/iconv_charmap.c:507 iconv/iconv_charmap.c:543 iconv/iconv_prog.c:570 #: iconv/iconv_prog.c:606 +#, c-format msgid "error while reading the input" msgstr "" #: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:588 +#, c-format msgid "unable to allocate buffer for input" msgstr "" @@ -254,6 +257,7 @@ msgid "[FILE...]" msgstr "" #: iconv/iconv_prog.c:201 +#, c-format msgid "cannot open output file" msgstr "" @@ -278,10 +282,12 @@ msgid "conversion from `%s' to `%s' is not supported" msgstr "" #: iconv/iconv_prog.c:269 +#, c-format msgid "failed to start conversion processing" msgstr "" #: iconv/iconv_prog.c:363 +#, c-format msgid "error while closing output file" msgstr "" @@ -296,7 +302,7 @@ msgstr "" #: iconv/iconv_prog.c:427 iconv/iconvconfig.c:396 locale/programs/locale.c:276 #: locale/programs/localedef.c:388 catgets/gencat.c:247 posix/getconf.c:963 #: nss/getent.c:82 nscd/nscd.c:394 nscd/nscd_nischeck.c:90 elf/ldconfig.c:287 -#: elf/sprof.c:355 +#: elf/ldd.bash.in:39 elf/sprof.c:355 #, c-format msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -313,6 +319,7 @@ msgid "Written by %s.\n" msgstr "" #: iconv/iconv_prog.c:472 iconv/iconv_prog.c:498 +#, c-format msgid "conversion stopped due to problem in writing the output" msgstr "" @@ -322,6 +329,7 @@ msgid "illegal input sequence at position %ld" msgstr "" #: iconv/iconv_prog.c:531 +#, c-format msgid "internal error (illegal descriptor)" msgstr "" @@ -363,18 +371,22 @@ msgid "Do not search standard directories, only those on the command line" msgstr "" #: iconv/iconvconfig.c:302 +#, c-format msgid "Directory arguments required when using --nostdlib" msgstr "" #: iconv/iconvconfig.c:344 locale/programs/localedef.c:292 +#, c-format msgid "no output file produced because warning were issued" msgstr "" #: iconv/iconvconfig.c:430 +#, c-format msgid "while inserting in search tree" msgstr "" #: iconv/iconvconfig.c:1238 +#, c-format msgid "cannot generate output file" msgstr "" @@ -784,10 +796,12 @@ msgid "symbol `%s'" msgstr "" #: locale/programs/ld-collate.c:1803 +#, c-format msgid "no definition of `UNDEFINED'" msgstr "" #: locale/programs/ld-collate.c:1832 +#, c-format msgid "too many errors; giving up" msgstr "" @@ -902,6 +916,7 @@ msgid "%s: missing `reorder-sections-end' keyword" msgstr "" #: locale/programs/ld-ctype.c:440 +#, c-format msgid "No character set name specified in charmap" msgstr "" @@ -941,22 +956,27 @@ msgid " character must not be in class `%s'" msgstr "" #: locale/programs/ld-ctype.c:600 +#, c-format msgid "character not defined in character map" msgstr "" #: locale/programs/ld-ctype.c:714 +#, c-format msgid "`digit' category has not entries in groups of ten" msgstr "" #: locale/programs/ld-ctype.c:763 +#, c-format msgid "no input digits defined and none of the standard names in the charmap" msgstr "" #: locale/programs/ld-ctype.c:828 +#, c-format msgid "not all characters used in `outdigit' are available in the charmap" msgstr "" #: locale/programs/ld-ctype.c:845 +#, c-format msgid "not all characters used in `outdigit' are available in the repertoire" msgstr "" @@ -1097,6 +1117,7 @@ msgid "" msgstr "" #: locale/programs/ld-ctype.c:3482 +#, c-format msgid "no output digits defined and none of the standard names in the charmap" msgstr "" @@ -1371,22 +1392,27 @@ msgid "" msgstr "" #: locale/programs/locale.c:194 +#, c-format msgid "Cannot set LC_CTYPE to default locale" msgstr "" #: locale/programs/locale.c:196 +#, c-format msgid "Cannot set LC_MESSAGES to default locale" msgstr "" #: locale/programs/locale.c:209 +#, c-format msgid "Cannot set LC_COLLATE to default locale" msgstr "" #: locale/programs/locale.c:225 +#, c-format msgid "Cannot set LC_ALL to default locale" msgstr "" #: locale/programs/locale.c:501 +#, c-format msgid "while preparing output" msgstr "" @@ -1470,10 +1496,12 @@ msgid "" msgstr "" #: locale/programs/localedef.c:233 +#, c-format msgid "cannot create directory for output files" msgstr "" #: locale/programs/localedef.c:244 +#, c-format msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'" msgstr "" @@ -1498,6 +1526,7 @@ msgid "" msgstr "" #: locale/programs/localedef.c:568 +#, c-format msgid "circular dependencies between locale definitions" msgstr "" @@ -1507,47 +1536,58 @@ msgid "cannot add already read locale `%s' a second time" msgstr "" #: locale/programs/locarchive.c:89 locale/programs/locarchive.c:258 +#, c-format msgid "cannot create temporary file" msgstr "" #: locale/programs/locarchive.c:118 locale/programs/locarchive.c:304 +#, c-format msgid "cannot initialize archive file" msgstr "" #: locale/programs/locarchive.c:125 locale/programs/locarchive.c:311 +#, c-format msgid "cannot resize archive file" msgstr "" #: locale/programs/locarchive.c:134 locale/programs/locarchive.c:320 #: locale/programs/locarchive.c:508 +#, c-format msgid "cannot map archive header" msgstr "" #: locale/programs/locarchive.c:156 +#, c-format msgid "failed to create new locale archive" msgstr "" #: locale/programs/locarchive.c:168 +#, c-format msgid "cannot change mode of new locale archive" msgstr "" #: locale/programs/locarchive.c:252 +#, c-format msgid "cannot map locale archive file" msgstr "" #: locale/programs/locarchive.c:328 +#, c-format msgid "cannot lock new archive" msgstr "" #: locale/programs/locarchive.c:377 +#, c-format msgid "cannot extend locale archive file" msgstr "" #: locale/programs/locarchive.c:386 +#, c-format msgid "cannot change mode of resized locale archive" msgstr "" #: locale/programs/locarchive.c:394 +#, c-format msgid "cannot rename new archive" msgstr "" @@ -1567,6 +1607,7 @@ msgid "cannot lock locale archive \"%s\"" msgstr "" #: locale/programs/locarchive.c:494 +#, c-format msgid "cannot read archive header" msgstr "" @@ -1578,6 +1619,7 @@ msgstr "" #: locale/programs/locarchive.c:785 locale/programs/locarchive.c:800 #: locale/programs/locarchive.c:812 locale/programs/locarchive.c:824 #: locale/programs/locfile.c:344 +#, c-format msgid "cannot add to locale archive" msgstr "" @@ -1668,6 +1710,7 @@ msgid "no or value given" msgstr "" #: locale/programs/repertoire.c:333 +#, c-format msgid "cannot safe new repertoire map" msgstr "" @@ -1687,6 +1730,7 @@ msgstr "" #: locale/programs/xmalloc.c:70 malloc/obstack.c:415 malloc/obstack.c:418 #: posix/getconf.c:1104 elf/ldconfig.c:1101 +#, c-format msgid "memory exhausted" msgstr "" @@ -1700,19 +1744,6 @@ msgstr "" msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n" msgstr "" -#: intl/tst-codeset.c:40 intl/tst-codeset.c:50 intl/tst-gettext3.c:42 -#: intl/tst-gettext3.c:52 -msgid "cheese" -msgstr "" - -#: intl/tst-gettext2.c:37 -msgid "First string for testing." -msgstr "" - -#: intl/tst-gettext2.c:38 -msgid "Another string for testing." -msgstr "" - #: catgets/gencat.c:111 catgets/gencat.c:115 nscd/nscd.c:99 msgid "NAME" msgstr "" @@ -1802,14 +1833,17 @@ msgid "unterminated message" msgstr "" #: catgets/gencat.c:1242 +#, c-format msgid "while opening old catalog file" msgstr "" #: catgets/gencat.c:1333 +#, c-format msgid "conversion modules not available" msgstr "" #: catgets/gencat.c:1359 +#, c-format msgid "cannot determine escape character" msgstr "" @@ -1832,7 +1866,7 @@ 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. -#: stdio-common/../sysdeps/gnu/errlist.c:36 +#: stdio-common/../sysdeps/gnu/errlist.c:36 elf/ldd.bash.in:148 msgid "No such file or directory" msgstr "" @@ -3507,6 +3541,7 @@ msgid "Supported databases:" msgstr "" #: nss/getent.c:848 nscd/nscd.c:146 nscd/nscd_nischeck.c:64 +#, c-format msgid "wrong number of arguments" msgstr "" @@ -3528,14 +3563,17 @@ msgid "[FILE]" msgstr "" #: debug/pcprofiledump.c:100 +#, c-format msgid "cannot open input file" msgstr "" #: debug/pcprofiledump.c:106 +#, c-format msgid "cannot read header" msgstr "" #: debug/pcprofiledump.c:170 +#, c-format msgid "invalid pointer size" msgstr "" @@ -4929,27 +4967,30 @@ msgstr "" msgid "handle_request: request received (Version = %d)" msgstr "" -#: nscd/connections.c:1515 +#: nscd/connections.c:1514 #, c-format msgid "could only start %d threads; terminating" msgstr "" -#: nscd/connections.c:1563 nscd/connections.c:1564 nscd/connections.c:1581 -#: nscd/connections.c:1590 nscd/connections.c:1603 nscd/connections.c:1609 -#: nscd/connections.c:1616 +#: nscd/connections.c:1562 nscd/connections.c:1563 nscd/connections.c:1580 +#: nscd/connections.c:1589 nscd/connections.c:1602 nscd/connections.c:1608 +#: nscd/connections.c:1615 #, c-format msgid "Failed to run nscd as user '%s'" msgstr "" -#: nscd/connections.c:1582 +#: nscd/connections.c:1581 +#, c-format msgid "initial getgrouplist failed" msgstr "" -#: nscd/connections.c:1591 +#: nscd/connections.c:1590 +#, c-format msgid "getgrouplist failed" msgstr "" -#: nscd/connections.c:1604 +#: nscd/connections.c:1603 +#, c-format msgid "setgroups failed" msgstr "" @@ -5033,10 +5074,12 @@ msgid "cannot read configuration file; this is fatal" msgstr "" #: nscd/nscd.c:167 +#, c-format msgid "already running" msgstr "" #: nscd/nscd.c:182 nscd/nscd.c:237 +#, c-format msgid "cannot fork" msgstr "" @@ -5045,10 +5088,12 @@ msgid "Could not create log file" msgstr "" #: nscd/nscd.c:304 nscd/nscd.c:328 nscd/nscd_stat.c:162 +#, c-format msgid "Only root is allowed to use this option!" msgstr "" #: nscd/nscd.c:378 +#, c-format msgid "secure services not implemented anymore" msgstr "" @@ -5095,14 +5140,17 @@ msgid "Only root or %s is allowed to use this option!" msgstr "" #: nscd/nscd_stat.c:169 +#, c-format msgid "nscd not running!\n" msgstr "" #: nscd/nscd_stat.c:180 +#, c-format msgid "write incomplete" msgstr "" #: nscd/nscd_stat.c:192 +#, c-format msgid "cannot read statistics data" msgstr "" @@ -5187,6 +5235,57 @@ msgstr "" msgid "Invalid numeric uid \"%s\"!" msgstr "" +#: nscd/selinux.c:105 +msgid "Failed to determine if kernel supports SELinux" +msgstr "" + +#: nscd/selinux.c:120 +#, c-format +msgid "Failed to start AVC thread" +msgstr "" + +#: nscd/selinux.c:142 +#, c-format +msgid "Failed to create AVC lock" +msgstr "" + +#: nscd/selinux.c:182 +#, c-format +msgid "Failed to start AVC" +msgstr "" + +#: nscd/selinux.c:184 +msgid "Access Vector Cache (AVC) started" +msgstr "" + +#: nscd/selinux.c:202 +msgid "Error getting context of socket peer" +msgstr "" + +#: nscd/selinux.c:207 +msgid "Error getting context of nscd" +msgstr "" + +#: nscd/selinux.c:213 +msgid "Error getting sid from context" +msgstr "" + +#: nscd/selinux.c:245 +#, c-format +msgid "" +"\n" +"SELinux AVC Statistics:\n" +"\n" +"%15u entry lookups\n" +"%15u entry hits\n" +"%15u entry misses\n" +"%15u entry discards\n" +"%15u CAV lookups\n" +"%15u CAV hits\n" +"%15u CAV probes\n" +"%15u CAV misses\n" +msgstr "" + #: elf/../sysdeps/generic/dl-sysdep.c:486 msgid "cannot create capability list" msgstr "" @@ -5221,6 +5320,7 @@ msgid "%s is not a shared object file (Type: %d).\n" msgstr "" #: elf/../sysdeps/generic/readelflib.c:109 +#, c-format msgid "more than one dynamic segment\n" msgstr "" @@ -5248,10 +5348,12 @@ msgid "Can't open cache file %s\n" msgstr "" #: elf/cache.c:154 +#, c-format msgid "mmap of cache file failed.\n" msgstr "" #: elf/cache.c:158 elf/cache.c:168 +#, c-format msgid "File is not a cache file.\n" msgstr "" @@ -5271,10 +5373,12 @@ msgid "Can't create temporary cache file %s" msgstr "" #: elf/cache.c:425 elf/cache.c:434 elf/cache.c:438 +#, c-format msgid "Writing of cache data failed" msgstr "" #: elf/cache.c:442 +#, c-format msgid "Writing of cache data failed." msgstr "" @@ -5288,7 +5392,7 @@ msgstr "" msgid "Renaming of %s to %s failed" msgstr "" -#: elf/dl-close.c:119 +#: elf/dl-close.c:116 msgid "shared object not open" msgstr "" @@ -5732,6 +5836,7 @@ msgid "%s:%u: duplicate hwcap %lu %s" msgstr "" #: elf/ldconfig.c:1094 +#, c-format msgid "need absolute file name for configuration file when using -r" msgstr "" @@ -5746,6 +5851,7 @@ msgid "relative path `%s' used to build cache" msgstr "" #: elf/ldconfig.c:1199 +#, c-format msgid "Can't chdir to /" msgstr "" @@ -5754,6 +5860,55 @@ msgstr "" msgid "Can't open cache file directory %s\n" msgstr "" +#: elf/ldd.bash.in:43 +msgid "Written by %s and %s.\n" +msgstr "" + +#: elf/ldd.bash.in:48 +msgid "" +"Usage: ldd [OPTION]... FILE...\n" +" --help print this help and exit\n" +" --version print version information and exit\n" +" -d, --data-relocs process data relocations\n" +" -r, --function-relocs process data and function relocations\n" +" -u, --unused print unused direct dependencies\n" +" -v, --verbose print all information\n" +"For bug reporting instructions, please see:\n" +"." +msgstr "" + +#: elf/ldd.bash.in:80 +msgid "ldd: option `$1' is ambiguous" +msgstr "" + +#: elf/ldd.bash.in:87 +msgid "unrecognized option" +msgstr "" + +#: elf/ldd.bash.in:88 elf/ldd.bash.in:126 +msgid "Try `ldd --help' for more information." +msgstr "" + +#: elf/ldd.bash.in:125 +msgid "missing file arguments" +msgstr "" + +#: elf/ldd.bash.in:151 +msgid "warning: you do not have execution permission for" +msgstr "" + +#: elf/ldd.bash.in:185 +msgid "\tnot a dynamic executable" +msgstr "" + +#: elf/ldd.bash.in:193 +msgid "exited with unknown exit code" +msgstr "" + +#: elf/ldd.bash.in:198 +msgid "error: you do not have read permission for" +msgstr "" + #: elf/readlib.c:98 #, c-format msgid "Cannot fstat file %s.\n" @@ -5812,6 +5967,7 @@ msgid "failed to load shared object `%s'" msgstr "" #: elf/sprof.c:409 +#, c-format msgid "cannot create internal descriptors" msgstr "" @@ -5821,10 +5977,12 @@ msgid "Reopening shared object `%s' failed" msgstr "" #: elf/sprof.c:535 elf/sprof.c:629 +#, c-format msgid "reading of section headers failed" msgstr "" #: elf/sprof.c:543 elf/sprof.c:637 +#, c-format msgid "reading of section header string table failed" msgstr "" @@ -5834,10 +5992,12 @@ msgid "*** Cannot read debuginfo file name: %m\n" msgstr "" #: elf/sprof.c:589 +#, c-format msgid "cannot determine file name" msgstr "" #: elf/sprof.c:622 +#, c-format msgid "reading of ELF header failed" msgstr "" @@ -5847,14 +6007,17 @@ msgid "*** The file `%s' is stripped: no detailed analysis possible\n" msgstr "" #: elf/sprof.c:688 +#, c-format msgid "failed to load symbol data" msgstr "" #: elf/sprof.c:755 +#, c-format msgid "cannot load profiling data" msgstr "" #: elf/sprof.c:764 +#, c-format msgid "while stat'ing profiling data file" msgstr "" @@ -5864,14 +6027,17 @@ msgid "profiling data file `%s' does not match shared object `%s'" msgstr "" #: elf/sprof.c:783 +#, c-format msgid "failed to mmap the profiling data file" msgstr "" #: elf/sprof.c:791 +#, c-format msgid "error while closing the profiling data file" msgstr "" #: elf/sprof.c:800 elf/sprof.c:870 +#, c-format msgid "cannot create internal descriptor" msgstr "" @@ -5881,5 +6047,6 @@ msgid "`%s' is no correct profile data file for `%s'" msgstr "" #: elf/sprof.c:1027 elf/sprof.c:1085 +#, c-format msgid "cannot allocate symbol data" msgstr "" diff --git a/posix/regcomp.c b/posix/regcomp.c index 68e2bdab92..2053b024dc 100644 --- a/posix/regcomp.c +++ b/posix/regcomp.c @@ -774,6 +774,8 @@ re_compile_internal (preg, pattern, length, syntax) } preg->used = sizeof (re_dfa_t); + __libc_lock_init (dfa->lock); + err = init_dfa (dfa, length); if (BE (err != REG_NOERROR, 0)) { diff --git a/posix/regex_internal.h b/posix/regex_internal.h index 58fa749e90..6db384416a 100644 --- a/posix/regex_internal.h +++ b/posix/regex_internal.h @@ -39,6 +39,14 @@ #if defined HAVE_WCTYPE_H || defined _LIBC # include #endif /* HAVE_WCTYPE_H || _LIBC */ +#if defined _LIBC +# include +#else +# define __libc_lock_define(CLASS,NAME) +# define __libc_lock_init(NAME) do { } while (0) +# define __libc_lock_lock(NAME) do { } while (0) +# define __libc_lock_unlock(NAME) do { } while (0) +#endif /* In case that the system doesn't have isblank(). */ #if !defined _LIBC && !defined HAVE_ISBLANK && !defined isblank @@ -647,6 +655,7 @@ struct re_dfa_t #ifdef DEBUG char* re_str; #endif + __libc_lock_define (, lock) }; #ifndef RE_NO_INTERNAL_PROTOTYPES diff --git a/posix/regexec.c b/posix/regexec.c index 3c226e3c20..e635261d05 100644 --- a/posix/regexec.c +++ b/posix/regexec.c @@ -219,6 +219,7 @@ regexec (preg, string, nmatch, pmatch, eflags) { reg_errcode_t err; int start, length; + re_dfa_t *dfa = (re_dfa_t *)preg->buffer; if (eflags & ~(REG_NOTBOL | REG_NOTEOL | REG_STARTEND)) return REG_BADPAT; @@ -233,12 +234,15 @@ regexec (preg, string, nmatch, pmatch, eflags) start = 0; length = strlen (string); } + + __libc_lock_lock (dfa->lock); if (preg->no_sub) err = re_search_internal (preg, string, length, start, length - start, length, 0, NULL, eflags); else err = re_search_internal (preg, string, length, start, length - start, length, nmatch, pmatch, eflags); + __libc_lock_unlock (dfa->lock); return err != REG_NOERROR; } @@ -402,6 +406,7 @@ re_search_stub (bufp, string, length, start, range, stop, regs, ret_len) regmatch_t *pmatch; int nregs, rval; int eflags = 0; + re_dfa_t *dfa = (re_dfa_t *)bufp->buffer; /* Check for out-of-range. */ if (BE (start < 0 || start > length, 0)) @@ -411,6 +416,8 @@ re_search_stub (bufp, string, length, start, range, stop, regs, ret_len) else if (BE (start + range < 0, 0)) range = -start; + __libc_lock_lock (dfa->lock); + eflags |= (bufp->not_bol) ? REG_NOTBOL : 0; eflags |= (bufp->not_eol) ? REG_NOTEOL : 0; @@ -439,7 +446,10 @@ re_search_stub (bufp, string, length, start, range, stop, regs, ret_len) nregs = bufp->re_nsub + 1; pmatch = re_malloc (regmatch_t, nregs); if (BE (pmatch == NULL, 0)) - return -2; + { + rval = -2; + goto out; + } result = re_search_internal (bufp, string, length, start, range, stop, nregs, pmatch, eflags); @@ -469,6 +479,8 @@ re_search_stub (bufp, string, length, start, range, stop, regs, ret_len) rval = pmatch[0].rm_so; } re_free (pmatch); + out: + __libc_lock_unlock (dfa->lock); return rval; } diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c index 1fae16efce..6ac0d95ea6 100644 --- a/sysdeps/generic/dl-sysdep.c +++ b/sysdeps/generic/dl-sysdep.c @@ -119,7 +119,7 @@ _dl_sysdep_start (void **start_argptr, switch (av->a_type) { case AT_PHDR: - phdr = av->a_un.a_ptr; + phdr = (void *) av->a_un.a_val; break; case AT_PHNUM: phnum = av->a_un.a_val; @@ -152,7 +152,7 @@ _dl_sysdep_start (void **start_argptr, INTUSE(__libc_enable_secure) = av->a_un.a_val; break; case AT_PLATFORM: - GLRO(dl_platform) = av->a_un.a_ptr; + GLRO(dl_platform) = (void *) av->a_un.a_val; break; case AT_HWCAP: GLRO(dl_hwcap) = (unsigned long int) av->a_un.a_val; @@ -170,7 +170,7 @@ _dl_sysdep_start (void **start_argptr, #endif #if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO case AT_SYSINFO_EHDR: - GLRO(dl_sysinfo_dso) = av->a_un.a_ptr; + GLRO(dl_sysinfo_dso) = (void *) av->a_un.a_val; break; #endif #ifdef DL_PLATFORM_AUXV @@ -312,7 +312,7 @@ _dl_show_auxv (void) if (idx < sizeof (auxvars) / sizeof (auxvars[0]) && auxvars[idx].form != unknown) { - const char *val = av->a_un.a_ptr; + const char *val = (char *) av->a_un.a_val; if (__builtin_expect (auxvars[idx].form, dec) == dec) val = _itoa ((unsigned long int) av->a_un.a_val, diff --git a/sysdeps/i386/i686/memcpy_chk.S b/sysdeps/i386/i686/memcpy_chk.S index 561263f9bf..2893911cd2 100644 --- a/sysdeps/i386/i686/memcpy_chk.S +++ b/sysdeps/i386/i686/memcpy_chk.S @@ -1,4 +1,4 @@ -/* Checking memcpy for x86-64. +/* Checking memcpy for i686. Copyright (C) 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 5ec7262157..d97b95b5e0 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -196,10 +196,10 @@ gaih_local (const char *name, const struct gaih_service *service, (*pai)->ai_addrlen = sizeof (struct sockaddr_un); (*pai)->ai_addr = (void *) (*pai) + sizeof (struct addrinfo); -#if SALEN +#ifdef _HAVE_SA_LEN ((struct sockaddr_un *) (*pai)->ai_addr)->sun_len = sizeof (struct sockaddr_un); -#endif /* SALEN */ +#endif /* _HAVE_SA_LEN */ ((struct sockaddr_un *)(*pai)->ai_addr)->sun_family = AF_LOCAL; memset(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path, 0, UNIX_PATH_MAX); @@ -1076,9 +1076,9 @@ gaih_inet (const char *name, const struct gaih_service *service, ai->ai_canonname = (char *) canon; canon = NULL; -#if SALEN +#ifdef _HAVE_SA_LEN ai->ai_addr->sa_len = socklen; -#endif /* SALEN */ +#endif /* _HAVE_SA_LEN */ ai->ai_addr->sa_family = family; if (family == AF_INET6) diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h index 33fc1b6a9c..cec271bb3a 100644 --- a/sysdeps/powerpc/powerpc64/dl-machine.h +++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -122,16 +122,16 @@ elf_machine_dynamic (void) `_dl_start' is the real entry point; its return value is the user program's entry point. */ #define RTLD_START \ - asm (".section \".text\"\n" \ + asm (".pushsection \".text\"\n" \ " .align 2\n" \ " .type " BODY_PREFIX "_start,@function\n" \ -" .section \".opd\",\"aw\"\n" \ +" .pushsection \".opd\",\"aw\"\n" \ " .align 3\n" \ " .globl _start\n" \ " " ENTRY_2(_start) "\n" \ "_start:\n" \ " " OPD_ENT(_start) "\n" \ -" .previous\n" \ +" .popsection\n" \ BODY_PREFIX "_start:\n" \ /* We start with the following on the stack, from top: \ argc (4 bytes); \ @@ -157,11 +157,11 @@ BODY_PREFIX "_start:\n" \ " .align 2\n" \ " " END_2(_start) "\n" \ " .globl _dl_start_user\n" \ -" .section \".opd\",\"aw\"\n" \ +" .pushsection \".opd\",\"aw\"\n" \ "_dl_start_user:\n" \ " " OPD_ENT(_dl_start_user) "\n" \ -" .previous\n" \ -" .section \".toc\",\"aw\"\n" \ +" .popsection\n" \ +" .pushsection \".toc\",\"aw\"\n" \ DL_STARTING_UP_DEF \ ".LC__rtld_global:\n" \ " .tc _rtld_global[TC],_rtld_global\n" \ @@ -171,7 +171,7 @@ DL_STARTING_UP_DEF \ " .tc _dl_argv_internal[TC],_dl_argv_internal\n" \ ".LC__dl_fini:\n" \ " .tc _dl_fini[TC],_dl_fini\n" \ -" .previous\n" \ +" .popsection\n" \ " .type " BODY_PREFIX "_dl_start_user,@function\n" \ " " ENTRY_2(_dl_start_user) "\n" \ /* Now, we do our main work of calling initialisation procedures. \ @@ -245,7 +245,7 @@ BODY_PREFIX "_dl_start_user:\n" \ ".LT__dl_start_user_name_end:\n" \ " .align 2\n" \ " " END_2(_dl_start_user) "\n" \ -" .previous"); +" .popsection"); /* Nonzero iff TYPE should not be allowed to resolve to one of the main executable's symbols, as for a COPY reloc. */ diff --git a/sysdeps/unix/sysv/linux/clock_getres.c b/sysdeps/unix/sysv/linux/clock_getres.c index 610738f7bb..2d0136dfeb 100644 --- a/sysdeps/unix/sysv/linux/clock_getres.c +++ b/sysdeps/unix/sysv/linux/clock_getres.c @@ -19,6 +19,7 @@ #include #include +#include #include "kernel-posix-cpu-timers.h" #include "kernel-features.h" diff --git a/sysdeps/unix/sysv/linux/clock_gettime.c b/sysdeps/unix/sysv/linux/clock_gettime.c index 41fbbde1cc..bd79642dd5 100644 --- a/sysdeps/unix/sysv/linux/clock_gettime.c +++ b/sysdeps/unix/sysv/linux/clock_gettime.c @@ -19,6 +19,7 @@ #include #include +#include #include "kernel-posix-cpu-timers.h" #include "kernel-features.h" -- cgit v1.2.1