[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r10184 - in /fsf/trunk/libc: ./ elf/ localedata/ localedata/locales/ nptl/ nptl/sysdeps/pthread/ po/ resolv/nss_dns/ sysdeps...
- To: commits@xxxxxxxxxx
- Subject: [commits] r10184 - in /fsf/trunk/libc: ./ elf/ localedata/ localedata/locales/ nptl/ nptl/sysdeps/pthread/ po/ resolv/nss_dns/ sysdeps...
- From: eglibc@xxxxxxxxxx
- Date: Tue, 06 Apr 2010 07:05:01 -0000
Author: eglibc
Date: Tue Apr 6 00:04:57 2010
New Revision: 10184
Log:
Import glibc-mainline for 2010-04-06
Added:
fsf/trunk/libc/sysdeps/gnu/rt-unwind-resume.c
fsf/trunk/libc/sysdeps/gnu/unwind-resume.c
Removed:
fsf/trunk/libc/nptl/sysdeps/pthread/rt-unwind-resume.c
fsf/trunk/libc/nptl/sysdeps/pthread/unwind-resume.c
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/Makeconfig
fsf/trunk/libc/elf/elf.h
fsf/trunk/libc/elf/ldconfig.c
fsf/trunk/libc/elf/rtld.c
fsf/trunk/libc/localedata/ChangeLog
fsf/trunk/libc/localedata/locales/pt_BR
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/nptl/sysdeps/pthread/Makefile
fsf/trunk/libc/po/nl.po
fsf/trunk/libc/resolv/nss_dns/dns-host.c
fsf/trunk/libc/sysdeps/gnu/Makefile
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Apr 6 00:04:57 2010
@@ -1,3 +1,34 @@
+2010-04-05 Thomas Schwinge <thomas@xxxxxxxxxxxxx>
+
+ * sysdeps/gnu/unwind-resume.c: New, moved from nptl/sysdeps/pthread/.
+ * sysdeps/gnu/rt-unwind-resume.c: Likewise.
+ * sysdeps/gnu/Makefile: Add sections for csu and rt subdirs to
+ build unwind-resume code, previously in nptl/sysdeps/pthread/Makefile.
+
+2010-04-05 Roland McGrath <roland@xxxxxxxxxx>
+
+ * elf/rtld.c (dl_main) [HAVE_AUX_VECTOR]: Add a cast.
+
+2010-03-30 Paul Pluzhnikov <ppluzhnikov@xxxxxxxxxx>
+
+ * Makeconfig: Propagate -fdebug-prefix-map from CFLAGS to ASFLAGS.
+
+2010-03-30 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * elf/elf.h (ELFOSABI_ARM_AEABI): Define.
+
+2010-04-05 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * po/nl.po: Update from translation team.
+
+ [BZ #11010]
+ * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname3_r): Handle
+ timeouts from servers.
+
+ [BZ #11149]
+ * elf/ldconfig.c (main): Respect chroot setting when looking for
+ the aux cache.
+
2010-04-04 Ulrich Drepper <drepper@xxxxxxxxxx>
[BZ #11043]
Modified: fsf/trunk/libc/Makeconfig
==============================================================================
--- fsf/trunk/libc/Makeconfig (original)
+++ fsf/trunk/libc/Makeconfig Tue Apr 6 00:04:57 2010
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2003,2004,2005,2006,2007,2008,2009
+# Copyright (C) 1991-2003,2004,2005,2006,2007,2008,2009,2010
# Free Software Foundation, Inc.
# This file is part of the GNU C Library.
@@ -780,7 +780,7 @@
# The assembler can generate debug information too.
ifndef ASFLAGS
ifeq ($(have-cpp-asm-debuginfo),yes)
-ASFLAGS := $(filter -g%,$(CFLAGS))
+ASFLAGS := $(filter -g% -fdebug-prefix-map=%,$(CFLAGS))
else
ASFLAGS :=
endif
Modified: fsf/trunk/libc/elf/elf.h
==============================================================================
--- fsf/trunk/libc/elf/elf.h (original)
+++ fsf/trunk/libc/elf/elf.h Tue Apr 6 00:04:57 2010
@@ -150,6 +150,7 @@
#define ELFOSABI_TRU64 10 /* Compaq TRU64 UNIX. */
#define ELFOSABI_MODESTO 11 /* Novell Modesto. */
#define ELFOSABI_OPENBSD 12 /* OpenBSD. */
+#define ELFOSABI_ARM_AEABI 64 /* ARM EABI */
#define ELFOSABI_ARM 97 /* ARM */
#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */
Modified: fsf/trunk/libc/elf/ldconfig.c
==============================================================================
--- fsf/trunk/libc/elf/ldconfig.c (original)
+++ fsf/trunk/libc/elf/ldconfig.c Tue Apr 6 00:04:57 2010
@@ -1305,11 +1305,9 @@
p ? (*p = '\0', cache_file) : "/");
if (canon == NULL)
- {
- error (EXIT_FAILURE, errno,
- _("Can't open cache file directory %s\n"),
- p ? cache_file : "/");
- }
+ error (EXIT_FAILURE, errno,
+ _("Can't open cache file directory %s\n"),
+ p ? cache_file : "/");
if (p)
++p;
@@ -1346,8 +1344,17 @@
add_system_dir (LIBDIR);
}
+ char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
+ if (opt_chroot)
+ {
+ aux_cache_file = chroot_canon (opt_chroot, aux_cache_file);
+ if (aux_cache_file == NULL)
+ error (EXIT_FAILURE, errno, _("Can't open cache file %s\n"),
+ _PATH_LDCONFIG_AUX_CACHE);
+ }
+
if (! opt_ignore_aux_cache)
- load_aux_cache (_PATH_LDCONFIG_AUX_CACHE);
+ load_aux_cache (aux_cache_file);
else
init_aux_cache ();
@@ -1356,7 +1363,7 @@
if (opt_build_cache)
{
save_cache (cache_file);
- save_aux_cache (_PATH_LDCONFIG_AUX_CACHE);
+ save_aux_cache (aux_cache_file);
}
return 0;
Modified: fsf/trunk/libc/elf/rtld.c
==============================================================================
--- fsf/trunk/libc/elf/rtld.c (original)
+++ fsf/trunk/libc/elf/rtld.c Tue Apr 6 00:04:57 2010
@@ -1091,7 +1091,7 @@
switch (av->a_type)
{
case AT_PHDR:
- av->a_un.a_val = phdr;
+ av->a_un.a_val = (uintptr_t) phdr;
break;
case AT_PHNUM:
av->a_un.a_val = phnum;
Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Tue Apr 6 00:04:57 2010
@@ -1,3 +1,8 @@
+2010-04-05 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #11007]
+ * locales/pt_BR: Define thousands_sep and grouping.
+
2010-01-28 Marcelo E. Magallon <marcelo.magallon@xxxxxxxxx>
[BZ #11258]
Modified: fsf/trunk/libc/localedata/locales/pt_BR
==============================================================================
--- fsf/trunk/libc/localedata/locales/pt_BR (original)
+++ fsf/trunk/libc/localedata/locales/pt_BR Tue Apr 6 00:04:57 2010
@@ -14,7 +14,6 @@
% Revision: 4.4
% Date: 1997-03-19
% Users: general
-% Repertoiremap: mnemonic.ds
% Charset: ISO-8859-1
% Distribution and use is free, also
% for commercial purposes.
@@ -79,40 +78,40 @@
LC_NUMERIC
decimal_point "<U002C>"
-thousands_sep ""
-grouping 0;0
+thousands_sep "<U002E>"
+grouping 3;3
END LC_NUMERIC
LC_TIME
abday "<U0044><U006F><U006D>";"<U0053><U0065><U0067>";/
- "<U0054><U0065><U0072>";"<U0051><U0075><U0061>";/
- "<U0051><U0075><U0069>";"<U0053><U0065><U0078>";/
- "<U0053><U00E1><U0062>"
+ "<U0054><U0065><U0072>";"<U0051><U0075><U0061>";/
+ "<U0051><U0075><U0069>";"<U0053><U0065><U0078>";/
+ "<U0053><U00E1><U0062>"
day "<U0064><U006F><U006D><U0069><U006E><U0067><U006F>";/
- "<U0073><U0065><U0067><U0075><U006E><U0064><U0061>";/
- "<U0074><U0065><U0072><U00E7><U0061>";/
- "<U0071><U0075><U0061><U0072><U0074><U0061>";/
- "<U0071><U0075><U0069><U006E><U0074><U0061>";/
- "<U0073><U0065><U0078><U0074><U0061>";/
- "<U0073><U00E1><U0062><U0061><U0064><U006F>"
+ "<U0073><U0065><U0067><U0075><U006E><U0064><U0061>";/
+ "<U0074><U0065><U0072><U00E7><U0061>";/
+ "<U0071><U0075><U0061><U0072><U0074><U0061>";/
+ "<U0071><U0075><U0069><U006E><U0074><U0061>";/
+ "<U0073><U0065><U0078><U0074><U0061>";/
+ "<U0073><U00E1><U0062><U0061><U0064><U006F>"
abmon "<U004A><U0061><U006E>";"<U0046><U0065><U0076>";/
- "<U004D><U0061><U0072>";"<U0041><U0062><U0072>";/
- "<U004D><U0061><U0069>";"<U004A><U0075><U006E>";/
- "<U004A><U0075><U006C>";"<U0041><U0067><U006F>";/
- "<U0053><U0065><U0074>";"<U004F><U0075><U0074>";/
- "<U004E><U006F><U0076>";"<U0044><U0065><U007A>"
+ "<U004D><U0061><U0072>";"<U0041><U0062><U0072>";/
+ "<U004D><U0061><U0069>";"<U004A><U0075><U006E>";/
+ "<U004A><U0075><U006C>";"<U0041><U0067><U006F>";/
+ "<U0053><U0065><U0074>";"<U004F><U0075><U0074>";/
+ "<U004E><U006F><U0076>";"<U0044><U0065><U007A>"
mon "<U006A><U0061><U006E><U0065><U0069><U0072><U006F>";/
- "<U0066><U0065><U0076><U0065><U0072><U0065><U0069><U0072><U006F>";/
- "<U006D><U0061><U0072><U00E7><U006F>";/
- "<U0061><U0062><U0072><U0069><U006C>";/
- "<U006D><U0061><U0069><U006F>";/
- "<U006A><U0075><U006E><U0068><U006F>";/
- "<U006A><U0075><U006C><U0068><U006F>";/
- "<U0061><U0067><U006F><U0073><U0074><U006F>";/
- "<U0073><U0065><U0074><U0065><U006D><U0062><U0072><U006F>";/
- "<U006F><U0075><U0074><U0075><U0062><U0072><U006F>";/
- "<U006E><U006F><U0076><U0065><U006D><U0062><U0072><U006F>";/
- "<U0064><U0065><U007A><U0065><U006D><U0062><U0072><U006F>"
+ "<U0066><U0065><U0076><U0065><U0072><U0065><U0069><U0072><U006F>";/
+ "<U006D><U0061><U0072><U00E7><U006F>";/
+ "<U0061><U0062><U0072><U0069><U006C>";/
+ "<U006D><U0061><U0069><U006F>";/
+ "<U006A><U0075><U006E><U0068><U006F>";/
+ "<U006A><U0075><U006C><U0068><U006F>";/
+ "<U0061><U0067><U006F><U0073><U0074><U006F>";/
+ "<U0073><U0065><U0074><U0065><U006D><U0062><U0072><U006F>";/
+ "<U006F><U0075><U0074><U0075><U0062><U0072><U006F>";/
+ "<U006E><U006F><U0076><U0065><U006D><U0062><U0072><U006F>";/
+ "<U0064><U0065><U007A><U0065><U006D><U0062><U0072><U006F>"
d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
d_fmt "<U0025><U0064><U002D><U0025><U006D><U002D><U0025><U0059>"
t_fmt "<U0025><U0054>"
Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Tue Apr 6 00:04:57 2010
@@ -1,3 +1,10 @@
+2010-04-05 Thomas Schwinge <thomas@xxxxxxxxxxxxx>
+
+ * sysdeps/pthread/unwind-resume.c: Moved to main tree sysdeps/gnu/.
+ * sysdeps/pthread/rt-unwind-resume.c: Likewise.
+ * sysdeps/pthread/Makefile: Remove csu section and rt section's
+ unwind-resume bits, now in main tree sysdeps/gnu/Makefile instead.
+
2010-03-23 Luis Machado <luisgpm@xxxxxxxxxx>
* pthread_cond_timedwait.c: Add check for
Modified: fsf/trunk/libc/nptl/sysdeps/pthread/Makefile
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/pthread/Makefile (original)
+++ fsf/trunk/libc/nptl/sysdeps/pthread/Makefile Tue Apr 6 00:04:57 2010
@@ -1,4 +1,4 @@
-# Copyright (C) 2002,2003,2004,2006 Free Software Foundation, Inc.
+# Copyright (C) 2002,2003,2004,2006,2010 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
@@ -17,21 +17,13 @@
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
-ifeq ($(subdir),csu)
-routines += unwind-resume
-shared-only-routines += unwind-resume
-CFLAGS-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables
-endif
-
ifeq ($(subdir),nptl)
libpthread-sysdep_routines += errno-loc
endif
ifeq ($(subdir),rt)
-librt-sysdep_routines += timer_routines librt-cancellation rt-unwind-resume
-librt-shared-only-routines += rt-unwind-resume
+librt-sysdep_routines += timer_routines librt-cancellation
CFLAGS-librt-cancellation.c += -fexceptions -fasynchronous-unwind-tables
-CFLAGS-rt-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables
ifeq (yes,$(build-shared))
$(objpfx)tst-timer: $(objpfx)librt.so $(shared-thread-library)
Modified: fsf/trunk/libc/po/nl.po
==============================================================================
--- fsf/trunk/libc/po/nl.po (original)
+++ fsf/trunk/libc/po/nl.po Tue Apr 6 00:04:57 2010
@@ -1,31 +1,33 @@
# Dutch translations for libc.
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the glibc package.
#
# Elros Cyriatan <cyriatan@xxxxxxxxxxx>, 2004.
-# Benno Schulenberg <benno@xxxxxxxxxxx>, 2006, 2007, 2008.
+# Erwin Poeze <erwin.poeze@xxxxxxxxx>, 2009.
+# Benno Schulenberg <benno@xxxxxxxxxxx>, 2006, 2007, 2008, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: libc-2.9.90\n"
+"Project-Id-Version: libc-2.11\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-02-06 12:40-0800\n"
-"PO-Revision-Date: 2009-03-04 11:41+0100\n"
-"Last-Translator: Erwin Poeze <erwin.poeze@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-04-05 16:30+0200\n"
+"Last-Translator: Benno Schulenberg <benno@xxxxxxxxxxx>\n"
"Language-Team: Dutch <vertaling@xxxxxxxxxxxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.0\n"
#: argp/argp-help.c:228
#, c-format
msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr "%.*s: parameter in ARGP_HELP_FMT vereist een waarde"
+msgstr "%.*s: Parameter in ARGP_HELP_FMT vereist een waarde"
#: argp/argp-help.c:238
#, c-format
msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr "%.*s: onbekende parameter in ARGP_HELP_FMT"
+msgstr "%.*s: Onbekende parameter in ARGP_HELP_FMT"
#: argp/argp-help.c:251
#, c-format
@@ -80,7 +82,7 @@
#: argp/argp-parse.c:167
msgid "Print program version"
-msgstr "programmaversie tonen"
+msgstr "de programmaversie tonen"
#: argp/argp-parse.c:183
msgid "(PROGRAM ERROR) No version known!?"
@@ -328,9 +330,7 @@
"\n"
" -?,--help deze hulptekst tonen\n"
" --usage een korte gebruikssamenvatting tonen\n"
-" -V,--version programmaversie tonen\n"
-"\n"
-"Argumenten die verplicht zijn voor lange opties, zijn ook verplicht voor de overeenkomstige korte opties.\n"
+" -V,--version de programmaversie tonen\n"
"\n"
#: debug/xtrace.sh:127
@@ -703,7 +703,7 @@
#: elf/ldconfig.c:142
msgid "Generate verbose messages"
-msgstr "breedsprakige uitvoer"
+msgstr "gedetailleerde uitvoer produceren"
#: elf/ldconfig.c:143
msgid "Don't build cache"
@@ -934,12 +934,15 @@
" -v, --verbose print all information\n"
msgstr ""
"Gebruik: ldd [OPTIE]... BESTAND...\n"
+"\n"
+"Bibliotheekafhankelijkheden weergeven.\n"
+"\n"
" --help deze hulptekst tonen\n"
-" --version programmaversie tonen\n"
+" --version de programmaversie tonen\n"
" -d, --data-relocs dataverplaatsingen verwerken\n"
" -r, --function-relocs data- en functieverplaatsingen verwerken\n"
" -u, --unused ongebruikte directe afhankelijkheden tonen\n"
-" -v, --verbose breedsprakige uitvoer\n"
+" -v, --verbose gedetailleerde uitvoer produceren\n"
#: elf/ldd.bash.in:82
msgid "ldd: option \\`$1' is ambiguous"
@@ -1045,7 +1048,7 @@
"Usage: sln src dest|file\n"
"\n"
msgstr ""
-"Gebruik: sln src dest|bestand\n"
+"Gebruik: sln BRON BESTEMMING|BESTAND\n"
"\n"
#: elf/sln.c:110
@@ -1066,7 +1069,7 @@
#: elf/sln.c:185
#, c-format
msgid "%s: failed to remove the old destination\n"
-msgstr "%s: de oude bestemming verwijderen is mislukt\n"
+msgstr "%s: verwijderen van oude bestemming is mislukt\n"
#: elf/sln.c:193
#, c-format
@@ -1096,7 +1099,7 @@
#: elf/sprof.c:89
msgid "Read and display shared object profiling data."
-msgstr "Profielgegevens gedeeld object lezen en weergeven."
+msgstr "Profiling-gegevens van gedeeld object lezen en tonen."
#: elf/sprof.c:94
msgid "SHOBJ [PROFDATA]"
@@ -1111,7 +1114,7 @@
#: elf/sprof.c:429
#, c-format
msgid "cannot create internal descriptors"
-msgstr "kan interne descriptor niet aanmaken"
+msgstr "kan geen interne descriptors aanmaken"
#: elf/sprof.c:548
#, c-format
@@ -1756,7 +1759,7 @@
#: locale/programs/ld-collate.c:426
#, c-format
msgid "`%.*s' already defined in repertoire"
-msgstr "`%.*s' is al gedefinieerd in repertoire"
+msgstr "'%.*s' is al gedefinieerd in repertoire"
#: locale/programs/ld-collate.c:433
#, c-format
@@ -2118,6 +2121,9 @@
msgid "premature end of `translit_ignore' definition"
msgstr "voortijdig einde van definitie van 'translit_ignore'"
+#
+# This error message is issued when yacc finds an error at parse time.
+#
#: locale/programs/ld-ctype.c:2076 locale/programs/ld-ctype.c:2127
#: locale/programs/ld-ctype.c:2169
msgid "syntax error"
@@ -2437,11 +2443,11 @@
#: locale/programs/locale.c:82
msgid "Print more information"
-msgstr "uitgebreide uitvoer produceren"
+msgstr "gedetailleerde uitvoer produceren"
#: locale/programs/locale.c:87
msgid "Get locale-specific information."
-msgstr "Informatie over taalregio ophalen."
+msgstr "Informatie over taalregios tonen."
#: locale/programs/locale.c:90
msgid ""
@@ -2514,7 +2520,7 @@
#: locale/programs/localedef.c:135
msgid "Print more messages"
-msgstr "breedsprakige uitvoer"
+msgstr "gedetailleerde uitvoer produceren"
#: locale/programs/localedef.c:136
msgid "Archive control:"
@@ -2759,7 +2765,7 @@
#: locale/programs/locfile.c:782
msgid "expecting string argument for `copy'"
-msgstr "argument van `copy' dient een tekenreeks te zijn"
+msgstr "argument van 'copy' dient een tekenreeks te zijn"
#: locale/programs/locfile.c:786
msgid "locale name should consist only of portable characters"
@@ -2884,6 +2890,7 @@
"\n"
msgstr ""
"Gebruik: memusage [OPTIE]... PROGRAMMA [PROGRAMMA-OPTIE]...\n"
+"\n"
"Het geheugengebruik van PROGRAMMA bijhouden.\n"
"\n"
" -n,--progname=NAAM te observeren programma\n"
@@ -2896,7 +2903,7 @@
"\n"
" -?,--help deze hulptekst tonen\n"
" --usage een korte gebruikssamenvatting tonen\n"
-" -V,--version programmaversie tonen\n"
+" -V,--version de programmaversie tonen\n"
"\n"
" De volgende opties zijn alleen bij grafische uitvoer van toepassing:\n"
" -t,--time-based de grafiek lineair in de tijd maken\n"
@@ -3647,7 +3654,7 @@
#: nscd/connections.c:578
msgid "uninitialized header"
-msgstr "niet-geïnitialiseerde header"
+msgstr "ongeïnitialiseerde header"
#: nscd/connections.c:583
msgid "header size does not match"
@@ -3674,12 +3681,14 @@
#: nscd/connections.c:651
#, c-format
msgid "cannot access '%s'"
-msgstr "kan '%s' niet openen"
+msgstr "kan geen toegang tot '%s' verkrijgen"
#: nscd/connections.c:699
#, c-format
msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
-msgstr "gegevensbestand voor %s is beschadigd of wordt al gebruikt; verwijder %s zo nodig handmatig en herstart"
+msgstr ""
+"gegevensbestand voor %s is beschadigd of wordt al gebruikt;\n"
+"verwijder %s zo nodig handmatig en herstart"
#: nscd/connections.c:706
#, c-format
@@ -3818,7 +3827,7 @@
#: nscd/connections.c:1903 nscd/connections.c:2101
#, c-format
msgid "disabled inotify after read error %d"
-msgstr "inotify uitgeschakeld na leesfout %d"
+msgstr "'inotify' is uitgeschakeld na leesfout %d"
#: nscd/connections.c:2230
msgid "could not initialize conditional variable"
@@ -3826,11 +3835,11 @@
#: nscd/connections.c:2238
msgid "could not start clean-up thread; terminating"
-msgstr "kan opschoon-thread niet starten; gestopt"
+msgstr "kan opschoon-thread niet starten -- gestopt"
#: nscd/connections.c:2252
msgid "could not start any worker thread; terminating"
-msgstr "kan geen worker-thread starten; gestopt"
+msgstr "kan geen enkele werk-thread starten -- gestopt"
#: nscd/connections.c:2303 nscd/connections.c:2304 nscd/connections.c:2321
#: nscd/connections.c:2330 nscd/connections.c:2348 nscd/connections.c:2359
@@ -3878,7 +3887,7 @@
#: nscd/mem.c:457
#, c-format
msgid "freed %zu bytes in %s cache"
-msgstr "%zu bytes in cache %s vrijgegeven"
+msgstr "%zu bytes in cache %s zijn vrijgegeven"
#: nscd/mem.c:594
#, c-format
@@ -3968,7 +3977,7 @@
#: nscd/nscd.c:345
#, c-format
msgid "'%s' is not a known database"
-msgstr "'%s' is geen bekende database"
+msgstr "'%s' is geen bekende gegevensbank"
#: nscd/nscd.c:370 nscd/nscd_stat.c:191
#, c-format
@@ -4248,7 +4257,7 @@
#: nscd/selinux.c:374
msgid "compile-time support for database policy missing"
-msgstr "ondersteuning compileertijd voor databasebeleid ontbreekt"
+msgstr "ondersteuning voor gegevensbankbeleid is niet meegecompileerd"
#: nscd/selinux.c:407
#, c-format
@@ -4297,7 +4306,7 @@
#: nss/getent.c:62
msgid "Get entries from administrative database."
-msgstr "Haal items uit administratieve database."
+msgstr "Items uit administratieve gegevensbank ophalen."
#: nss/getent.c:143 nss/getent.c:408
#, c-format
@@ -4398,12 +4407,12 @@
"environment SPEC.\n"
"\n"
msgstr ""
-"Gebruik: getconf [-v SPEC] VAR\n"
-" of: getconf [-v SPEC] PAD_VAR PAD\n"
+"Gebruik: getconf [-v SPEC] VAR\n"
+" of: getconf [-v SPEC] PADVAR PAD\n"
"\n"
-"De configuratiewaarde voor variabele VAR ophalen, of variabele PAD_VAR\n"
-"voor pad PAD. Als SPEC opgegeven wordt, gelden de waarden voor de\n"
-"compilatieomgeving.\n"
+"De configuratiewaarde van variabele VAR tonen, of van variabele PADVAR\n"
+"voor pad PAD. Als SPEC gegeven is, de waarden uit compilatieomgeving\n"
+"SPEC weergeven.\n"
"\n"
#: posix/getconf.c:1081
@@ -4459,7 +4468,7 @@
#: posix/getopt.c:800 posix/getopt.c:803
#, c-format
msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ongeldige optie -- %c\n"
+msgstr "%s: ongeldige optie -- '%c'\n"
#: posix/getopt.c:853 posix/getopt.c:870 posix/getopt.c:1073
#: posix/getopt.c:1091
@@ -4485,6 +4494,7 @@
msgid "Invalid regular expression"
msgstr "Ongeldige reguliere expressie"
+# Zie http://mailman.vrijschrift.org/pipermail/vertaling/2005-August/004670.html
#: posix/regcomp.c:142
msgid "Invalid collation character"
msgstr "Ongeldig samengesteld teken"
@@ -4919,122 +4929,122 @@
#: sunrpc/rpc_main.c:1469
#, c-format
msgid "options:\n"
-msgstr "opties:\n"
+msgstr "Opties:\n"
#: sunrpc/rpc_main.c:1470
#, c-format
msgid "-a\t\tgenerate all files, including samples\n"
-msgstr "-a\t\talle bestanden genereren, inclusief voorbeelden\n"
+msgstr "-a alle bestanden genereren, inclusief voorbeelden\n"
#: sunrpc/rpc_main.c:1471
#, c-format
msgid "-b\t\tbackward compatibility mode (generates code for SunOS 4.1)\n"
-msgstr "-b\t\tterugwaardse compatibiliteitsmodus (maakt code voor SunOS 4.1 aan)\n"
+msgstr "-b terugwaartse compatibiliteitsmodus (genereert SunOS 4.1-code)\n"
#: sunrpc/rpc_main.c:1472
#, c-format
msgid "-c\t\tgenerate XDR routines\n"
-msgstr "-c\t\tXDR-routines genereren\n"
+msgstr "-c XDR-routines genereren\n"
#: sunrpc/rpc_main.c:1473
#, c-format
msgid "-C\t\tANSI C mode\n"
-msgstr "-C\t\tANSI C-modus\n"
+msgstr "-C ANSI C-modus\n"
#: sunrpc/rpc_main.c:1474
#, c-format
msgid "-Dname[=value]\tdefine a symbol (same as #define)\n"
-msgstr "-Dname[=waarde]\tdefineert een symbool (gelijk aan #define)\n"
+msgstr "-Dname[=WAARDE] een symbool definiëren (hetzelfde als #define)\n"
#: sunrpc/rpc_main.c:1475
#, c-format
msgid "-h\t\tgenerate header file\n"
-msgstr "-h\t\tgenereert headerbestand\n"
+msgstr "-h headerbestand genereren\n"
#: sunrpc/rpc_main.c:1476
#, c-format
msgid "-i size\t\tsize at which to start generating inline code\n"
-msgstr "-i grootte\t\tbij overschrijden grootte wordt inline-code aangemaakt\n"
+msgstr "-i GROOTTE na overschrijden van GROOTTE wordt inline-code gegenereerd\n"
#: sunrpc/rpc_main.c:1477
#, c-format
msgid "-I\t\tgenerate code for inetd support in server (for SunOS 4.1)\n"
-msgstr "-I\t\tgenereert code voor inetd-ondersteuning in server (voor SunOS 4.1)\n"
+msgstr "-I code genereren voor inetd-serverondersteuning (voor SunOS 4.1)\n"
#: sunrpc/rpc_main.c:1478
#, c-format
msgid "-K seconds\tserver exits after K seconds of inactivity\n"
-msgstr "-K seconden\tserver stopt na K seconden van inactiviteit\n"
+msgstr "-K SECONDEN server stopt na dit aantal seconden van inactiviteit\n"
#: sunrpc/rpc_main.c:1479
#, c-format
msgid "-l\t\tgenerate client side stubs\n"
-msgstr "-l\t\tgenereert client-side stubs\n"
+msgstr "-l client-side stubs genereren\n"
#: sunrpc/rpc_main.c:1480
#, c-format
msgid "-L\t\tserver errors will be printed to syslog\n"
-msgstr "-L\t\tserverfouten worden weggeschreven naar syslog\n"
+msgstr "-L serverfouten worden naar syslog geschreven\n"
#: sunrpc/rpc_main.c:1481
#, c-format
msgid "-m\t\tgenerate server side stubs\n"
-msgstr "-m\t\tgenereert server-side stubs\n"
+msgstr "-m server-side stubs genereren\n"
#: sunrpc/rpc_main.c:1482
#, c-format
msgid "-M\t\tgenerate MT-safe code\n"
-msgstr "-M\t\tgenereert MT-safe-code\n"
+msgstr "-M MT-safe-code genereren\n"
#: sunrpc/rpc_main.c:1483
#, c-format
msgid "-n netid\tgenerate server code that supports named netid\n"
-msgstr "-n netid\tgenereert servercode die benoemde netid ondersteund\n"
+msgstr "-n NETID servercode genereren die deze NETID ondersteunt\n"
#: sunrpc/rpc_main.c:1484
#, c-format
msgid "-N\t\tsupports multiple arguments and call-by-value\n"
-msgstr "-N\t\tondersteunt meervoudige argumenten en call-by-value\n"
+msgstr "-N meervoudige argumenten en call-by-value ondersteunen\n"
#: sunrpc/rpc_main.c:1485
#, c-format
msgid "-o outfile\tname of the output file\n"
-msgstr "-o uitvoer\tnaam van het uitvoerbestand\n"
+msgstr "-o UITBESTAND naam van het uitvoerbestand\n"
#: sunrpc/rpc_main.c:1486
#, c-format
msgid "-s nettype\tgenerate server code that supports named nettype\n"
-msgstr "-s nettype\tgenereert servercode dat benoemde nettype ondersteund\n"
+msgstr "-s NETTYPE servercode generen die dit NETTYPE ondersteunt\n"
#: sunrpc/rpc_main.c:1487
#, c-format
msgid "-Sc\t\tgenerate sample client code that uses remote procedures\n"
-msgstr "-Sc\t\tgenereert voorbeeld-clientcode die remote-procedures ondersteunt\n"
+msgstr "-Sc voorbeeld-cliëntcode genereren die remote-procedures gebruikt\n"
#: sunrpc/rpc_main.c:1488
#, c-format
msgid "-Ss\t\tgenerate sample server code that defines remote procedures\n"
-msgstr "-Ss\t\tgenereert voorbeeld-servercode die remote-procedures definieert\n"
+msgstr "-Ss voorbeeld-servercode genereren die remote-procedures definieert\n"
#: sunrpc/rpc_main.c:1489
#, c-format
msgid "-Sm \t\tgenerate makefile template \n"
-msgstr "-Sm \t\tgenereert makefilesjabloon \n"
+msgstr "-Sm 'makefile'-sjabloon genereren\n"
#: sunrpc/rpc_main.c:1490
#, c-format
msgid "-t\t\tgenerate RPC dispatch table\n"
-msgstr "-t\t\tgenereert RPC-dispatchtabel\n"
+msgstr "-t RPC-dispatch-tabel genereren\n"
#: sunrpc/rpc_main.c:1491
#, c-format
msgid "-T\t\tgenerate code to support RPC dispatch tables\n"
-msgstr "-T\t\tgenereert code om RPC-dispatchtabellen te ondersteunen\n"
+msgstr "-T code genereren om RPC-dispatch-tabellen te ondersteunen\n"
#: sunrpc/rpc_main.c:1492
#, c-format
msgid "-Y path\t\tdirectory name to find C preprocessor (cpp)\n"
-msgstr "-Y pad\t\tmapnaam om C-voorverwerker (CPP) te vinden\n"
+msgstr "-Y PAD naam van map waarin C-voorverwerker 'cpp' is te vinden\n"
#: sunrpc/rpc_scan.c:114
msgid "constant or identifier expected"
@@ -5225,17 +5235,20 @@
msgid "svc_unix.c - cannot getsockname or listen"
msgstr "svc_unix.c: getsockname() en listen() zijn mislukt"
+# Vroeger ging dit over het afsluiten van een modemverbinding,
+# tegenwoordig over het afsluiten van een pseudoterminal.
#: sysdeps/generic/siglist.h:29 sysdeps/unix/siglist.c:27
msgid "Hangup"
-msgstr "Ophangen"
+msgstr "Opgehangen"
#: sysdeps/generic/siglist.h:30 sysdeps/unix/siglist.c:28
msgid "Interrupt"
-msgstr "Onderbreken"
-
+msgstr "Onderbroken"
+
+# Verleden tijd, "Afgesloten", net als de andere actiesignaalnamen.
#: sysdeps/generic/siglist.h:31 sysdeps/unix/siglist.c:29
msgid "Quit"
-msgstr "Afsluiten"
+msgstr "Afgesloten"
#: sysdeps/generic/siglist.h:32 sysdeps/unix/siglist.c:30
msgid "Illegal instruction"
@@ -5251,7 +5264,7 @@
#: sysdeps/generic/siglist.h:35 sysdeps/unix/siglist.c:34
msgid "Floating point exception"
-msgstr "Drijvende-komma-berekeningsfout"
+msgstr "Drijvendekomma-berekeningsfout"
#: sysdeps/generic/siglist.h:36 sysdeps/unix/siglist.c:35
msgid "Killed"
@@ -5277,23 +5290,23 @@
#: sysdeps/generic/siglist.h:40 sysdeps/unix/siglist.c:40
msgid "Alarm clock"
-msgstr "Alarmklok"
+msgstr "Wekker"
#: sysdeps/generic/siglist.h:41 sysdeps/unix/siglist.c:41
msgid "Terminated"
-msgstr "Afgesloten"
+msgstr "Beëindigd"
#: sysdeps/generic/siglist.h:42 sysdeps/unix/siglist.c:42
msgid "Urgent I/O condition"
-msgstr "Spoedeisende I/O-toestand"
+msgstr "Urgente in-/uitvoertoestand"
#: sysdeps/generic/siglist.h:43 sysdeps/unix/siglist.c:43
msgid "Stopped (signal)"
-msgstr "Gestopt (signaal)"
+msgstr "Gepauzeerd (signaal)"
#: sysdeps/generic/siglist.h:44 sysdeps/unix/siglist.c:44
msgid "Stopped"
-msgstr "Gestopt"
+msgstr "Gepauzeerd"
#: sysdeps/generic/siglist.h:45 sysdeps/unix/siglist.c:45
msgid "Continued"
@@ -5301,19 +5314,19 @@
#: sysdeps/generic/siglist.h:46 sysdeps/unix/siglist.c:46
msgid "Child exited"
-msgstr "Kind is afgesloten"
+msgstr "Dochter is afgesloten"
#: sysdeps/generic/siglist.h:47 sysdeps/unix/siglist.c:47
msgid "Stopped (tty input)"
-msgstr "Gestopt (tty-invoer)"
+msgstr "Gepauzeerd (terminalinvoer)"
#: sysdeps/generic/siglist.h:48 sysdeps/unix/siglist.c:48
msgid "Stopped (tty output)"
-msgstr "Gestopt (tty-uitvoer)"
+msgstr "Gepauzeerd (terminaluitvoer)"
#: sysdeps/generic/siglist.h:49 sysdeps/unix/siglist.c:49
msgid "I/O possible"
-msgstr "I/O is mogelijk"
+msgstr "In-/uitvoer is mogelijk"
#: sysdeps/generic/siglist.h:50 sysdeps/unix/siglist.c:50
msgid "CPU time limit exceeded"
@@ -5337,11 +5350,11 @@
#: sysdeps/generic/siglist.h:55 sysdeps/unix/siglist.c:56
msgid "User defined signal 1"
-msgstr "Eerste door gebruiker gedefinieerd signaal"
+msgstr "Gebruikergedefinieerd signaal 1"
#: sysdeps/generic/siglist.h:56 sysdeps/unix/siglist.c:57
msgid "User defined signal 2"
-msgstr "Tweede door gebruiker gedefinieerd signaal"
+msgstr "Gebruikergedefinieerd signaal 2"
#: sysdeps/generic/siglist.h:60 sysdeps/unix/siglist.c:33
msgid "EMT trap"
@@ -5353,7 +5366,7 @@
#: sysdeps/generic/siglist.h:66
msgid "Stack fault"
-msgstr "Stackfout"
+msgstr "Stack-fout"
#: sysdeps/generic/siglist.h:69
msgid "Information request"
@@ -5940,7 +5953,7 @@
#. TRANS up, before it has connected to the file.
#: sysdeps/gnu/errlist.c:955
msgid "Translator died"
-msgstr "Vertaler bestaat niet meer"
+msgstr "Vertaalprogramma is gecrasht"
#. TRANS The experienced user will know what is wrong.
#. TRANS @c This error code is a joke. Its perror text is part of the joke.
@@ -6206,7 +6219,7 @@
#: sysdeps/posix/gai_strerror-strs.h:2
msgid "Temporary failure in name resolution"
-msgstr "Tijdelijke storing in naamsherleiding"
+msgstr "Tijdelijk probleem in naamsherleiding"
#: sysdeps/posix/gai_strerror-strs.h:3
msgid "Bad value for ai_flags"
@@ -6214,7 +6227,7 @@
#: sysdeps/posix/gai_strerror-strs.h:4
msgid "Non-recoverable failure in name resolution"
-msgstr "Onherstelbare mislukking in naamsherleiding"
+msgstr "Onherstelbaar probleem in naamsherleiding"
#: sysdeps/posix/gai_strerror-strs.h:5
msgid "ai_family not supported"
@@ -6292,7 +6305,7 @@
"Usage: lddlibc4 FILE\n"
"\n"
msgstr ""
-"Gebruik: lddlibc4 BESTAND\n"
+"Gebruik: lddlibc4 BESTAND\n"
"\n"
#: sysdeps/unix/sysv/linux/lddlibc4.c:82
@@ -6431,6 +6444,10 @@
msgid "%s in ruleless zone"
msgstr "%s in voorschriftloze zone"
+#
+# This is the name of the program's standard input. The place input
+# from getchar (et al) comes from.
+#
#: timezone/zic.c:816
msgid "standard input"
msgstr "standaardinvoer"
@@ -6677,7 +6694,9 @@
#: timezone/zic.c:2577
msgid "rule goes past start/end of month--will not work with pre-2004 versions of zic"
-msgstr "voorschrift gaat voorbij begin of einde van maand -- dit werkt niet met versies van 'zic' van voor 2004"
+msgstr ""
+"voorschrift gaat voorbij begin of einde van maand --\n"
+"dit werkt niet met versies van 'zic' van voor 2004"
#: timezone/zic.c:2609
msgid "time zone abbreviation lacks alphabetic at start"
@@ -6708,78 +6727,3 @@
#, c-format
msgid "%s: %d did not sign extend correctly\n"
msgstr "%s: %d is niet correct omgezet naar een grotere precisie\n"
-
-#~ msgid "cannot create searchlist"
-#~ msgstr "kan zoeklijst niet aanmaken"
-
-#~ msgid ""
-#~ "Read and display shared object profiling data.\vFor bug reporting instructions, please see:\n"
-#~ "<http://www.gnu.org/software/libc/bugs.html>.\n"
-#~ msgstr ""
-#~ " \n"
-#~ "Gegevens van prestatie-analyse inlezen en afbeelden.\vVoor het rapporteren van fouten, zie:\n"
-#~ " <http://www.gnu.org/software/libc/bugs.html>.\n"
-
-#~ msgid "%s: stopping date is invalid in string %Zd in `era' field"
-#~ msgstr "%s: einddatum is ongeldig in tekenreeks %Zd in het veld 'era'"
-
-#~ msgid ""
-#~ "Get locale-specific information.\vFor bug reporting instructions, please see:\n"
-#~ "<http://www.gnu.org/software/libc/bugs.html>.\n"
-#~ msgstr ""
-#~ " \n"
-#~ "Informatie over taalregio-instellingen weergeven.\vVoor het rapporteren van fouten, zie:\n"
-#~ " <http://www.gnu.org/software/libc/bugs.html>.\n"
-
-#~ msgid ""
-#~ "Get entries from administrative database.\vFor bug reporting instructions, please see:\n"
-#~ "<http://www.gnu.org/software/libc/bugs.html>.\n"
-#~ msgstr ""
-#~ " \n"
-#~ "Items uit een gegevensbank weergeven.\vVoor het rapporteren van fouten, zie:\n"
-#~ " <http://www.gnu.org/software/libc/bugs.html>.\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ongeldige optie -- %c\n"
-
-#~ msgid "authunix_create: out of memory\n"
-#~ msgstr "authunix_create(): onvoldoende geheugen\n"
-
-#~ msgid "clnttcp_create: out of memory\n"
-#~ msgstr "clnttcp_create(): onvoldoende geheugen\n"
-
-#~ msgid "clntudp_create: out of memory\n"
-#~ msgstr "clntudp_create(): onvoldoende geheugen\n"
-
-#~ msgid "clntunix_create: out of memory\n"
-#~ msgstr "clntunix_create(): onvoldoende geheugen\n"
-
-#~ msgid "svctcp_create: out of memory\n"
-#~ msgstr "svctcp_create(): onvoldoende geheugen\n"
-
-#~ msgid "svc_tcp: makefd_xprt: out of memory\n"
-#~ msgstr "svc_tcp.c: makefd_xprt(): onvoldoende geheugen\n"
-
-#~ msgid "svcudp_create: out of memory\n"
-#~ msgstr "svcudp_create(): onvoldoende geheugen\n"
-
-#~ msgid "svcunix_create: out of memory\n"
-#~ msgstr "svcunix_create(): onvoldoende geheugen\n"
-
-#~ msgid "svc_unix: makefd_xprt: out of memory\n"
-#~ msgstr "svc_unix.c: makefd_xprt(): onvoldoende geheugen\n"
-
-#~ msgid "xdr_bytes: out of memory\n"
-#~ msgstr "xdr_bytes(): onvoldoende geheugen\n"
-
-#~ msgid "xdr_string: out of memory\n"
-#~ msgstr "xdr_string(): onvoldoende geheugen\n"
-
-#~ msgid "xdr_array: out of memory\n"
-#~ msgstr "xdr_array(): onvoldoende geheugen\n"
-
-#~ msgid "xdrrec_create: out of memory\n"
-#~ msgstr "xdrrec_create(): onvoldoende geheugen\n"
-
-#~ msgid "xdr_reference: out of memory\n"
-#~ msgstr "xdr_reference(): onvoldoende geheugen\n"
Modified: fsf/trunk/libc/resolv/nss_dns/dns-host.c
==============================================================================
--- fsf/trunk/libc/resolv/nss_dns/dns-host.c (original)
+++ fsf/trunk/libc/resolv/nss_dns/dns-host.c Tue Apr 6 00:04:57 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2004, 2007, 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2004, 2007-2009, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Extended from original form by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
@@ -198,21 +198,27 @@
1024, &host_buffer.ptr, NULL, NULL, NULL);
if (n < 0)
{
- if (errno == ESRCH)
- {
+ switch (errno)
+ {
+ case ESRCH:
status = NSS_STATUS_TRYAGAIN;
h_errno = TRY_AGAIN;
- }
- else
- status = (errno == ECONNREFUSED
- ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND);
+ break;
+ case ECONNREFUSED:
+ case ETIMEDOUT:
+ status = NSS_STATUS_UNAVAIL;
+ break;
+ default:
+ status = NSS_STATUS_NOTFOUND;
+ break;
+ }
*h_errnop = h_errno;
if (h_errno == TRY_AGAIN)
*errnop = EAGAIN;
else
__set_errno (olderr);
- /* If we are looking for a IPv6 address and mapping is enabled
+ /* If we are looking for an IPv6 address and mapping is enabled
by having the RES_USE_INET6 bit in _res.options set, we try
another lookup. */
if (af == AF_INET6 && (_res.options & RES_USE_INET6))
Modified: fsf/trunk/libc/sysdeps/gnu/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/gnu/Makefile (original)
+++ fsf/trunk/libc/sysdeps/gnu/Makefile Tue Apr 6 00:04:57 2010
@@ -1,4 +1,4 @@
-# Copyright (C) 1996,1997,1998,1999,2001,2002,2003,2004,2005,2006
+# Copyright (C) 1996,1997,1998,1999,2001,2002,2003,2004,2005,2006,2010
# Free Software Foundation, Inc.
# This file is part of the GNU C Library.
@@ -77,3 +77,16 @@
ifeq ($(subdir),misc)
sysdep_headers += sys/mtio.h
endif
+
+
+ifeq ($(subdir),csu)
+routines += unwind-resume
+shared-only-routines += unwind-resume
+CFLAGS-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables
+endif
+
+ifeq ($(subdir),rt)
+librt-sysdep_routines += rt-unwind-resume
+librt-shared-only-routines += rt-unwind-resume
+CFLAGS-rt-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables
+endif
Added: fsf/trunk/libc/sysdeps/gnu/rt-unwind-resume.c
==============================================================================
--- fsf/trunk/libc/sysdeps/gnu/rt-unwind-resume.c (added)
+++ fsf/trunk/libc/sysdeps/gnu/rt-unwind-resume.c Tue Apr 6 00:04:57 2010
@@ -1,0 +1,1 @@
+#include <unwind-resume.c>
Added: fsf/trunk/libc/sysdeps/gnu/unwind-resume.c
==============================================================================
--- fsf/trunk/libc/sysdeps/gnu/unwind-resume.c (added)
+++ fsf/trunk/libc/sysdeps/gnu/unwind-resume.c Tue Apr 6 00:04:57 2010
@@ -1,0 +1,65 @@
+/* Copyright (C) 2003 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Jakub Jelinek <jakub@xxxxxxxxxx>.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ 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 Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <dlfcn.h>
+#include <stdio.h>
+#include <unwind.h>
+#include <libgcc_s.h>
+
+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
+static _Unwind_Reason_Code (*libgcc_s_personality)
+ (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
+ struct _Unwind_Context *);
+
+static void
+init (void)
+{
+ void *resume, *personality;
+ void *handle;
+
+ handle = __libc_dlopen (LIBGCC_S_SO);
+
+ if (handle == NULL
+ || (resume = __libc_dlsym (handle, "_Unwind_Resume")) == NULL
+ || (personality = __libc_dlsym (handle, "__gcc_personality_v0")) == NULL)
+ __libc_fatal (LIBGCC_S_SO " must be installed for pthread_cancel to work\n");
+
+ libgcc_s_resume = resume;
+ libgcc_s_personality = personality;
+}
+
+void
+_Unwind_Resume (struct _Unwind_Exception *exc)
+{
+ if (__builtin_expect (libgcc_s_resume == NULL, 0))
+ init ();
+ libgcc_s_resume (exc);
+}
+
+_Unwind_Reason_Code
+__gcc_personality_v0 (int version, _Unwind_Action actions,
+ _Unwind_Exception_Class exception_class,
+ struct _Unwind_Exception *ue_header,
+ struct _Unwind_Context *context)
+{
+ if (__builtin_expect (libgcc_s_personality == NULL, 0))
+ init ();
+ return libgcc_s_personality (version, actions, exception_class,
+ ue_header, context);
+}