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

[Commits] r23019 - in /fsf/trunk/libc: ./ elf/ manual/ misc/sys/ ports/ ports/sysdeps/arm/ sysdeps/generic/ sysdeps/unix/sysv/linux/wo...

Author: eglibc
Date: Wed May  8 00:02:10 2013
New Revision: 23019

Log:
Import glibc-mainline for 2013-05-08

Added:
    fsf/trunk/libc/sysdeps/unix/sysv/linux/wordsize-64/glob64.c
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/elf/dl-open.c
    fsf/trunk/libc/manual/message.texi
    fsf/trunk/libc/misc/sys/param.h
    fsf/trunk/libc/ports/ChangeLog.arm
    fsf/trunk/libc/ports/sysdeps/arm/dl-machine.h
    fsf/trunk/libc/sysdeps/generic/ldsodefs.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed May  8 00:02:10 2013
@@ -1,4 +1,22 @@
+2013-05-07  Aurelien Jarno <aurelien@xxxxxxxxxxx>
+
+	* misc/sys/param.h (DEV_BSIZE): Define only if not already defined.
+
+2013-05-07  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* sysdeps/generic/ldsodefs.h [IS_IN_rtld]: Declare _dl_skip_args
+	and _dl_skip_args_internal.
+
+2013-05-07  Carlos O'Donell  <carlos@xxxxxxxxxx>
+
+	* manual/message.texi (Message Translation): Talk about users.
+	Message to key mapping impacts design.
+
 2013-05-06  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/wordsize-64/glob64.c: New file.
+
+	* elf/dl-open.c: Remove declaration of _dl_sysdep_start.
 
 	* sysdeps/unix/sysv/linux/wordsize-64/glob64.c: Moved to ...
 	* sysdeps/wordsize-64/glob64.c: ... here.

Modified: fsf/trunk/libc/elf/dl-open.c
==============================================================================
--- fsf/trunk/libc/elf/dl-open.c (original)
+++ fsf/trunk/libc/elf/dl-open.c Wed May  8 00:02:10 2013
@@ -37,13 +37,6 @@
 #include <dl-dst.h>
 
 
-extern ElfW(Addr) _dl_sysdep_start (void **start_argptr,
-				    void (*dl_main) (const ElfW(Phdr) *phdr,
-						     ElfW(Word) phnum,
-						     ElfW(Addr) *user_entry,
-						     ElfW(auxv_t) *auxv));
-weak_extern (_dl_sysdep_start)
-
 extern int __libc_multiple_libcs;	/* Defined in init-first.c.  */
 
 /* We must be careful not to leave us in an inconsistent state.  Thus we

Modified: fsf/trunk/libc/manual/message.texi
==============================================================================
--- fsf/trunk/libc/manual/message.texi (original)
+++ fsf/trunk/libc/manual/message.texi Wed May  8 00:02:10 2013
@@ -2,9 +2,9 @@
 @c %MENU% How to make the program speak the user's language
 @chapter Message Translation
 
-The program's interface with the human should be designed in a way to
-ease the human the task.  One of the possibilities is to use messages in
-whatever language the user prefers.
+The program's interface with the user should be designed to ease the user's
+task.  One way to ease the user's task is to use messages in whatever
+language the user prefers.
 
 Printing messages in different languages can be implemented in different
 ways.  One could add all the different languages in the source code and
@@ -40,7 +40,7 @@
 @end itemize
 
 The two approaches mainly differ in the implementation of this last
-step.  The design decisions made for this influences the whole rest.
+step.  Decisions made in the last step influence the rest of the design.
 
 @menu
 * Message catalogs a la X/Open::  The @code{catgets} family of functions.

Modified: fsf/trunk/libc/misc/sys/param.h
==============================================================================
--- fsf/trunk/libc/misc/sys/param.h (original)
+++ fsf/trunk/libc/misc/sys/param.h Wed May  8 00:02:10 2013
@@ -71,7 +71,9 @@
 
 
 /* Unit of `st_blocks'.  */
-#define DEV_BSIZE       512
+#ifndef DEV_BSIZE
+# define DEV_BSIZE	512
+#endif
 
 
 /* Bit map related macros.  */

Modified: fsf/trunk/libc/ports/ChangeLog.arm
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.arm (original)
+++ fsf/trunk/libc/ports/ChangeLog.arm Wed May  8 00:02:10 2013
@@ -1,3 +1,8 @@
+2013-05-07  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* sysdeps/arm/dl-machine.h (elf_machine_dynamic): Use a plain C
+	reference to _GLOBAL_OFFSET_TABLE_ with an STV_HIDDEN declaration.
+
 2013-05-06  Roland McGrath  <roland@xxxxxxxxxxxxx>
 
 	* sysdeps/arm/dl-tlsdesc.S (_dl_tlsdesc_dynamic): Add missing sfi_breg.

Modified: fsf/trunk/libc/ports/sysdeps/arm/dl-machine.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/arm/dl-machine.h (original)
+++ fsf/trunk/libc/ports/sysdeps/arm/dl-machine.h Wed May  8 00:02:10 2013
@@ -39,30 +39,13 @@
 
 
 /* Return the link-time address of _DYNAMIC.  Conveniently, this is the
-   first element of the GOT.  We used to use the PIC register to do this
-   without a constant pool reference, but GCC 4.2 will use a pseudo-register
-   for the PIC base, so it may not be in r10.  */
+   first element of the GOT.  */
 static inline Elf32_Addr __attribute__ ((unused))
 elf_machine_dynamic (void)
 {
-  Elf32_Addr dynamic;
-#ifdef __thumb2__
-  long tmp;
-  asm ("ldr\t%0, 1f\n\t"
-       "adr\t%1, 1f\n\t"
-       "ldr\t%0, [%0, %1]\n\t"
-       "b 2f\n"
-       ".align 2\n"
-       "1: .word _GLOBAL_OFFSET_TABLE_ - 1b\n"
-       "2:" : "=r" (dynamic), "=r"(tmp));
-#else
-  asm ("ldr %0, 2f\n"
-       "1: ldr %0, [pc, %0]\n"
-       "b 3f\n"
-       "2: .word _GLOBAL_OFFSET_TABLE_ - (1b+8)\n"
-       "3:" : "=r" (dynamic));
-#endif
-  return dynamic;
+  /* Declaring this hidden ensures that a PC-relative reference is used.  */
+  extern const Elf32_Addr _GLOBAL_OFFSET_TABLE_[] attribute_hidden;
+  return _GLOBAL_OFFSET_TABLE_[0];
 }
 
 

Modified: fsf/trunk/libc/sysdeps/generic/ldsodefs.h
==============================================================================
--- fsf/trunk/libc/sysdeps/generic/ldsodefs.h (original)
+++ fsf/trunk/libc/sysdeps/generic/ldsodefs.h Wed May  8 00:02:10 2013
@@ -639,6 +639,16 @@
 #endif
      ;
 #ifdef IS_IN_rtld
+extern unsigned int _dl_skip_args attribute_hidden
+# ifndef DL_ARGV_NOT_RELRO
+     attribute_relro
+# endif
+     ;
+extern unsigned int _dl_skip_args_internal attribute_hidden
+# ifndef DL_ARGV_NOT_RELRO
+     attribute_relro
+# endif
+     ;
 extern char **_dl_argv_internal attribute_hidden
 # ifndef DL_ARGV_NOT_RELRO
      attribute_relro

Added: fsf/trunk/libc/sysdeps/unix/sysv/linux/wordsize-64/glob64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/wordsize-64/glob64.c (added)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/wordsize-64/glob64.c Wed May  8 00:02:10 2013
@@ -1,0 +1,2 @@
+/* This file is here so sysdeps/gnu/glob64.c doesn't take precedence.  */
+#include <sysdeps/wordsize-64/glob64.c>

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