This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch roland/arm-mcount created. glibc-2.17-936-gcc31785
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 26 Aug 2013 22:10:47 -0000
- Subject: GNU C Library master sources branch roland/arm-mcount created. glibc-2.17-936-gcc31785
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, roland/arm-mcount has been created
at cc317851356752efb33af3c5e753f08289f9c99c (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=cc317851356752efb33af3c5e753f08289f9c99c
commit cc317851356752efb33af3c5e753f08289f9c99c
Author: Roland McGrath <roland@hack.frob.com>
Date: Tue Aug 6 11:16:34 2013 -0700
ARM: Disable compat mcount code when unneeded.
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 1e7a35c..6f9c386 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,9 @@
+2013-08-06 Roland McGrath <roland@hack.frob.com>
+
+ * sysdeps/arm/arm-mcount.S: #include <shlib-compat.h>.
+ (_mcount, mcount):
+ Protect under [SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19)].
+
2013-07-03 Joseph Myers <joseph@codesourcery.com>
* sysdeps/arm/include/bits/setjmp.h [_ISOMAC] (JMP_BUF_REGLIST):
diff --git a/ports/sysdeps/arm/arm-mcount.S b/ports/sysdeps/arm/arm-mcount.S
index 8162be2..443288c 100644
--- a/ports/sysdeps/arm/arm-mcount.S
+++ b/ports/sysdeps/arm/arm-mcount.S
@@ -65,6 +65,10 @@ ENTRY(__gnu_mcount_nc)
END(__gnu_mcount_nc)
+#include <shlib-compat.h>
+
+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19)
+
/* Provide old mcount for backwards compatibility. This requires
code be compiled with APCS frame pointers. */
@@ -102,3 +106,5 @@ END(_mcount)
but some old asm code might assume it's `mcount'. */
#undef mcount
weak_alias (_mcount, mcount)
+
+#endif
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources