Module Name: src
Committed By: joerg
Date: Sat Feb 25 21:16:50 UTC 2017
Modified Files:
src/common/lib/libc/arch/mips/string: strchr.S strrchr.S
src/external/gpl3/gcc/dist/gcc/config/mips: netbsd.h
src/lib/libc/arch/mips: SYS.h
src/sys/arch/mips/include: asm.h
Log Message:
Switch from __ABICALLS__ to __mips_abicalls like upstream GCC does in
the generic MIPS target logic.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/arch/mips/string/strchr.S
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/mips/string/strrchr.S
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/arch/mips/SYS.h
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/mips/include/asm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/mips/string/strchr.S
diff -u src/common/lib/libc/arch/mips/string/strchr.S:1.4 src/common/lib/libc/arch/mips/string/strchr.S:1.5
--- src/common/lib/libc/arch/mips/string/strchr.S:1.4 Tue May 26 06:55:08 2015
+++ src/common/lib/libc/arch/mips/string/strchr.S Sat Feb 25 21:16:50 2017
@@ -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
Index: src/common/lib/libc/arch/mips/string/strrchr.S
diff -u src/common/lib/libc/arch/mips/string/strrchr.S:1.3 src/common/lib/libc/arch/mips/string/strrchr.S:1.4
--- src/common/lib/libc/arch/mips/string/strrchr.S:1.3 Tue May 26 06:55:08 2015
+++ src/common/lib/libc/arch/mips/string/strrchr.S Sat Feb 25 21:16:50 2017
@@ -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
Index: src/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h:1.8 src/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h:1.9
--- src/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h:1.8 Fri Aug 19 05:11:10 2016
+++ src/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h Sat Feb 25 21:16:50 2017
@@ -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: src/lib/libc/arch/mips/SYS.h
diff -u src/lib/libc/arch/mips/SYS.h:1.19 src/lib/libc/arch/mips/SYS.h:1.20
--- src/lib/libc/arch/mips/SYS.h:1.19 Mon Dec 14 01:07:41 2009
+++ src/lib/libc/arch/mips/SYS.h Sat Feb 25 21:16:50 2017
@@ -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__
Index: src/sys/arch/mips/include/asm.h
diff -u src/sys/arch/mips/include/asm.h:1.53 src/sys/arch/mips/include/asm.h:1.54
--- src/sys/arch/mips/include/asm.h:1.53 Fri Nov 11 16:41:32 2016
+++ src/sys/arch/mips/include/asm.h Sat Feb 25 21:16:50 2017
@@ -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 @@ _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
