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.20-396-g04d5556
- From: sje at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 19 Dec 2014 22:38:16 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-396-g04d5556
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 04d55561978eb59e36ced8fc1e8d87a72ef70072 (commit)
from 3eb38795dbbbd8160012050de4dfef200a21f2bf (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=04d55561978eb59e36ced8fc1e8d87a72ef70072
commit 04d55561978eb59e36ced8fc1e8d87a72ef70072
Author: Steve Ellcey <sellcey@mips.com>
Date: Fri Dec 19 14:37:44 2014 -0800
2014-12-19 Steve Ellcey <sellcey@imgtec.com>
* sysdeps/mips/sys/asm.h (PTR_ADDU): Use addu on mips32r6/mips64r6.
(PTR_ADDIU): Use addiu for mips32r6/mips64r6.
(PTR_SUBU): Use subu for mips32r6/mips64r6.
(PTR_SUBIU): Use subu for mips32r6/mips64r6 (subiu does not exist).
* sysdeps/mips/machine-gmon.h (PTR_ADDU_STRING) Use addu for
mips32r6/mips64r6.
(PTR_SUBU_STRING) Use subu for mips32r6/mips64r6.
diff --git a/sysdeps/mips/machine-gmon.h b/sysdeps/mips/machine-gmon.h
index aac1723..f5d1c64 100644
--- a/sysdeps/mips/machine-gmon.h
+++ b/sysdeps/mips/machine-gmon.h
@@ -83,8 +83,13 @@ static void __attribute_used__ __mcount (u_long frompc, u_long selfpc)
#endif
#if _MIPS_SIM == _ABIN32
-# define PTR_ADDU_STRING "add" /* no u */
-# define PTR_SUBU_STRING "sub" /* no u */
+# if __mips_isa_rev < 6
+# define PTR_ADDU_STRING "add" /* no u */
+# define PTR_SUBU_STRING "sub" /* no u */
+# else
+# define PTR_ADDU_STRING "addu"
+# define PTR_SUBU_STRING "subu"
+# endif
#elif _MIPS_SIM == _ABI64
# define PTR_ADDU_STRING "daddu"
# define PTR_SUBU_STRING "dsubu"
diff --git a/sysdeps/mips/sys/asm.h b/sysdeps/mips/sys/asm.h
index e479e9b..a618d49 100644
--- a/sysdeps/mips/sys/asm.h
+++ b/sysdeps/mips/sys/asm.h
@@ -416,12 +416,19 @@ symbol = value
#if _MIPS_SIM == _ABIN32
# define PTR_ADD add
# define PTR_ADDI addi
-# define PTR_ADDU add /* no u */
-# define PTR_ADDIU addi /* no u */
# define PTR_SUB sub
# define PTR_SUBI subi
+#if __mips_isa_rev < 6
+# define PTR_ADDU add /* no u */
+# define PTR_ADDIU addi /* no u */
# define PTR_SUBU sub /* no u */
# define PTR_SUBIU sub /* no u */
+#else
+# define PTR_ADDU addu
+# define PTR_ADDIU addiu
+# define PTR_SUBU subu
+# define PTR_SUBIU subu
+#endif
# define PTR_L lw
# define PTR_LA la
# define PTR_S sw
-----------------------------------------------------------------------
Summary of changes:
sysdeps/mips/machine-gmon.h | 9 +++++++--
sysdeps/mips/sys/asm.h | 11 +++++++++--
2 files changed, 16 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources