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

[Commits] r22668 - in /fsf/trunk/libc: ./ argp/ iconv/ malloc/ nss/ ports/ ports/sysdeps/arm/



Author: eglibc
Date: Tue Mar 19 00:01:44 2013
New Revision: 22668

Log:
Import glibc-mainline for 2013-03-19

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/argp/argp-parse.c
    fsf/trunk/libc/iconv/iconv_prog.c
    fsf/trunk/libc/iconv/iconvconfig.c
    fsf/trunk/libc/malloc/memusagestat.c
    fsf/trunk/libc/nss/getent.c
    fsf/trunk/libc/ports/ChangeLog.arm
    fsf/trunk/libc/ports/sysdeps/arm/arm-features.h
    fsf/trunk/libc/ports/sysdeps/arm/dl-tlsdesc.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Mar 19 00:01:44 2013
@@ -1,3 +1,14 @@
+2013-03-18  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	[BZ #14812]
+	* argp/argp-parse.c (argp_default_options): Put N_ translation marker
+	on argument names, not just descriptions.
+	* iconv/iconv_prog.c (options): Likewise.
+	* iconv/iconvconfig.c (options): Likewise.
+	* malloc/memusagestat.c (options): Likewise.
+	* nss/getent.c (options): Likewise.
+	Reported by Benno Schulenberg <bensberg@xxxxxxxxxxxxx>.
+
 2013-03-18  Ondrej Bilka  <neleai@xxxxxxxxx>
 
 	* sysdeps/x86_64/strlen.S: Replace with new SSE2 based

Modified: fsf/trunk/libc/argp/argp-parse.c
==============================================================================
--- fsf/trunk/libc/argp/argp-parse.c (original)
+++ fsf/trunk/libc/argp/argp-parse.c Tue Mar 19 00:01:44 2013
@@ -100,9 +100,10 @@
 {
   {"help",	  '?',	  	0, 0,  N_("Give this help list"), -1},
   {"usage",	  OPT_USAGE,	0, 0,  N_("Give a short usage message")},
-  {"program-name",OPT_PROGNAME,"NAME", OPTION_HIDDEN, N_("Set the program name")},
-  {"HANG",	  OPT_HANG,    "SECS", OPTION_ARG_OPTIONAL | OPTION_HIDDEN,
-     N_("Hang for SECS seconds (default 3600)")},
+  {"program-name",OPT_PROGNAME, N_("NAME"), OPTION_HIDDEN,
+   N_("Set the program name")},
+  {"HANG",	  OPT_HANG,    N_("SECS"), OPTION_ARG_OPTIONAL | OPTION_HIDDEN,
+   N_("Hang for SECS seconds (default 3600)")},
   {0, 0}
 };
 

Modified: fsf/trunk/libc/iconv/iconv_prog.c
==============================================================================
--- fsf/trunk/libc/iconv/iconv_prog.c (original)
+++ fsf/trunk/libc/iconv/iconv_prog.c Tue Mar 19 00:01:44 2013
@@ -57,13 +57,13 @@
 static const struct argp_option options[] =
 {
   { NULL, 0, NULL, 0, N_("Input/Output format specification:") },
-  { "from-code", 'f', "NAME", 0, N_("encoding of original text") },
-  { "to-code", 't', "NAME", 0, N_("encoding for output") },
+  { "from-code", 'f', N_("NAME"), 0, N_("encoding of original text") },
+  { "to-code", 't', N_("NAME"), 0, N_("encoding for output") },
   { NULL, 0, NULL, 0, N_("Information:") },
   { "list", 'l', NULL, 0, N_("list all known coded character sets") },
   { NULL, 0, NULL, 0, N_("Output control:") },
   { NULL, 'c', NULL, 0, N_("omit invalid characters from output") },
-  { "output", 'o', "FILE", 0, N_("output file") },
+  { "output", 'o', N_("FILE"), 0, N_("output file") },
   { "silent", 's', NULL, 0, N_("suppress warnings") },
   { "verbose", OPT_VERBOSE, NULL, 0, N_("print progress information") },
   { NULL, 0, NULL, 0, NULL }

Modified: fsf/trunk/libc/iconv/iconvconfig.c
==============================================================================
--- fsf/trunk/libc/iconv/iconvconfig.c (original)
+++ fsf/trunk/libc/iconv/iconvconfig.c Tue Mar 19 00:01:44 2013
@@ -123,8 +123,9 @@
 #define OPT_NOSTDLIB 301
 static const struct argp_option options[] =
 {
-  { "prefix", OPT_PREFIX, "PATH", 0, N_("Prefix used for all file accesses") },
-  { "output", 'o', "FILE", 0, N_("\
+  { "prefix", OPT_PREFIX, N_("PATH"), 0,
+    N_("Prefix used for all file accesses") },
+  { "output", 'o', N_("FILE"), 0, N_("\
 Put output in FILE instead of installed location\
  (--prefix does not apply to FILE)") },
   { "nostdlib", OPT_NOSTDLIB, NULL, 0,

Modified: fsf/trunk/libc/malloc/memusagestat.c
==============================================================================
--- fsf/trunk/libc/malloc/memusagestat.c (original)
+++ fsf/trunk/libc/malloc/memusagestat.c Tue Mar 19 00:01:44 2013
@@ -52,12 +52,15 @@
 /* Definitions of arguments for argp functions.  */
 static const struct argp_option options[] =
 {
-  { "output", 'o', "FILE", 0, N_("Name output file") },
-  { "string", 's', "STRING", 0, N_("Title string used in output graphic") },
-  { "time", 't', NULL, 0, N_("Generate output linear to time (default is linear to number of function calls)") },
+  { "output", 'o', N_("FILE"), 0, N_("Name output file") },
+  { "string", 's', N_("STRING"), 0, N_("Title string used in output graphic") },
+  { "time", 't', NULL, 0, N_("\
+Generate output linear to time (default is linear to number of function calls)\
+") },
   { "total", 'T', NULL, 0,
     N_("Also draw graph for total memory consumption") },
-  { "x-size", 'x', "VALUE", 0, N_("Make output graphic VALUE pixels wide") },
+  { "x-size", 'x', N_("VALUE"), 0,
+    N_("Make output graphic VALUE pixels wide") },
   { "y-size", 'y', "VALUE", 0, N_("Make output graphic VALUE pixels high") },
   { NULL, 0, NULL, 0, NULL }
 };

Modified: fsf/trunk/libc/nss/getent.c
==============================================================================
--- fsf/trunk/libc/nss/getent.c (original)
+++ fsf/trunk/libc/nss/getent.c Tue Mar 19 00:01:44 2013
@@ -55,7 +55,7 @@
 /* Supported options. */
 static const struct argp_option args_options[] =
   {
-    { "service", 's', "CONFIG", 0, N_("Service configuration to be used") },
+    { "service", 's', N_("CONFIG"), 0, N_("Service configuration to be used") },
     { "no-idn", 'i', NULL, 0, N_("disable IDN encoding") },
     { NULL, 0, NULL, 0, NULL },
   };

Modified: fsf/trunk/libc/ports/ChangeLog.arm
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.arm (original)
+++ fsf/trunk/libc/ports/ChangeLog.arm Tue Mar 19 00:01:44 2013
@@ -1,3 +1,13 @@
+2013-03-18  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* sysdeps/arm/dl-tlsdesc.S: Include <arm-features.h>.
+	Use sfi_breg macro throughout.
+	(_dl_tlsdesc_dynamic) [!ARM_NO_INDEX_REGISTER]: Avoid two-register
+	addressing mode.
+	(_dl_tlsdesc_dynamic) [ARM_ALWAYS_BX]: Don't pop into pc.
+
+	* sysdeps/arm/arm-features.h: Add comment for ARM_NO_INDEX_REGISTER.
+
 2013-03-15  Roland McGrath  <roland@xxxxxxxxxxxxx>
 
 	* sysdeps/arm/sysdep.h [!ARM_SFI_MACROS] (sfi_sp): New macro.

Modified: fsf/trunk/libc/ports/sysdeps/arm/arm-features.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/arm/arm-features.h (original)
+++ fsf/trunk/libc/ports/sysdeps/arm/arm-features.h Tue Mar 19 00:01:44 2013
@@ -53,4 +53,7 @@
 # define ARM_BX_ALIGN_LOG2	2
 #endif
 
+/* An OS-specific arm-features.h file may define ARM_NO_INDEX_REGISTER to
+   indicate that the two-register addressing modes must never be used.  */
+
 #endif  /* arm-features.h */

Modified: fsf/trunk/libc/ports/sysdeps/arm/dl-tlsdesc.S
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/arm/dl-tlsdesc.S (original)
+++ fsf/trunk/libc/ports/sysdeps/arm/dl-tlsdesc.S Tue Mar 19 00:01:44 2013
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
+#include <arm-features.h>
 #include <tls.h>
 #include "tlsdesc.h"
 
@@ -31,7 +32,8 @@
 	.fnstart
 	.align 2
 _dl_tlsdesc_return:
-	ldr	r0, [r0]
+	sfi_breg r0, \
+	ldr	r0, [\B]
 	BX	(lr)
 	.fnend
 	cfi_endproc
@@ -90,16 +92,27 @@
 	cfi_rel_offset (r3,4)
 	cfi_rel_offset (r4,8)
 	cfi_rel_offset (lr,12)
-	ldr	r1, [r0] /* td */
+	sfi_breg r0, \
+	ldr	r1, [\B] /* td */
 	GET_TLS (lr)
 	mov	r4, r0 /* r4 = tp */
-	ldr	r0, [r0]
-	ldr	r2, [r1, #8] /* gen_count */
-	ldr	r3, [r0]
+	sfi_breg r0, \
+	ldr	r0, [\B]
+	sfi_breg r1, \
+	ldr	r2, [\B, #8] /* gen_count */
+	sfi_breg r0, \
+	ldr	r3, [\B]
 	cmp	r2, r3
 	bhi	1f
-	ldr	r3, [r1]
+	sfi_breg r1, \
+	ldr	r3, [\B]
+#ifndef ARM_NO_INDEX_REGISTER
 	ldr	r2, [r0, r3, lsl #3]
+#else
+	add	lr, r0, r3, lsl #3
+	sfi_breg lr, \
+	ldr	r2, [\B]
+#endif
 	cmn	r2, #1
 	ittt	ne
 	ldrne	r3, [r1, #4]
@@ -110,7 +123,8 @@
 	bl	__tls_get_addr
 	rsb	r0, r4, r0
 2:
-#if defined (__ARM_ARCH_4T__) && defined (__THUMB_INTERWORK__)
+#if ((defined (__ARM_ARCH_4T__) && defined (__THUMB_INTERWORK__)) \
+     || defined (ARM_ALWAYS_BX))
 	pop	{r2,r3,r4, lr}
 	cfi_adjust_cfa_offset (-16)
 	cfi_restore (lr)
@@ -163,7 +177,8 @@
 	pop	{r2}
 	cfi_adjust_cfa_offset (-4)
 	cfi_restore (r2)
-	ldr	r1, [r0, #4]
+	sfi_breg r0, \
+	ldr	r1, [\B, #4]
 	BX	(r1)
 	.fnend
 	cfi_endproc
@@ -202,7 +217,8 @@
 	pop	{r2}
 	cfi_adjust_cfa_offset (-4)
 	cfi_restore (r2)
-	ldr     r1, [r0, #4]
+	sfi_breg r0, \
+	ldr     r1, [\B, #4]
 	BX      (r1)
 	.fnend
 	cfi_endproc

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