aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2013-12-19 15:38:48 +0100
committerAndreas Schwab <schwab@suse.de>2013-12-19 17:06:48 +0100
commit83f5c32d21f7616e1833ca0f8a1555990d9b7a68 (patch)
tree615be24f2264f47c64b6b41a6b01c18dd404f7b1
parent335ee09231eb950e18df2c39abe7290c67b22f3d (diff)
downloadglibc-83f5c32d21f7616e1833ca0f8a1555990d9b7a68.zip
glibc-83f5c32d21f7616e1833ca0f8a1555990d9b7a68.tar.gz
glibc-83f5c32d21f7616e1833ca0f8a1555990d9b7a68.tar.bz2
Fix uses of CALL_MCOUNT in ppc64 assembler sources
-rw-r--r--ChangeLog8
-rw-r--r--sysdeps/powerpc/powerpc64/power7/memchr.S2
-rw-r--r--sysdeps/powerpc/powerpc64/power7/memrchr.S2
-rw-r--r--sysdeps/powerpc/powerpc64/power7/strcasecmp.S4
4 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7386e3a..6bab229 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-12-19 Andreas Schwab <schwab@suse.de>
+
+ * 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.
+
2013-12-19 Joseph Myers <joseph@codesourcery.com>
* math/gen-libm-test.pl (%beautify): Remove M_* constants.
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 */