[src/trunk]: src/sys/arch/sh3/include Allow co-existance of traditional and m...

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

details:   https://anonhg.NetBSD.org/src/rev/8c04114c9269
branches:  trunk
changeset: 760971:8c04114c9269
user:      joerg <joerg%NetBSD.org@localhost>
date:      Tue Jan 18 00:26:57 2011 +0000

description:
Allow co-existance of traditional and modern CPP

diffstat:

 sys/arch/sh3/include/locore.h |  18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diffs (39 lines):

diff -r 444e6a3adddb -r 8c04114c9269 sys/arch/sh3/include/locore.h
--- a/sys/arch/sh3/include/locore.h     Tue Jan 18 00:22:56 2011 +0000
+++ b/sys/arch/sh3/include/locore.h     Tue Jan 18 00:26:57 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.h,v 1.19 2008/06/01 00:46:01 uwe Exp $  */
+/*     $NetBSD: locore.h,v 1.20 2011/01/18 00:26:57 joerg Exp $        */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -28,6 +28,21 @@
 
 #ifdef _LOCORE
 
+#ifdef __STDC__
+#if defined(SH3) && defined(SH4)
+#define        MOV(x, r)       mov.l .L_ ## x, r; mov.l @r, r
+#define        REG_SYMBOL(x)   .L_ ## x:       .long   _C_LABEL(__sh_ ## x)
+#define        FUNC_SYMBOL(x)  .L_ ## x:       .long   _C_LABEL(__sh_ ## x)
+#elif defined(SH3)
+#define        MOV(x, r)       mov.l .L_ ## x, r
+#define        REG_SYMBOL(x)   .L_ ## x:       .long   SH3_ ## x
+#define        FUNC_SYMBOL(x)  .L_ ## x:       .long   _C_LABEL(sh3_ ## x)
+#elif defined(SH4)
+#define        MOV(x, r)       mov.l .L_ ## x, r
+#define        REG_SYMBOL(x)   .L_ ## x:       .long   SH4_ ## x
+#define        FUNC_SYMBOL(x)  .L_ ## x:       .long   _C_LABEL(sh4_ ## x)
+#endif /* SH3 && SH4 */
+#else /* !__STDC__ */
 #if defined(SH3) && defined(SH4)
 #define        MOV(x, r)       mov.l .L_/**/x, r; mov.l @r, r
 #define        REG_SYMBOL(x)   .L_/**/x:       .long   _C_LABEL(__sh_/**/x)
@@ -41,6 +56,7 @@
 #define        REG_SYMBOL(x)   .L_/**/x:       .long   SH4_/**/x
 #define        FUNC_SYMBOL(x)  .L_/**/x:       .long   _C_LABEL(sh4_/**/x)
 #endif /* SH3 && SH4 */
+#endif /* __STDC__ */
 
 /*
  * BANK1 r6 contains current trapframe pointer.