Index: cpukit/score/cpu/sparc/cpu_asm.S
===================================================================
RCS file: /usr1/CVS/rtems/cpukit/score/cpu/sparc/cpu_asm.S,v
retrieving revision 1.11
diff -u -r1.11 cpu_asm.S
--- cpukit/score/cpu/sparc/cpu_asm.S	1 Apr 2004 10:12:49 -0000	1.11
+++ cpukit/score/cpu/sparc/cpu_asm.S	15 Aug 2006 11:47:40 -0000
@@ -212,6 +212,7 @@
         andn    %g1, SPARC_PSR_ET_MASK | SPARC_PSR_CWP_MASK, %g1
         or      %g1, %g3, %g1                 ! g1 = heirs psr
         mov     %g1, %psr                     ! restore status register and
+	nop; nop; nop;			      ! Need three nops for pipeline 
                                               ! **** DISABLE TRAPS ****
         mov     %wim, %g2                     ! g2 = wim
         mov     1, %g4
@@ -605,6 +606,7 @@
          */
 
         mov      %l0, %psr             ! **** DISABLE TRAPS ****
+	nop; nop; nop;			      ! Need three nops for pipeline 
 
         /*
          *  Decrement ISR nest level and Thread dispatch disable level.
@@ -798,6 +800,7 @@
 good_task_window:
 
         mov     %l0, %psr                  !  **** DISABLE TRAPS ****
+	nop; nop; nop;			   ! Need three nops for pipeline 
                                            !  and restore condition codes.
         ld      [%g1 + ISF_G1_OFFSET], %g1 ! restore g1
         jmp     %l1                        ! transfer control and
Index: make/custom/leon3.cfg
===================================================================
RCS file: /usr1/CVS/rtems/make/custom/leon3.cfg,v
retrieving revision 1.2
diff -u -r1.2 leon3.cfg
--- make/custom/leon3.cfg	9 Jan 2006 15:09:55 -0000	1.2
+++ make/custom/leon3.cfg	15 Aug 2006 11:47:41 -0000
@@ -20,7 +20,7 @@
 # CPU_CFLAGS = -mno-v8 -mcypress $(MSOFT_FLOAT)
 #     -mcpu=cypress says to optimize for a Cypress 60x chipset
 #CPU_CFLAGS = -mcpu=cypress $(MSOFT_FLOAT)
-CPU_CFLAGS = -mcpu=cypress -msoft-float
+CPU_CFLAGS = -mcpu=v8 -msoft-float
 
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
