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

[Commits] r21951 - in /fsf/trunk/libc: ./ manual/ nptl/ nptl/sysdeps/unix/sysv/linux/s390/ sysdeps/s390/ sysdeps/s390/s390-64/

To: commits@xxxxxxxxxx
Subject: [Commits] r21951 - in /fsf/trunk/libc: ./ manual/ nptl/ nptl/sysdeps/unix/sysv/linux/s390/ sysdeps/s390/ sysdeps/s390/s390-64/
From: eglibc@xxxxxxxxxx
Date: Sun, 09 Dec 2012 00:02:01 -0000

Author: eglibc
Date: Sun Dec  9 00:01:59 2012
New Revision: 21951

Log:
Import glibc-mainline for 2012-12-09

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/manual/message.texi
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
    fsf/trunk/libc/sysdeps/s390/jmpbuf-unwind.h
    fsf/trunk/libc/sysdeps/s390/s390-64/memcmp.S
    fsf/trunk/libc/sysdeps/s390/s390-64/memcpy.S
    fsf/trunk/libc/sysdeps/s390/s390-64/memset.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sun Dec  9 00:01:59 2012
@@ -1,3 +1,18 @@
+2012-12-08  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
+
+	* sysdeps/s390/jmpbuf-unwind.h (_jmpbuf_sp): Declare SP as
+	void pointer and cast to uintptr_t.
+	* sysdeps/s390/s390-64/memcmp.S: Pick sysdep.h from include
+	path.
+	* sysdeps/s390/s390-64/memcpy.S: Likewise.
+	* sysdeps/s390/s390-64/memset.S: Likewise.
+
+2012-12-08  Benno Schulenberg  <bensberg@xxxxxxxxxxxxx>
+
+	[BZ #14833]
+	* menual/message.texi (Message Translation): Fix typos.
+	(Helper programs for gettext): Likewise.
+
 2012-12-07  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
 
 	[BZ #14898]

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Sun Dec  9 00:01:59 2012
@@ -21,8 +21,9 @@
   14587, 14595, 14602, 14610, 14621, 14638, 14645, 14648, 14652, 14660,
   14661, 14669, 14672, 14683, 14694, 14716, 14719, 14743, 14767, 14783,
   14784, 14785, 14793, 14796, 14797, 14801, 14803, 14805, 14807, 14811,
-  14815, 14821, 14822, 14824, 14828, 14831, 14835, 14838, 14856, 14863,
-  14865, 14866, 14868, 14869, 14871, 14879, 14889, 14893, 14898, 14914.
+  14815, 14821, 14822, 14824, 14828, 14831, 14833, 14835, 14838, 14856,
+  14863, 14865, 14866, 14868, 14869, 14871, 14879, 14889, 14893, 14898,
+  14914.
 
 * CVE-2011-4609 svc_run() produces high cpu usage when accept fails with
   EMFILE has been fixed (Bugzilla #14889).

Modified: fsf/trunk/libc/manual/message.texi
==============================================================================
--- fsf/trunk/libc/manual/message.texi (original)
+++ fsf/trunk/libc/manual/message.texi Sun Dec  9 00:01:59 2012
@@ -8,12 +8,12 @@
 
 Printing messages in different languages can be implemented in different
 ways.  One could add all the different languages in the source code and
-add among the variants every time a message has to be printed.  This is
-certainly no good solution since extending the set of languages is
-difficult (the code must be changed) and the code itself can become
+choose among the variants every time a message has to be printed.  This is
+certainly not a good solution since extending the set of languages is
+cumbersome (the code must be changed) and the code itself can become
 really big with dozens of message sets.
 
-A better solution is to keep the message sets for each language are kept
+A better solution is to keep the message sets for each language
 in separate files which are loaded at runtime depending on the language
 selection of the user.
 
@@ -32,7 +32,7 @@
 
 @itemize @bullet
 @item
-locate the external data file with the appropriate translations.
+locate the external data file with the appropriate translations
 @item
 load the data and make it possible to address the messages
 @item
@@ -1799,16 +1799,16 @@
 
 The @code{xgettext} program can be used to automatically extract the
 translatable messages from a source file.  I.e., the programmer need not
-take care for the translations and the list of messages which have to be
+take care of the translations and the list of messages which have to be
 translated.  S/He will simply wrap the translatable string in calls to
 @code{gettext} et.al and the rest will be done by @code{xgettext}.  This
-program has a lot of option which help to customize the output or do
+program has a lot of options which help to customize the output or
 help to understand the input better.
 
-Other programs help to manage development cycle when new messages appear
-in the source files or when a new translation of the messages appear.
+Other programs help to manage the development cycle when new messages appear
+in the source files or when a new translation of the messages appears.
 Here it should only be noted that using all the tools in GNU gettext it
 is possible to @emph{completely} automate the handling of message
-catalog.  Beside marking the translatable string in the source code and
+catalogs.  Beside marking the translatable strings in the source code and
 generating the translations the developers do not have anything to do
 themselves.

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Sun Dec  9 00:01:59 2012
@@ -1,3 +1,8 @@
+2012-12-08  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/s390/jmp-unwind.c (_longjmp_unwind):
+	Declare LOCAL_VAR as char.
+
 2012-12-04  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/powerpc/sem_post.c (__old_sem_post):

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c Sun Dec  9 00:01:59 2012
@@ -1,5 +1,5 @@
 /* Clean up stack frames unwound by longjmp.  Linux/s390 version.
-   Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003-2012 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,7 +27,7 @@
 void
 _longjmp_unwind (jmp_buf env, int val)
 {
-  unsigned char local_var;
+  char local_var;
 
 #ifdef SHARED
   if (__libc_pthread_functions_init)

Modified: fsf/trunk/libc/sysdeps/s390/jmpbuf-unwind.h
==============================================================================
--- fsf/trunk/libc/sysdeps/s390/jmpbuf-unwind.h (original)
+++ fsf/trunk/libc/sysdeps/s390/jmpbuf-unwind.h Sun Dec  9 00:01:59 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@xxxxxxxxxx>, 2003.
 
@@ -40,11 +40,11 @@
 static inline uintptr_t __attribute__ ((unused))
 _jmpbuf_sp (__jmp_buf regs)
 {
-  uintptr_t sp = regs[0].__gregs[__JB_GPR15];
+  void *sp = (void *) (uintptr_t) regs[0].__gregs[__JB_GPR15];
 #ifdef PTR_DEMANGLE
   PTR_DEMANGLE (sp);
 #endif
-  return sp;
+  return (uintptr_t) sp;
 }
 
 #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \

Modified: fsf/trunk/libc/sysdeps/s390/s390-64/memcmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/s390/s390-64/memcmp.S (original)
+++ fsf/trunk/libc/sysdeps/s390/s390-64/memcmp.S Sun Dec  9 00:01:59 2012
@@ -17,7 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 
-#include "sysdep.h"
+#include <sysdep.h>
 #include "asm-syntax.h"
 
 /* INPUT PARAMETERS

Modified: fsf/trunk/libc/sysdeps/s390/s390-64/memcpy.S
==============================================================================
--- fsf/trunk/libc/sysdeps/s390/s390-64/memcpy.S (original)
+++ fsf/trunk/libc/sysdeps/s390/s390-64/memcpy.S Sun Dec  9 00:01:59 2012
@@ -17,7 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 
-#include "sysdep.h"
+#include <sysdep.h>
 #include "asm-syntax.h"
 
 /* INPUT PARAMETERS

Modified: fsf/trunk/libc/sysdeps/s390/s390-64/memset.S
==============================================================================
--- fsf/trunk/libc/sysdeps/s390/s390-64/memset.S (original)
+++ fsf/trunk/libc/sysdeps/s390/s390-64/memset.S Sun Dec  9 00:01:59 2012
@@ -1,5 +1,5 @@
 /* Set a block of memory to some byte value.  64 bit S/390 version.
-   Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2012 Free Software Foundation, Inc.
    Contributed by Martin Schwidefsky (schwidefsky@xxxxxxxxxx).
    This file is part of the GNU C Library.
 
@@ -18,7 +18,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 
-#include "sysdep.h"
+#include <sysdep.h>
 #include "asm-syntax.h"
 
 /* INPUT PARAMETERS

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

Prev by Date: [Commits] r21945 - in /fsf/trunk/libc: ./ include/ po/ ports/ ports/sysdeps/aarch64/ ports/sysdeps/alpha/ ports/sysdeps/alpha/fpu/ por...
Next by Date: [Commits] r21963 - in /fsf/trunk/libc: ChangeLog NEWS po/cs.po ports/ChangeLog.aarch64 ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h
Previous by thread: [Commits] r21945 - in /fsf/trunk/libc: ./ include/ po/ ports/ ports/sysdeps/aarch64/ ports/sysdeps/alpha/ ports/sysdeps/alpha/fpu/ por...
Next by thread: [Commits] r21963 - in /fsf/trunk/libc: ChangeLog NEWS po/cs.po ports/ChangeLog.aarch64 ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h
Index(es):
- Date
- Thread