Retiring __ABICALLS__
Joerg Sonnenberger <[email protected]>
| Newsgroups | gmane.os.netbsd.ports.mips.devel |
|---|---|
| Message-ID | <[email protected]> |
Hello all, GCC has moved to defining __mips_abicalls when -mabicalls is used a long time ago for the generic MIPS code. Since we have our own copy of that code to reduce namespace pollution, we never got that switch. I don't see a good reason for keeping our macro, so I'd like to just switch the in-tree GCC and the handful of users in the tree to the new name. Comments? Objections? Joerg
mips-abicalls.diff
(text/plain, 3.2 KB)
Index: common/lib/libc/arch/mips/string/strchr.S
===================================================================
RCS file: /home/joerg/repo/netbsd/src/common/lib/libc/arch/mips/string/strchr.S,v
retrieving revision 1.4
diff -u -p -r1.4 strchr.S
--- common/lib/libc/arch/mips/string/strchr.S 26 May 2015 06:55:08 -0000 1.4
+++ common/lib/libc/arch/mips/string/strchr.S 21 Feb 2017 16:54:26 -0000
@@ -39,7 +39,7 @@
ASMSTR("$NetBSD: strchr.S,v 1.4 2015/05/26 06:55:08 matt Exp $")
#endif /* LIBC_SCCS and not lint */
-#ifdef __ABICALLS__
+#ifdef __mips_abicalls
.abicalls
#endif
Index: common/lib/libc/arch/mips/string/strrchr.S
===================================================================
RCS file: /home/joerg/repo/netbsd/src/common/lib/libc/arch/mips/string/strrchr.S,v
retrieving revision 1.3
diff -u -p -r1.3 strrchr.S
--- common/lib/libc/arch/mips/string/strrchr.S 26 May 2015 06:55:08 -0000 1.3
+++ common/lib/libc/arch/mips/string/strrchr.S 21 Feb 2017 16:54:23 -0000
@@ -39,7 +39,7 @@
ASMSTR("$NetBSD: strrchr.S,v 1.3 2015/05/26 06:55:08 matt Exp $")
#endif /* LIBC_SCCS and not lint */
-#ifdef __ABICALLS__
+#ifdef __mips_abicalls
.abicalls
#endif
Index: external/gpl3/gcc/dist/gcc/config/mips/netbsd.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h,v
retrieving revision 1.8
diff -u -p -r1.8 netbsd.h
--- external/gpl3/gcc/dist/gcc/config/mips/netbsd.h 19 Aug 2016 05:11:10 -0000 1.8
+++ external/gpl3/gcc/dist/gcc/config/mips/netbsd.h 21 Feb 2017 16:54:46 -0000
@@ -30,7 +30,7 @@ along with GCC; see the file COPYING3.
builtin_define ("__LONG64"); \
\
if (TARGET_ABICALLS) \
- builtin_define ("__ABICALLS__"); \
+ builtin_define ("__mips_abicalls"); \
\
if (mips_abi == ABI_N32) \
{ \
Index: lib/libc/arch/mips/SYS.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/lib/libc/arch/mips/SYS.h,v
retrieving revision 1.19
diff -u -p -r1.19 SYS.h
--- lib/libc/arch/mips/SYS.h 14 Dec 2009 01:07:41 -0000 1.19
+++ lib/libc/arch/mips/SYS.h 21 Feb 2017 16:52:32 -0000
@@ -76,7 +76,7 @@
* ii) Do interprocedure jumps indirectly via t9, with the side-effect of
* preserving the callee's entry address in t9.
*/
-#ifdef __ABICALLS__
+#ifdef __mips_abicalls
.abicalls
# if defined(__mips_o32) || defined(__mips_o64)
# define PIC_PROLOGUE(x) SETUP_GP
@@ -91,7 +91,7 @@
# define PIC_PROLOGUE(x)
# define PIC_TAILCALL(l) j _C_LABEL(l)
# define PIC_RETURN()
-#endif /* __ABICALLS__ */
+#endif /* __mips_abicalls */
#ifdef __STDC__
Index: sys/arch/mips/include/asm.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/mips/include/asm.h,v
retrieving revision 1.53
diff -u -p -r1.53 asm.h
--- sys/arch/mips/include/asm.h 11 Nov 2016 16:41:32 -0000 1.53
+++ sys/arch/mips/include/asm.h 21 Feb 2017 16:52:34 -0000
@@ -530,7 +530,7 @@ _C_LABEL(x):
#if defined(__mips_o32) || defined(__mips_o64)
-#ifdef __ABICALLS__
+#ifdef __mips_abicalls
#define CPRESTORE(r) .cprestore r
#define CPLOAD(r) .cpload r
#else