From 7f77d948db77f530657b9e3bfe4c59de5ea1f7e9 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Fri, 28 Jun 2013 07:19:44 +0000
Subject: [PATCH] * rx.c (SHIFT_OP): A shift by zero still sets the condition
 codes.

---
 sim/rx/ChangeLog | 5 +++++
 sim/rx/rx.c      | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index 39ee94dc6eb..d7bfa457c64 100644
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-25  Nick Clifton  <nickc@redhat.com>
+
+	* rx.c (SHIFT_OP): A shift by zero still sets the condition
+	codes.
+
 2013-06-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* aclocal.m4, configure: Regenerate.
diff --git a/sim/rx/rx.c b/sim/rx/rx.c
index e12aa85d2b6..dd886760aee 100644
--- a/sim/rx/rx.c
+++ b/sim/rx/rx.c
@@ -732,8 +732,7 @@ poppc()
       c = val & carry_mask; \
       val OP 1; \
     } \
-  if (count) \
-    set_oszc (val, 4, c); \
+  set_oszc (val, 4, c); \
   PD (val); \
 }
 
-- 
2.30.2