[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r9912 - in /fsf/trunk/libc: ./ manual/ sysdeps/sparc/sparc32/ sysdeps/sparc/sparc64/ sysdeps/unix/sysv/linux/sparc/sparc32/
- To: commits@xxxxxxxxxx
- Subject: [commits] r9912 - in /fsf/trunk/libc: ./ manual/ sysdeps/sparc/sparc32/ sysdeps/sparc/sparc64/ sysdeps/unix/sysv/linux/sparc/sparc32/
- From: eglibc@xxxxxxxxxx
- Date: Tue, 23 Feb 2010 08:03:09 -0000
Author: eglibc
Date: Tue Feb 23 00:03:07 2010
New Revision: 9912
Log:
Import glibc-mainline for 2010-02-23
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/manual/charset.texi
fsf/trunk/libc/manual/errno.texi
fsf/trunk/libc/manual/getopt.texi
fsf/trunk/libc/manual/math.texi
fsf/trunk/libc/manual/memory.texi
fsf/trunk/libc/manual/message.texi
fsf/trunk/libc/manual/resource.texi
fsf/trunk/libc/manual/stdio.texi
fsf/trunk/libc/manual/time.texi
fsf/trunk/libc/sysdeps/sparc/sparc32/dl-machine.h
fsf/trunk/libc/sysdeps/sparc/sparc64/dl-machine.h
fsf/trunk/libc/sysdeps/sparc/sparc64/memchr.S
fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc32/makecontext.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Feb 23 00:03:07 2010
@@ -1,3 +1,35 @@
+2010-02-22 Jim Meyering <meyering@xxxxxxxxxx>
+
+ * manual/math.texi (BSD Random): Fix a typo: s/are/is/
+
+ * manual/charset.texi: Adjust grammar.
+
+ * manual/errno.texi (Error Messages): Fix doubled-words and typos.
+ * manual/charset.texi (Selecting the Conversion): Likewise.
+ * manual/getopt.texi (Getopt Long Options): Likewise.
+ * manual/memory.texi (Resizing the Data Segment): Likewise.
+ * manual/message.texi (GUI program problems): Likewise.
+ * manual/resource.texi (CPU Affinity): Likewise.
+ * manual/stdio.texi (Streams and Threads): Likewise.
+ * manual/time.texi (High Accuracy Clock): Likewise.
+
+2009-02-20 David S. Miller <davem@xxxxxxxxxxxxx>
+
+ * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_runtime_setup):
+ Adjust rela->r_offset by l->l_addr when rewriting PLT.
+
+ * sysdeps/sparc/sparc64/memchr.S: Use unsigned branch on greater to
+ test end of buffer.
+
+ * sysdeps/unix/sysv/linux/sparc/sparc32/makecontext.c
+ (__makecontext): Adjust arg counter properly when copying arg
+ stack slots.
+
+2009-02-20 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_runtime_setup):
+ Adjust rela->r_offset by l->l_addr when rewriting PLT.
+
2010-02-19 Carl Fredrik Hammar <hammy.lite@xxxxxxxxx>
* hurd/hurdioctl.c (tiocsctty): Call `do_tiocsctty' instead of
Modified: fsf/trunk/libc/manual/charset.texi
==============================================================================
--- fsf/trunk/libc/manual/charset.texi (original)
+++ fsf/trunk/libc/manual/charset.texi Tue Feb 23 00:03:07 2010
@@ -393,7 +393,7 @@
by the functions we are about to describe. Each locale uses its own
character set (given as an argument to @code{localedef}) and this is the
one assumed as the external multibyte encoding. The wide character
-character set always is UCS-4, at least on GNU systems.
+set is always UCS-4, at least on GNU systems.
A characteristic of each multibyte character set is the maximum number
of bytes that can be necessary to represent one character. This
@@ -577,8 +577,8 @@
and is declared in @file{wchar.h}.
@end deftypefun
-Despite the limitation that the single byte value always is interpreted
-in the initial state this function is actually useful most of the time.
+Despite the limitation that the single byte value is always interpreted
+in the initial state, this function is actually useful most of the time.
Most characters are either entirely single-byte character sets or they
are extension to ASCII. But then it is possible to write code like this
(not that this specific example is very useful):
@@ -607,10 +607,10 @@
on the character of the character set used for @code{wchar_t}
representation. In other situations the bytes are not constant at
compile time and so the compiler cannot do the work. In situations like
-this it is necessary @code{btowc}.
+this, using @code{btowc} is required.
@noindent
-There also is a function for the conversion in the other direction.
+There is also a function for the conversion in the other direction.
@comment wchar.h
@comment ISO
Modified: fsf/trunk/libc/manual/errno.texi
==============================================================================
--- fsf/trunk/libc/manual/errno.texi (original)
+++ fsf/trunk/libc/manual/errno.texi Tue Feb 23 00:03:07 2010
@@ -1425,7 +1425,7 @@
@code{perror} generates is not what is wanted and there is no way to
extend or change what @code{perror} does. The GNU coding standard, for
instance, requires error messages to be preceded by the program name and
-programs which read some input files should should provide information
+programs which read some input files should provide information
about the input file name and the line number in case an error is
encountered while reading the file. For these occasions there are two
functions available which are widely used throughout the GNU project.
Modified: fsf/trunk/libc/manual/getopt.texi
==============================================================================
--- fsf/trunk/libc/manual/getopt.texi (original)
+++ fsf/trunk/libc/manual/getopt.texi Tue Feb 23 00:03:07 2010
@@ -269,7 +269,7 @@
@var{argv} of the next remaining argument.
@end deftypefun
-Since long option names were used before before the @code{getopt_long}
+Since long option names were used before the @code{getopt_long}
options was invented there are program interfaces which require programs
to recognize options like @w{@samp{-option value}} instead of
@w{@samp{--option value}}. To enable these programs to use the GNU
Modified: fsf/trunk/libc/manual/math.texi
==============================================================================
--- fsf/trunk/libc/manual/math.texi (original)
+++ fsf/trunk/libc/manual/math.texi Tue Feb 23 00:03:07 2010
@@ -1421,7 +1421,7 @@
The GNU C library contains four additional functions which contain the
state as an explicit parameter and therefore make it possible to handle
-thread-local PRNGs. Beside this there are no difference. In fact, the
+thread-local PRNGs. Beside this there is no difference. In fact, the
four functions already discussed are implemented internally using the
following interfaces.
Modified: fsf/trunk/libc/manual/memory.texi
==============================================================================
--- fsf/trunk/libc/manual/memory.texi (original)
+++ fsf/trunk/libc/manual/memory.texi Tue Feb 23 00:03:07 2010
@@ -2379,7 +2379,7 @@
@c The Brk system call in Linux (as opposed to the GNU C Library function)
@c is considerably different. It always returns the new end of the data
@c segment, whether it succeeds or fails. The GNU C library Brk determines
-@c it's a failure if and only if if the system call returns an address less
+@c it's a failure if and only if the system call returns an address less
@c than the address requested.
@end deftypefun
Modified: fsf/trunk/libc/manual/message.texi
==============================================================================
--- fsf/trunk/libc/manual/message.texi (original)
+++ fsf/trunk/libc/manual/message.texi Tue Feb 23 00:03:07 2010
@@ -1466,7 +1466,7 @@
handle these kind of problems with the @code{gettext} functions.
@noindent
-As as example consider the following fictional situation. A GUI program
+As an example consider the following fictional situation. A GUI program
has a menu bar with the following entries:
@smallexample
Modified: fsf/trunk/libc/manual/resource.texi
==============================================================================
--- fsf/trunk/libc/manual/resource.texi (original)
+++ fsf/trunk/libc/manual/resource.texi Tue Feb 23 00:03:07 2010
@@ -1288,7 +1288,7 @@
The POSIX standard up to this date is of not much help to solve this
problem. The Linux kernel provides a set of interfaces to allow
specifying @emph{affinity sets} for a process. The scheduler will
-schedule the thread or process on on CPUs specified by the affinity
+schedule the thread or process on CPUs specified by the affinity
masks. The interfaces which the GNU C library define follow to some
extend the Linux kernel interface.
Modified: fsf/trunk/libc/manual/stdio.texi
==============================================================================
--- fsf/trunk/libc/manual/stdio.texi (original)
+++ fsf/trunk/libc/manual/stdio.texi Tue Feb 23 00:03:07 2010
@@ -574,7 +574,7 @@
introduction of threads) were implemented as macros which are very fast
if the buffer is not empty. With the addition of locking requirements
these functions are no longer implemented as macros since they would
-would expand to too much code.
+expand to too much code.
But these macros are still available with the same functionality under the new
names @code{putc_unlocked} and @code{getc_unlocked}. This possibly huge
difference of speed also suggests the use of the @code{_unlocked}
Modified: fsf/trunk/libc/manual/time.texi
==============================================================================
--- fsf/trunk/libc/manual/time.texi (original)
+++ fsf/trunk/libc/manual/time.texi Tue Feb 23 00:03:07 2010
@@ -972,7 +972,7 @@
large offsets or jitter).
@item long int stbcnt
-This counter denotes the number of of calibrations where the stability
+This counter denotes the number of calibrations where the stability
exceeded the threshold.
@end table
@end deftp
Modified: fsf/trunk/libc/sysdeps/sparc/sparc32/dl-machine.h
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/sparc32/dl-machine.h (original)
+++ fsf/trunk/libc/sysdeps/sparc/sparc32/dl-machine.h Tue Feb 23 00:03:07 2010
@@ -166,15 +166,19 @@
in .rela.plt. */
while (rela < relaend)
{
- *(unsigned int *) rela->r_offset
- = OPCODE_SETHI_G1 | (rela->r_offset - (Elf32_Addr) plt);
- *(unsigned int *) (rela->r_offset + 4)
+ *(unsigned int *) (rela->r_offset + l->l_addr)
+ = OPCODE_SETHI_G1 | (rela->r_offset + l->l_addr
+ - (Elf32_Addr) plt);
+ *(unsigned int *) (rela->r_offset + l->l_addr + 4)
= OPCODE_BA | ((((Elf32_Addr) plt
- - rela->r_offset - 4) >> 2) & 0x3fffff);
+ - rela->r_offset - l->l_addr - 4) >> 2)
+ & 0x3fffff);
if (do_flush)
{
- __asm __volatile ("flush %0" : : "r"(rela->r_offset));
- __asm __volatile ("flush %0+4" : : "r"(rela->r_offset));
+ __asm __volatile ("flush %0" : : "r" (rela->r_offset
+ + l->l_addr));
+ __asm __volatile ("flush %0+4" : : "r" (rela->r_offset
+ + l->l_addr));
}
++rela;
}
Modified: fsf/trunk/libc/sysdeps/sparc/sparc64/dl-machine.h
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/sparc64/dl-machine.h (original)
+++ fsf/trunk/libc/sysdeps/sparc/sparc64/dl-machine.h Tue Feb 23 00:03:07 2010
@@ -1,6 +1,6 @@
/* Machine-dependent ELF dynamic relocation inline functions. Sparc64 version.
Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2010 Free Software Foundation, Inc.
+ 2009, 2010 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
@@ -227,7 +227,7 @@
{
if (__builtin_expect (rela->r_addend, 0) != 0)
{
- Elf64_Addr slot = ((rela->r_offset + 0x400
+ Elf64_Addr slot = ((rela->r_offset + l->l_addr + 0x400
- (Elf64_Addr) plt)
/ 0x1400) * 0x1400
+ (Elf64_Addr) plt - 0x400;
@@ -235,20 +235,23 @@
unsigned int first_ldx = *(unsigned int *)(slot + 12);
Elf64_Addr ptr = slot + (first_ldx & 0xfff) + 4;
- *(Elf64_Addr *) rela->r_offset
+ *(Elf64_Addr *) (rela->r_offset + l->l_addr)
= (Elf64_Addr) plt
- - (slot + ((rela->r_offset - ptr) / 8) * 24 + 4);
+ - (slot + ((rela->r_offset + l->l_addr - ptr) / 8) * 24
+ + 4);
++rela;
continue;
}
- *(unsigned int *) rela->r_offset
- = 0x03000000 | (rela->r_offset - (Elf64_Addr) plt);
- *(unsigned int *) (rela->r_offset + 4)
- = 0x30680000 | ((((Elf64_Addr) plt + 32
- - rela->r_offset - 4) >> 2) & 0x7ffff);
- __asm __volatile ("flush %0" : : "r" (rela->r_offset));
- __asm __volatile ("flush %0+4" : : "r" (rela->r_offset));
+ *(unsigned int *) (rela->r_offset + l->l_addr)
+ = 0x03000000 | (rela->r_offset + l->l_addr - (Elf64_Addr) plt);
+ *(unsigned int *) (rela->r_offset + l->l_addr + 4)
+ = 0x30680000 | ((((Elf64_Addr) plt + 32 - rela->r_offset
+ - l->l_addr - 4) >> 2) & 0x7ffff);
+ __asm __volatile ("flush %0" : : "r" (rela->r_offset
+ + l->l_addr));
+ __asm __volatile ("flush %0+4" : : "r" (rela->r_offset
+ + l->l_addr));
++rela;
}
}
Modified: fsf/trunk/libc/sysdeps/sparc/sparc64/memchr.S
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/sparc64/memchr.S (original)
+++ fsf/trunk/libc/sysdeps/sparc/sparc64/memchr.S Tue Feb 23 00:03:07 2010
@@ -96,7 +96,7 @@
* %o4 = value XOR c */
2: cmp %o0, %o2 /* IEU1 Group */
- bg,pn %XCC, 11f /* CTI */
+ bgu,pn %XCC, 11f /* CTI */
ldxa [%o0] ASI_PNF, %o3 /* Load */
sub %o4, %g1, %o5 /* IEU0 Group */
add %o0, 8, %o0 /* IEU1 */
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc32/makecontext.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc32/makecontext.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc32/makecontext.c Tue Feb 23 00:03:07 2010
@@ -77,7 +77,7 @@
if (i < 6)
ucp->uc_mcontext.gregs[REG_O0 + i] = arg;
else
- sp[i + 23] = arg;
+ sp[i + 23 - 6] = arg;
}
va_end (ap);