GNU C Library master sources branch, master, updated. glibc-2.15-1137-g173f722

[schwab at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  173f7220451fc0028836b8c529a1143e4fc14e9c (commit)
      from  f34a1c6f5e40316196c45aec4415d582abb7ea79 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=173f7220451fc0028836b8c529a1143e4fc14e9c

commit 173f7220451fc0028836b8c529a1143e4fc14e9c
Author: Andreas Schwab <schwab@linux-m68k.org>
Date:   Wed May 2 10:24:39 2012 +0200

    Move __mcount_internal from GLIBC_PRIVATE to GLIBC_2.16

diff --git a/ChangeLog b/ChangeLog
index 4243e52..adf6c88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-06-02  Andreas Schwab  <schwab@linux-m68k.org>
+
+	[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@intel.com>
 
 	* sysdeps/unix/sysv/linux/x86_64/sys/io.h (outsw): Fix a typo.
diff --git a/sysdeps/powerpc/powerpc32/Versions b/sysdeps/powerpc/powerpc32/Versions
index ad4972e..b0782fe 100644
--- a/sysdeps/powerpc/powerpc32/Versions
+++ b/sysdeps/powerpc/powerpc32/Versions
@@ -8,6 +8,9 @@ libc {
     __fixsfdi; __fixunssfdi;
     __floatdidf; __floatdisf;
   }
+  GLIBC_2.16 {
+    __mcount_internal;
+  }
   GLIBC_PRIVATE {
     __mcount_internal;
   }
diff --git a/sysdeps/powerpc/powerpc32/mcount.c b/sysdeps/powerpc/powerpc32/mcount.c
new file mode 100644
index 0000000..0476bf6
--- /dev/null
+++ b/sysdeps/powerpc/powerpc32/mcount.c
@@ -0,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
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist
index bacdb6a..706d2a9 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist
@@ -1762,6 +1762,7 @@ GLIBC_2.15
 GLIBC_2.16
  GLIBC_2.16 A
  __getauxval F
+ __mcount_internal F
  __poll_chk F
  __ppoll_chk F
  aligned_alloc F

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |    9 +++++++++
 sysdeps/powerpc/powerpc32/Versions                 |    3 +++
 sysdeps/powerpc/powerpc32/mcount.c                 |   17 +++++++++++++++++
 .../linux/powerpc/powerpc32/fpu/nptl/libc.abilist  |    1 +
 4 files changed, 30 insertions(+), 0 deletions(-)
 create mode 100644 sysdeps/powerpc/powerpc32/mcount.c


hooks/post-receive
-- 
GNU C Library master sources