[src/trunk]: src Switch from __ABICALLS__ to __mips_abicalls like upstream GC...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f0fb74483560
branches:  trunk
changeset: 351757:f0fb74483560
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Feb 25 21:16:50 2017 +0000

description:
Switch from __ABICALLS__ to __mips_abicalls like upstream GCC does in
the generic MIPS target logic.

diffstat:

 common/lib/libc/arch/mips/string/strchr.S       |  6 +++---
 common/lib/libc/arch/mips/string/strrchr.S      |  6 +++---
 external/gpl3/gcc/dist/gcc/config/mips/netbsd.h |  2 +-
 lib/libc/arch/mips/SYS.h                        |  6 +++---
 sys/arch/mips/include/asm.h                     |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diffs (101 lines):

diff -r d645076332b4 -r f0fb74483560 common/lib/libc/arch/mips/string/strchr.S
--- a/common/lib/libc/arch/mips/string/strchr.S Sat Feb 25 18:18:29 2017 +0000
+++ b/common/lib/libc/arch/mips/string/strchr.S Sat Feb 25 21:16:50 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: strchr.S,v 1.4 2015/05/26 06:55:08 matt Exp $  */
+/*     $NetBSD: strchr.S,v 1.5 2017/02/25 21:16:50 joerg Exp $ */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -36,10 +36,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
        ASMSTR("from: @(#)index.s       8.1 (Berkeley) 6/4/93")
-       ASMSTR("$NetBSD: strchr.S,v 1.4 2015/05/26 06:55:08 matt Exp $")
+       ASMSTR("$NetBSD: strchr.S,v 1.5 2017/02/25 21:16:50 joerg Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef __ABICALLS__
+#ifdef __mips_abicalls
        .abicalls
 #endif
 
diff -r d645076332b4 -r f0fb74483560 common/lib/libc/arch/mips/string/strrchr.S
--- a/common/lib/libc/arch/mips/string/strrchr.S        Sat Feb 25 18:18:29 2017 +0000
+++ b/common/lib/libc/arch/mips/string/strrchr.S        Sat Feb 25 21:16:50 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: strrchr.S,v 1.3 2015/05/26 06:55:08 matt Exp $ */
+/*     $NetBSD: strrchr.S,v 1.4 2017/02/25 21:16:50 joerg Exp $        */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -36,10 +36,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
        ASMSTR("from: @(#)rindex.s      8.1 (Berkeley) 6/4/93")
-       ASMSTR("$NetBSD: strrchr.S,v 1.3 2015/05/26 06:55:08 matt Exp $")
+       ASMSTR("$NetBSD: strrchr.S,v 1.4 2017/02/25 21:16:50 joerg Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef __ABICALLS__
+#ifdef __mips_abicalls
        .abicalls
 #endif
 
diff -r d645076332b4 -r f0fb74483560 external/gpl3/gcc/dist/gcc/config/mips/netbsd.h
--- a/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h   Sat Feb 25 18:18:29 2017 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h   Sat Feb 25 21:16:50 2017 +0000
@@ -30,7 +30,7 @@
        builtin_define ("__LONG64");                    \
                                                        \
       if (TARGET_ABICALLS)                             \
-       builtin_define ("__ABICALLS__");                \
+       builtin_define ("__mips_abicalls");             \
                                                        \
     if (mips_abi == ABI_N32)                           \
       {                                                        \
diff -r d645076332b4 -r f0fb74483560 lib/libc/arch/mips/SYS.h
--- a/lib/libc/arch/mips/SYS.h  Sat Feb 25 18:18:29 2017 +0000
+++ b/lib/libc/arch/mips/SYS.h  Sat Feb 25 21:16:50 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: SYS.h,v 1.19 2009/12/14 01:07:41 matt Exp $ */
+/*     $NetBSD: SYS.h,v 1.20 2017/02/25 21:16:50 joerg Exp $ */
 
 /*-
  * Copyright (c) 1996 Jonathan Stone
@@ -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__
diff -r d645076332b4 -r f0fb74483560 sys/arch/mips/include/asm.h
--- a/sys/arch/mips/include/asm.h       Sat Feb 25 18:18:29 2017 +0000
+++ b/sys/arch/mips/include/asm.h       Sat Feb 25 21:16:50 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asm.h,v 1.53 2016/11/11 16:41:32 maya Exp $    */
+/*     $NetBSD: asm.h,v 1.54 2017/02/25 21:16:50 joerg Exp $   */
 
 /*
  * Copyright (c) 1992, 1993
@@ -530,7 +530,7 @@
 
 #if defined(__mips_o32) || defined(__mips_o64)
 
-#ifdef __ABICALLS__
+#ifdef __mips_abicalls
 #define        CPRESTORE(r)    .cprestore r
 #define        CPLOAD(r)       .cpload r
 #else