[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r8559 - in /fsf/trunk/libc: ChangeLog misc/sys/select.h po/sv.po sysdeps/x86_64/bits/select.h

To: commits@xxxxxxxxxx
Subject: [commits] r8559 - in /fsf/trunk/libc: ChangeLog misc/sys/select.h po/sv.po sysdeps/x86_64/bits/select.h
From: eglibc@xxxxxxxxxx
Date: Mon, 15 Jun 2009 07:07:05 -0000
Author: eglibc
Date: Mon Jun 15 00:07:04 2009
New Revision: 8559

Log:
Import glibc-mainline for 2009-06-15

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/misc/sys/select.h
    fsf/trunk/libc/po/sv.po
    fsf/trunk/libc/sysdeps/x86_64/bits/select.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Mon Jun 15 00:07:04 2009
@@ -1,3 +1,13 @@
+2009-06-14  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* po/sv.po: Update from translation team.
+
+	[BZ #10229]
+	* misc/sys/select.h (__NFDBITS): Expression should have type int.
+	* sysdeps/x86_64/bits/select.h: Remove asm versions for __FD_SET,
+	__FD_CLR, and __FD_ISSET.  gcc nowadays generates better code from
+	the C version.
+
 2009-06-12  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* Versions.def: Add GLIBC_2.11 for libpthread.

Modified: fsf/trunk/libc/misc/sys/select.h
==============================================================================
--- fsf/trunk/libc/misc/sys/select.h (original)
+++ fsf/trunk/libc/misc/sys/select.h Mon Jun 15 00:07:04 2009
@@ -1,5 +1,5 @@
 /* `fd_set' type and related macros, and `select'/`pselect' declarations.
-   Copyright (C) 1996,97,98,99,2000,01,02,2003 Free Software Foundation, Inc.
+   Copyright (C) 1996-2003, 2009 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
@@ -59,7 +59,7 @@
 #undef	__FDELT
 #undef	__FDMASK
 /* It's easier to assume 8-bit bytes than to get CHAR_BIT.  */
-#define __NFDBITS	(8 * sizeof (__fd_mask))
+#define __NFDBITS	(8 * (int) sizeof (__fd_mask))
 #define	__FDELT(d)	((d) / __NFDBITS)
 #define	__FDMASK(d)	((__fd_mask) 1 << ((d) % __NFDBITS))
 

Modified: fsf/trunk/libc/po/sv.po
==============================================================================
--- fsf/trunk/libc/po/sv.po (original)
+++ fsf/trunk/libc/po/sv.po Mon Jun 15 00:07:04 2009
@@ -1,14 +1,14 @@
-# GNU libc message catalog for swedish
+# GNU libc message catalog for Swedish
 # Copyright Â© 1996, 1998, 2001, 2002, 2003, 2006, 2008, 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the glibc package.
 # Jan DjÃ¤rv <jan.h.d@xxxxxxxxxx>, 1996, 1998, 2001, 2002, 2003, 2006, 2007, 2008, 2009
-# Revision: 1.60
+# Revision: 1.61
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libc 2.9.90\n"
 "POT-Creation-Date: 2009-02-06 12:40-0800\n"
-"PO-Revision-Date: 2009-02-28 17:57+0100\n"
+"PO-Revision-Date: 2009-06-14 20:41+0200\n"
 "Last-Translator: Jan DjÃ¤rv <jan.h.d@xxxxxxxxxx>\n"
 "Language-Team: Swedish <tp-sv@xxxxxxxxxxxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -295,11 +295,11 @@
 
 #: debug/xtrace.sh:33
 msgid "Try \\`xtrace --help' for more information.\\n"
-msgstr "FÃ¶rsÃ¶k med \\\"xtrace --help\\\" fÃ¶r mer information\\n"
+msgstr "FÃ¶rsÃ¶k med \"xtrace --help\" fÃ¶r mer information\\n"
 
 #: debug/xtrace.sh:39
 msgid "xtrace: option \\`$1' requires an argument.\\n"
-msgstr "xtrace: flaggan \\\"$1\\\" behÃ¶ver ett argument\\n"
+msgstr "xtrace: flaggan \"$1\" behÃ¶ver ett argument\\n"
 
 #: debug/xtrace.sh:46
 msgid ""
@@ -328,7 +328,7 @@
 
 #: debug/xtrace.sh:127
 msgid "xtrace: unrecognized option \\`$1'\\n"
-msgstr "xtrace: okÃ¤nd flagga \\\"$1\\\"\\n"
+msgstr "xtrace: okÃ¤nd flagga \"$1\"\\n"
 
 #: debug/xtrace.sh:140
 msgid "No program name given\\n"
@@ -337,12 +337,12 @@
 #: debug/xtrace.sh:148
 #, sh-format
 msgid "executable \\`$program' not found\\n"
-msgstr "program \\\"$program\\\" hittades inte\\n"
+msgstr "program \"$program\" hittades inte\\n"
 
 #: debug/xtrace.sh:152
 #, sh-format
 msgid "\\`$program' is no executable\\n"
-msgstr "\\\"$program\\\" Ã¤r inte en kÃ¶rbar binÃ¤r\\n"
+msgstr "\"$program\" Ã¤r inte en kÃ¶rbar binÃ¤r\\n"
 
 #: dlfcn/dlinfo.c:64
 msgid "RTLD_SELF used in code not dynamically loaded"
@@ -932,7 +932,7 @@
 
 #: elf/ldd.bash.in:82
 msgid "ldd: option \\`$1' is ambiguous"
-msgstr "ldd: flaggan \\\"$1\\\" Ã¤r tvetydig"
+msgstr "ldd: flaggan \"$1\" Ã¤r tvetydig"
 
 #: elf/ldd.bash.in:89
 msgid "unrecognized option"
@@ -940,7 +940,7 @@
 
 #: elf/ldd.bash.in:90 elf/ldd.bash.in:128
 msgid "Try \\`ldd --help' for more information."
-msgstr "FÃ¶rsÃ¶k med \\\"ldd --help\\\" fÃ¶r mer information"
+msgstr "FÃ¶rsÃ¶k med \"ldd --help\" fÃ¶r mer information"
 
 #: elf/ldd.bash.in:127
 msgid "missing file arguments"
@@ -1051,7 +1051,7 @@
 #: elf/sln.c:179
 #, c-format
 msgid "%s: destination must not be a directory\n"
-msgstr "%s: mÃ¥let mÃ¥ste vara en katalog\n"
+msgstr "%s: mÃ¥let mÃ¥ste inte vara en katalog\n"
 
 #: elf/sln.c:185
 #, c-format
@@ -2824,11 +2824,11 @@
 
 #: malloc/memusage.sh:27
 msgid "Try \\`memusage --help' for more information."
-msgstr "FÃ¶rsÃ¶k med \\\"memusage --help\\\" fÃ¶r mer information"
+msgstr "FÃ¶rsÃ¶k med \"memusage --help\" fÃ¶r mer information"
 
 #: malloc/memusage.sh:33
 msgid "memusage: option \\`$1' requires an argument"
-msgstr "memusage: flaggan \\\"$1\\\" behÃ¶ver ett argument"
+msgstr "memusage: flaggan \"$1\" behÃ¶ver ett argument"
 
 #: malloc/memusage.sh:39
 msgid ""
@@ -2897,11 +2897,11 @@
 
 #: malloc/memusage.sh:193
 msgid "memusage: option \\`${1##*=}' is ambiguous"
-msgstr "memusage: flaggan \\\"${1##*=}\\\" Ã¤r tvetydig"
+msgstr "memusage: flaggan \"${1##*=}\" Ã¤r tvetydig"
 
 #: malloc/memusage.sh:202
 msgid "memusage: unrecognized option \\`$1'"
-msgstr "memusage: okÃ¤nd flagga \\\"$1\\\""
+msgstr "memusage: okÃ¤nd flagga \"$1\""
 
 #: malloc/memusage.sh:215
 msgid "No program name given"
@@ -3463,7 +3463,7 @@
 #: nis/nss_nisplus/nisplus-publickey.c:220
 #, c-format
 msgid "netname2user: missing group id list in `%s'"
-msgstr "netname2user: gruppid-lista saknas i \"%s\"."
+msgstr "netname2user: gruppid-lista saknas i \"%s\""
 
 #: nis/nss_nisplus/nisplus-publickey.c:302
 #: nis/nss_nisplus/nisplus-publickey.c:308
@@ -4371,10 +4371,10 @@
 "\n"
 msgstr ""
 "AnvÃ¤ndning: getconf [-v SPEC] VAR\n"
-"  eller:    getconf [-v SPEC] PATH_VAR PATH\n"
+"  eller:    getconf [-v SPEC] VÃ„G_VAR VÃ„G\n"
 "\n"
-"HÃ¤mta konfigureringsvÃ¤rdet fÃ¶r variabeln VAR, eller fÃ¶r variabeln PATH_VAR\n"
-"fÃ¶r sÃ¶kvÃ¤g PATH.  Om SPEC Ã¤r given hÃ¤mta vÃ¤rden fÃ¶r kompileringsspecifikationen\n"
+"HÃ¤mta konfigureringsvÃ¤rdet fÃ¶r variabeln VAR, eller fÃ¶r variabeln VÃ„G_VAR\n"
+"fÃ¶r sÃ¶kvÃ¤g VÃ„G.  Om SPEC Ã¤r given hÃ¤mta vÃ¤rden fÃ¶r kompileringsspecifikationen\n"
 "SPEC.\n"
 "\n"
 
@@ -4431,13 +4431,13 @@
 #: posix/getopt.c:800 posix/getopt.c:803
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ogiltig flagga -- %c\n"
+msgstr "%s: ogiltig flagga -- \"%c\"\n"
 
 #: posix/getopt.c:853 posix/getopt.c:870 posix/getopt.c:1073
 #: posix/getopt.c:1091
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: flaggan behÃ¶ver ett argument -- %c\n"
+msgstr "%s: flaggan behÃ¶ver ett argument -- \"%c\"\n"
 
 #: posix/getopt.c:923 posix/getopt.c:939
 #, c-format
@@ -4611,7 +4611,7 @@
 
 #: sunrpc/auth_unix.c:350
 msgid "auth_unix.c: Fatal marshalling problem"
-msgstr "auth_unix.c - Fatalt kodningsproblem"
+msgstr "auth_unix.c: Fatalt kodningsproblem"
 
 #: sunrpc/clnt_perr.c:105 sunrpc/clnt_perr.c:121
 #, c-format
@@ -4907,7 +4907,7 @@
 #: sunrpc/rpc_main.c:1473
 #, c-format
 msgid "-C\t\tANSI C mode\n"
-msgstr "-C\t\tANSI-lÃ¤ge\n"
+msgstr "-C\t\tANSI C-lÃ¤ge\n"
 
 #: sunrpc/rpc_main.c:1474
 #, c-format
@@ -4917,7 +4917,7 @@
 #: sunrpc/rpc_main.c:1475
 #, c-format
 msgid "-h\t\tgenerate header file\n"
-msgstr "-h\t\tgenerera huvudfiler\n"
+msgstr "-h\t\tgenerera huvudfil\n"
 
 #: sunrpc/rpc_main.c:1476
 #, c-format

Modified: fsf/trunk/libc/sysdeps/x86_64/bits/select.h
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/bits/select.h (original)
+++ fsf/trunk/libc/sysdeps/x86_64/bits/select.h Mon Jun 15 00:07:04 2009
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2001, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2001,2008,2009 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
@@ -27,14 +27,8 @@
 
 # if __WORDSIZE == 64
 #  define __FD_ZERO_STOS "stosq"
-#  define __FD_SET_BTS "btsq"
-#  define __FD_CLR_BTR "btrq"
-#  define __FD_ISSET_BT "btq"
 # else
 #  define __FD_ZERO_STOS "stosl"
-#  define __FD_SET_BTS "btsl"
-#  define __FD_CLR_BTR "btrl"
-#  define __FD_ISSET_BT "btl"
 # endif
 
 # define __FD_ZERO(fdsp) \
@@ -48,26 +42,6 @@
 			  : "memory");					      \
   } while (0)
 
-# define __FD_SET(fd, fdsp) \
-  __asm__ __volatile__ (__FD_SET_BTS " %1,%0"				      \
-			: "=m" (__FDS_BITS (fdsp)[__FDELT (fd)])	      \
-			: "r" (((int) (fd)) % __NFDBITS)		      \
-			: "cc","memory")
-# define __FD_CLR(fd, fdsp) \
-  __asm__ __volatile__ (__FD_CLR_BTR " %1,%0"				      \
-			: "=m" (__FDS_BITS (fdsp)[__FDELT (fd)])	      \
-			: "r" (((int) (fd)) % __NFDBITS)		      \
-			: "cc","memory")
-# define __FD_ISSET(fd, fdsp) \
-  (__extension__							      \
-   ({register char __result;						      \
-     __asm__ __volatile__ (__FD_ISSET_BT " %1,%2 ; setcb %b0"		      \
-			   : "=q" (__result)				      \
-			   : "r" (((int) (fd)) % __NFDBITS),		      \
-			     "m" (__FDS_BITS (fdsp)[__FDELT (fd)])	      \
-			   : "cc");					      \
-     __result; }))
-
 #else	/* ! GNU CC */
 
 /* We don't use `memset' because this would require a prototype and
@@ -79,8 +53,10 @@
     for (__i = 0; __i < sizeof (fd_set) / sizeof (__fd_mask); ++__i)	      \
       __FDS_BITS (__arr)[__i] = 0;					      \
   } while (0)
-# define __FD_SET(d, set)    (__FDS_BITS (set)[__FDELT (d)] |= __FDMASK (d))
-# define __FD_CLR(d, set)    (__FDS_BITS (set)[__FDELT (d)] &= ~__FDMASK (d))
-# define __FD_ISSET(d, set)  (__FDS_BITS (set)[__FDELT (d)] & __FDMASK (d))
 
 #endif	/* GNU CC */
+
+#define __FD_SET(d, set)    (__FDS_BITS (set)[__FDELT (d)] |= __FDMASK (d))
+#define __FD_CLR(d, set)    (__FDS_BITS (set)[__FDELT (d)] &= ~__FDMASK (d))
+#define __FD_ISSET(d, set) \
+  ((__FDS_BITS (set)[__FDELT (d)] & __FDMASK (d)) != 0)
Prev by Date: [commits] r8553 - in /fsf/trunk/libc: ./ nptl/ nptl/sysdeps/pthread/bits/ nptl/sysdeps/unix/sysv/linux/
Next by Date: [commits] r8562 - in /fsf/trunk/libc: ./ assert/ elf/ include/ inet/netinet/ libio/ localedata/ localedata/locales/ login/programs/ ni...
Previous by thread: [commits] r8553 - in /fsf/trunk/libc: ./ nptl/ nptl/sysdeps/pthread/bits/ nptl/sysdeps/unix/sysv/linux/
Next by thread: [commits] r8562 - in /fsf/trunk/libc: ./ assert/ elf/ include/ inet/netinet/ libio/ localedata/ localedata/locales/ login/programs/ ni...
Index(es):
- Date
- Thread