[Commits] r18924 - in /fsf/trunk/libc: ./ sysdeps/powerpc/powerpc32/ sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/ sysdeps/unix/...

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sun Jun  3 00:01:31 2012
New Revision: 18924

Log:
Import glibc-mainline for 2012-06-03

Added:
    fsf/trunk/libc/sysdeps/powerpc/powerpc32/mcount.c
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/powerpc/powerpc32/Versions
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist
    fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/io.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sun Jun  3 00:01:31 2012
@@ -1,3 +1,16 @@
+2012-06-02  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	[BZ #14042]
+	* sysdeps/powerpc/powerpc32/mcount.c: New file.
+	* sysdeps/powerpc/powerpc32/Versions (GLIBC_2.16): Add
+	__mcount_internal.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist
+	(GLIBC_2.16): Likewise.
+
+2012-06-01  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/x86_64/sys/io.h (outsw): Fix a typo.
+
 2012-06-01  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile

Modified: fsf/trunk/libc/sysdeps/powerpc/powerpc32/Versions
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/powerpc32/Versions (original)
+++ fsf/trunk/libc/sysdeps/powerpc/powerpc32/Versions Sun Jun  3 00:01:31 2012
@@ -7,6 +7,9 @@
     __fixdfdi; __fixunsdfdi;
     __fixsfdi; __fixunssfdi;
     __floatdidf; __floatdisf;
+  }
+  GLIBC_2.16 {
+    __mcount_internal;
   }
   GLIBC_PRIVATE {
     __mcount_internal;

Added: fsf/trunk/libc/sysdeps/powerpc/powerpc32/mcount.c
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/powerpc32/mcount.c (added)
+++ fsf/trunk/libc/sysdeps/powerpc/powerpc32/mcount.c Sun Jun  3 00:01:31 2012
@@ -1,0 +1,17 @@
+#include <shlib-compat.h>
+
+#define __mcount_internal ___mcount_internal
+
+#include <gmon/mcount.c>
+
+#undef __mcount_internal
+
+/* __mcount_internal was added in glibc 2.15 with version GLIBC_PRIVATE,
+   but it should have been put in version GLIBC_2.15.  Mark the
+   GLIBC_PRIVATE version obsolete and add it to GLIBC_2.16 instead.  */
+default_symbol_version (___mcount_internal, __mcount_internal, GLIBC_2.16);
+
+#if SHLIB_COMPAT (libc, GLIBC_2_15, GLIBC_2_16)
+strong_alias (___mcount_internal, ___mcount_internal_private);
+symbol_version (___mcount_internal_private, __mcount_internal, GLIBC_PRIVATE);
+#endif

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist Sun Jun  3 00:01:31 2012
@@ -1762,6 +1762,7 @@
 GLIBC_2.16
  GLIBC_2.16 A
  __getauxval F
+ __mcount_internal F
  __poll_chk F
  __ppoll_chk F
  aligned_alloc F

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/io.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/io.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/io.h Sun Jun  3 00:01:31 2012
@@ -165,7 +165,7 @@
 outsw (unsigned short int __port, const void *__addr,
        unsigned long int __count)
 {
-  __asm__ __volatile__ ("cld ; rep ; outsw":"=S" (____addr), "=c" (__count)
+  __asm__ __volatile__ ("cld ; rep ; outsw":"=S" (__addr), "=c" (__count)
 			:"d" (__port), "0" (__addr), "1" (__count));
 }
 

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