[src/netbsd-3]: src/sys/arch/sh3/include Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/598559543dab
branches:  netbsd-3
changeset: 577714:598559543dab
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Jan 11 13:56:36 2006 +0000

description:
Pull up following revision(s) (requested by uwe in ticket #1094):
        sys/arch/sh3/include/asm.h: revision 1.24
Provide PIC_EPILOGUE_SLOT that is safe to use in delay slot.

diffstat:

 sys/arch/sh3/include/asm.h |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r f1fbd024bbf5 -r 598559543dab sys/arch/sh3/include/asm.h
--- a/sys/arch/sh3/include/asm.h        Wed Jan 11 13:56:13 2006 +0000
+++ b/sys/arch/sh3/include/asm.h        Wed Jan 11 13:56:36 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asm.h,v 1.16.14.6 2006/01/11 13:56:13 tron Exp $       */
+/*     $NetBSD: asm.h,v 1.16.14.7 2006/01/11 13:56:36 tron Exp $       */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -160,6 +160,9 @@
 #define        PIC_EPILOGUE                            \
                mov.l   @sp+, r12
 
+#define PIC_EPILOGUE_SLOT                      \
+               PIC_EPILOGUE
+
 #define PIC_GOT_DATUM \
                .long   _GLOBAL_OFFSET_TABLE_
 
@@ -182,6 +185,7 @@
 #define        PIC_PROLOGUE(label)
 #define        PIC_PROLOGUE_NOSAVE(label)
 #define        PIC_EPILOGUE
+#define        PIC_EPILOGUE_SLOT       nop
 #define PIC_GOT_DATUM
 
 #define CALL   jsr @