This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.26-101-g4ebf934
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Aug 2017 12:52:38 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26-101-g4ebf934
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 4ebf934e34c947ed50d0a3ff68c40bc72e50ecc9 (commit)
from e9f57484aa18dff76dcad7a3943f08bb7affb840 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4ebf934e34c947ed50d0a3ff68c40bc72e50ecc9
commit 4ebf934e34c947ed50d0a3ff68c40bc72e50ecc9
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue Aug 15 14:46:19 2017 +0200
i386: Replace internal_function attribute for __mcount_internal
__mcount_internal is called from assembler code. Use an explicit
regparm attribute to pass both arguments in registers, to match what
used to happen with internal_function before commit
fbdc1e3e8de7f49e439b6e274d3e7e07da78416e (i386: Do not set
internal_function).
diff --git a/ChangeLog b/ChangeLog
index b540c5f..8f072e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-08-15 Florian Weimer <fweimer@redhat.com>
+
+ * sysdeps/i386/machine-gmon.h (mcount_internal): Declare with
+ regparm (2) instead of internal_function.
+ (_MCOUNT_DECL): Adjust.
+
2017-08-15 Stefan Liebler <stli@linux.vnet.ibm.com>
* sysdeps/s390/dl-procinfo.c (_dl_s390_cap_flags): Add z14.
diff --git a/sysdeps/i386/machine-gmon.h b/sysdeps/i386/machine-gmon.h
index d5d8cdf..3e90b8c 100644
--- a/sysdeps/i386/machine-gmon.h
+++ b/sysdeps/i386/machine-gmon.h
@@ -29,10 +29,12 @@
/* We must not pollute the global namespace. */
#define mcount_internal __mcount_internal
-extern void mcount_internal (u_long frompc, u_long selfpc) internal_function;
+extern void mcount_internal (u_long frompc, u_long selfpc)
+ __attribute__ ((regparm (2)));
-#define _MCOUNT_DECL(frompc, selfpc) \
-void internal_function mcount_internal (u_long frompc, u_long selfpc)
+#define _MCOUNT_DECL(frompc, selfpc) \
+ __attribute__ ((regparm (2))) \
+void mcount_internal (u_long frompc, u_long selfpc)
/* Define MCOUNT as empty since we have the implementation in another
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/i386/machine-gmon.h | 8 +++++---
2 files changed, 11 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources