This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Fix uses of CALL_MCOUNT in ppc64 assembler sources
- From: Andreas Schwab <schwab at suse dot de>
- To: Adhemerval Zanella <azanella at linux dot vnet dot ibm dot com>
- Cc: libc-alpha at sourceware dot org
- Date: Thu, 19 Dec 2013 16:22:08 +0100
- Subject: [PATCH] Fix uses of CALL_MCOUNT in ppc64 assembler sources
- Authentication-results: sourceware.org; auth=none
- References: <52A70916 dot 2020703 at linux dot vnet dot ibm dot com> <mvm61ql2apz dot fsf at hawking dot suse dot de> <52B30147 dot 3050006 at linux dot vnet dot ibm dot com>
* sysdeps/powerpc/powerpc64/power7/memchr.S: Fix argument of
CALL_MCOUNT.
* sysdeps/powerpc/powerpc64/power7/memrchr.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strcasecmp.S
[USE_IN_EXTENDED_LOCALE_MODEL]: Likewise.
---
sysdeps/powerpc/powerpc64/power7/memchr.S | 2 +-
sysdeps/powerpc/powerpc64/power7/memrchr.S | 2 +-
sysdeps/powerpc/powerpc64/power7/strcasecmp.S | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/sysdeps/powerpc/powerpc64/power7/memchr.S b/sysdeps/powerpc/powerpc64/power7/memchr.S
index 5076dd0..421d6d4 100644
--- a/sysdeps/powerpc/powerpc64/power7/memchr.S
+++ b/sysdeps/powerpc/powerpc64/power7/memchr.S
@@ -22,7 +22,7 @@
/* int [r3] memchr (char *s [r3], int byte [r4], int size [r5]) */
.machine power7
ENTRY (__memchr)
- CALL_MCOUNT 2
+ CALL_MCOUNT 3
dcbt 0,r3
clrrdi r8,r3,3
insrdi r4,r4,8,48
diff --git a/sysdeps/powerpc/powerpc64/power7/memrchr.S b/sysdeps/powerpc/powerpc64/power7/memrchr.S
index a9e86cb..683bfed 100644
--- a/sysdeps/powerpc/powerpc64/power7/memrchr.S
+++ b/sysdeps/powerpc/powerpc64/power7/memrchr.S
@@ -22,7 +22,7 @@
/* int [r3] memrchr (char *s [r3], int byte [r4], int size [r5]) */
.machine power7
ENTRY (__memrchr)
- CALL_MCOUNT
+ CALL_MCOUNT 3
add r7,r3,r5 /* Calculate the last acceptable address. */
neg r0,r7
addi r7,r7,-1
diff --git a/sysdeps/powerpc/powerpc64/power7/strcasecmp.S b/sysdeps/powerpc/powerpc64/power7/strcasecmp.S
index 9eee384..37785ea 100644
--- a/sysdeps/powerpc/powerpc64/power7/strcasecmp.S
+++ b/sysdeps/powerpc/powerpc64/power7/strcasecmp.S
@@ -32,7 +32,11 @@
#endif
ENTRY (__STRCMP)
+#ifndef USE_IN_EXTENDED_LOCALE_MODEL
CALL_MCOUNT 2
+#else
+ CALL_MCOUNT 3
+#endif
#define rRTN r3 /* Return value */
#define rSTR1 r5 /* 1st string */
--
1.8.5.1
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."