[commits] r13055 - in /branches/eglibc-2_13/libc: ./ elf/ sysdeps/powerpc/powerpc64/power7/ sysdeps/unix/sysv/linux/powerpc/powerpc64/...

[joseph@xxxxxxxxxx]

Author: joseph
Date: Sat Mar  5 11:41:05 2011
New Revision: 13055

Log:
Merge changes between r12753 and r13054 from /fsf/glibc-2_13-branch.

Added:
    branches/eglibc-2_13/libc/sysdeps/powerpc/powerpc64/power7/Makefile
      - copied unchanged from r13054, fsf/glibc-2_13-branch/libc/sysdeps/powerpc/powerpc64/power7/Makefile
    branches/eglibc-2_13/libc/sysdeps/wordsize-64/Makefile
      - copied unchanged from r13054, fsf/glibc-2_13-branch/libc/sysdeps/wordsize-64/Makefile
    branches/eglibc-2_13/libc/sysdeps/wordsize-64/tst-writev.c
      - copied unchanged from r13054, fsf/glibc-2_13-branch/libc/sysdeps/wordsize-64/tst-writev.c
Modified:
    branches/eglibc-2_13/libc/ChangeLog
    branches/eglibc-2_13/libc/NEWS
    branches/eglibc-2_13/libc/elf/rtld.c
    branches/eglibc-2_13/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h

Modified: branches/eglibc-2_13/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_13/libc/ChangeLog (original)
+++ branches/eglibc-2_13/libc/ChangeLog Sat Mar  5 11:41:05 2011
@@ -1,3 +1,27 @@
+2010-09-28  Andreas Schwab  <schwab@xxxxxxxxxx>
+	    Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	[BZ #12489]
+	* elf/rtld.c (dl_main): Move setting of GLRO(dl_init_all_dirs)
+	before performing relro protection.  At old place add assertion
+	to make sure nothing changed.
+
+2011-02-16  Ryan S. Arnold  <rsa@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h:
+	(INTERNAL_VSYSCALL_NCS INTERNAL_SYSCALL_NCS): Remove erroneous (int)
+	cast from r3.
+	* sysdeps/wordsize-64/Makefile: New file.  Add tst-writev to
+	'tests' variable.
+	* sysdeps/wordsize-64/tst-writev.c: New file.
+
+2011-02-15  Ryan S. Arnold  <rsa@xxxxxxxxxx>
+
+	* sysdeps/powerpc/powerpc64/power7/Makefile: New file which adds
+	-mno-vsx to the CFLAGS-rtld.c variable to avoid using VSX registers and
+	insns in _dl_start to prevent a TOC reference before relocs are
+	resolved.
+
 2011-02-02  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* elf/dl-runtime.c (_dl_call_pltexit): Pass correct address of the

Modified: branches/eglibc-2_13/libc/NEWS
==============================================================================
--- branches/eglibc-2_13/libc/NEWS (original)
+++ branches/eglibc-2_13/libc/NEWS Sat Mar  5 11:41:05 2011
@@ -13,7 +13,7 @@
   11655, 11701, 11840, 11856, 11883, 11903, 11904, 11968, 11979, 12005,
   12037, 12067, 12077, 12078, 12092, 12093, 12107, 12108, 12113, 12140,
   12159, 12167, 12191, 12194, 12201, 12204, 12205, 12207, 12348, 12378,
-  12394, 12397
+  12394, 12397, 12489
 
 * New Linux interfaces: prlimit, prlimit64, fanotify_init, fanotify_mark
 

Modified: branches/eglibc-2_13/libc/elf/rtld.c
==============================================================================
--- branches/eglibc-2_13/libc/elf/rtld.c (original)
+++ branches/eglibc-2_13/libc/elf/rtld.c Sat Mar  5 11:41:05 2011
@@ -1,5 +1,5 @@
 /* Run time dynamic linker.
-   Copyright (C) 1995-2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1995-2010, 2011 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
@@ -2179,6 +2179,10 @@
      we need it in the memory handling later.  */
   GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist;
 
+  /* Remember the last search directory added at startup, now that
+     malloc will no longer be the one from dl-minimal.c.  */
+  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
+
   if (prelinked)
     {
       if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
@@ -2298,9 +2302,8 @@
 			  lossage);
     }
 
-  /* Remember the last search directory added at startup, now that
-     malloc will no longer be the one from dl-minimal.c.  */
-  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
+  /* Make sure no new search directories have been added.  */
+  assert (GLRO(dl_init_all_dirs) == GL(dl_all_dirs));
 
   if (! prelinked && rtld_multiple_ref)
     {

Modified: branches/eglibc-2_13/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
==============================================================================
--- branches/eglibc-2_13/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h (original)
+++ branches/eglibc-2_13/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h Sat Mar  5 11:41:05 2011
@@ -172,7 +172,7 @@
        : "r9", "r10", "r11", "r12",					\
          "cr0", "ctr", "lr", "memory");					\
 	  err = (long int) r0;						\
-    (int) r3;								\
+    r3;								\
   })
 
 #undef INLINE_SYSCALL
@@ -219,7 +219,7 @@
        : "r9", "r10", "r11", "r12",					\
          "cr0", "ctr", "memory");					\
 	  err = r0;  \
-    (int) r3;  \
+    r3;  \
   })
 #define INTERNAL_SYSCALL(name, err, nr, args...)			\
   INTERNAL_SYSCALL_NCS (__NR_##name, err, nr, args)