From 0b2bcb1814eedf6cee7ccb63b21d7ce894f2ae15 Mon Sep 17 00:00:00 2001 From: Greg Menke Date: Mon, 3 Jan 2005 17:41:22 +0000 Subject: PR 737 --- cpukit/score/cpu/mips/ChangeLog | 5 +++++ cpukit/score/cpu/mips/cpu_asm.S | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'cpukit') diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog index f61d26053f..c645e83917 100644 --- a/cpukit/score/cpu/mips/ChangeLog +++ b/cpukit/score/cpu/mips/ChangeLog @@ -1,3 +1,8 @@ +2005-01-03 Greg Menke + PR 737 + * cpu_asm.S: Fixes gcc warning about instructions in branch delay + slot when compiling cpu_asm.S + 2005-01-01 Ralf Corsepius * Makefile.am: Remove build-variant support. diff --git a/cpukit/score/cpu/mips/cpu_asm.S b/cpukit/score/cpu/mips/cpu_asm.S index 081883fb7a..21d72b4b65 100644 --- a/cpukit/score/cpu/mips/cpu_asm.S +++ b/cpukit/score/cpu/mips/cpu_asm.S @@ -455,6 +455,7 @@ FRAME(_CPU_Context_switch,sp,0,ra) NOP LDREG t0,R_EPC*R_SZ(t1) /* get the userspace EPC from the frame */ b 2f + nop 1: la t0,_Thread_Dispatch /* if ==0, we're switched out */ @@ -878,7 +879,7 @@ _ISR_Handler_1: /* Then where did it come from??? */ beq t0,zero,_ISR_Handler_exit - + nop -- cgit v1.2.3