[Commits] r20865 - in /branches/eglibc-2_16: ./ libc/ libc/scripts/ ports/ ports/sysdeps/arm/bits/ ports/sysdeps/unix/sysv/linux/tile/...

[joseph@xxxxxxxxxx]

Author: joseph
Date: Tue Sep 25 14:43:47 2012
New Revision: 20865

Log:
Merge changes between r20392 and r20864 from /fsf/glibc-2_16-branch.

Modified:
    branches/eglibc-2_16/   (props changed)
    branches/eglibc-2_16/libc/ChangeLog
    branches/eglibc-2_16/libc/Makefile
    branches/eglibc-2_16/libc/NEWS
    branches/eglibc-2_16/libc/scripts/test-installation.pl
    branches/eglibc-2_16/ports/ChangeLog.tile
    branches/eglibc-2_16/ports/sysdeps/arm/bits/predefs.h   (props changed)
    branches/eglibc-2_16/ports/sysdeps/unix/sysv/linux/tile/sys/procfs.h

Propchange: branches/eglibc-2_16/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 25 14:43:47 2012
@@ -1,2 +1,2 @@
-/fsf/glibc-2_16-branch:19382-20392
+/fsf/glibc-2_16-branch:19382-20864
 /fsf/trunk:15224-19381

Modified: branches/eglibc-2_16/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_16/libc/ChangeLog (original)
+++ branches/eglibc-2_16/libc/ChangeLog Tue Sep 25 14:43:47 2012
@@ -1,3 +1,11 @@
+2012-08-29  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #14476]
+	* Makefile (install): Also pass LD_SO=$(ld.so-version) to
+	scripts/test-installation.pl.
+	* scripts/test-installation.pl: Use LD_SO to get $ld_so_name
+	and $ld_so_version if it is set.
+
 2012-08-27  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	[BZ #14459]

Modified: branches/eglibc-2_16/libc/Makefile
==============================================================================
--- branches/eglibc-2_16/libc/Makefile (original)
+++ branches/eglibc-2_16/libc/Makefile Tue Sep 25 14:43:47 2012
@@ -120,7 +120,7 @@
 ifneq (no,$(PERL))
 ifeq (/usr,$(prefix))
 ifeq (,$(install_root))
-	CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)
+	LD_SO=$(ld.so-version) CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)
 endif
 endif
 endif

Modified: branches/eglibc-2_16/libc/NEWS
==============================================================================
--- branches/eglibc-2_16/libc/NEWS (original)
+++ branches/eglibc-2_16/libc/NEWS Tue Sep 25 14:43:47 2012
@@ -9,7 +9,7 @@
 
 * The following bugs are resolved with this release:
 
-  14195, 14459
+  14195, 14459, 14476
 
 Version 2.16
 

Modified: branches/eglibc-2_16/libc/scripts/test-installation.pl
==============================================================================
--- branches/eglibc-2_16/libc/scripts/test-installation.pl (original)
+++ branches/eglibc-2_16/libc/scripts/test-installation.pl Tue Sep 25 14:43:47 2012
@@ -24,6 +24,11 @@
   $CC = $ENV{CC};
 } else {
   $CC= "gcc";
+}
+if ($ENV{LD_SO}) {
+  $LD_SO = $ENV{LD_SO};
+} else {
+  $LD_SO = "";
 }
 
 sub usage {
@@ -112,6 +117,8 @@
       $link_libs .= " -l$name";
       $versions{$name} = $version;
     }
+  } elsif ($LD_SO ne "") {
+    ($ld_so_name, $ld_so_version) = split ('\.so\.', $LD_SO);
   } else {
     if (/^ld\.so/) {
       ($ld_so_name, $ld_so_version)= /=(.*)\.so\.(.*)$/;

Modified: branches/eglibc-2_16/ports/ChangeLog.tile
==============================================================================
--- branches/eglibc-2_16/ports/ChangeLog.tile (original)
+++ branches/eglibc-2_16/ports/ChangeLog.tile Tue Sep 25 14:43:47 2012
@@ -1,3 +1,7 @@
+2012-09-06  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/tile/sys/procfs.h: Fix type of prfpregset_t.
+
 2012-05-30  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/tile/tilegx/Makefile: Remove test

Propchange: branches/eglibc-2_16/ports/sysdeps/arm/bits/predefs.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 25 14:43:47 2012
@@ -1,3 +1,3 @@
-/fsf/glibc-2_16-branch/ports/sysdeps/arm/bits/predefs.h:19382-20392
+/fsf/glibc-2_16-branch/ports/sysdeps/arm/bits/predefs.h:19382-20864
 /fsf/trunk/ports/sysdeps/arm/bits/predefs.h:18166-19381
 /fsf/trunk/ports/sysdeps/arm/eabi/bits/predefs.h:15224-17813

Modified: branches/eglibc-2_16/ports/sysdeps/unix/sysv/linux/tile/sys/procfs.h
==============================================================================
--- branches/eglibc-2_16/ports/sysdeps/unix/sysv/linux/tile/sys/procfs.h (original)
+++ branches/eglibc-2_16/ports/sysdeps/unix/sysv/linux/tile/sys/procfs.h Tue Sep 25 14:43:47 2012
@@ -113,7 +113,7 @@
 typedef elf_gregset_t prgregset_t;
 
 /* Provide dummy declaration here; we don't have FP registers. */
-typedef int prfpregset_t;
+typedef elf_fpregset_t prfpregset_t;
 
 /* We don't have any differences between processes and threads,
    therefore have only one PID type.  */

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