diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index 959b606a17966ce7d45dd874b61e5a1f6d7f6b03..93a517f484cb8cd82136ff59966706cd138f4ab5 100644
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -379,9 +379,6 @@ static inline void gen_cc_C_add_xcc(TCGv dst, TCGv src1)
 static inline void gen_cc_V_add_icc(TCGv dst, TCGv src1, TCGv src2)
 {
     TCGv r_temp;
-    int l1;
-
-    l1 = gen_new_label();
 
     r_temp = tcg_temp_new(TCG_TYPE_TL);
     tcg_gen_xor_tl(r_temp, src1, src2);
@@ -389,18 +386,15 @@ static inline void gen_cc_V_add_icc(TCGv dst, TCGv src1, TCGv src2)
     tcg_gen_xor_tl(cpu_tmp0, src1, dst);
     tcg_gen_and_tl(r_temp, r_temp, cpu_tmp0);
     tcg_gen_andi_tl(r_temp, r_temp, (1 << 31));
-    tcg_gen_brcond_tl(TCG_COND_EQ, r_temp, tcg_const_tl(0), l1);
-    tcg_gen_ori_i32(cpu_psr, cpu_psr, PSR_OVF);
-    gen_set_label(l1);
+    tcg_gen_shri_tl(r_temp, r_temp, 31 - PSR_OVF_SHIFT);
+    tcg_gen_trunc_tl_i32(cpu_tmp32, r_temp);
+    tcg_gen_or_i32(cpu_psr, cpu_psr, cpu_tmp32);
 }
 
 #ifdef TARGET_SPARC64
 static inline void gen_cc_V_add_xcc(TCGv dst, TCGv src1, TCGv src2)
 {
     TCGv r_temp;
-    int l1;
-
-    l1 = gen_new_label();
 
     r_temp = tcg_temp_new(TCG_TYPE_TL);
     tcg_gen_xor_tl(r_temp, src1, src2);
@@ -408,9 +402,9 @@ static inline void gen_cc_V_add_xcc(TCGv dst, TCGv src1, TCGv src2)
     tcg_gen_xor_tl(cpu_tmp0, src1, dst);
     tcg_gen_and_tl(r_temp, r_temp, cpu_tmp0);
     tcg_gen_andi_tl(r_temp, r_temp, (1ULL << 63));
-    tcg_gen_brcond_tl(TCG_COND_EQ, r_temp, tcg_const_tl(0), l1);
-    tcg_gen_ori_i32(cpu_xcc, cpu_xcc, PSR_OVF);
-    gen_set_label(l1);
+    tcg_gen_shri_tl(r_temp, r_temp, 63 - PSR_OVF_SHIFT);
+    tcg_gen_trunc_tl_i32(cpu_tmp32, r_temp);
+    tcg_gen_or_i32(cpu_xcc, cpu_xcc, cpu_tmp32);
 }
 #endif
 
@@ -570,36 +564,30 @@ static inline void gen_cc_C_sub_xcc(TCGv src1, TCGv src2)
 static inline void gen_cc_V_sub_icc(TCGv dst, TCGv src1, TCGv src2)
 {
     TCGv r_temp;
-    int l1;
-
-    l1 = gen_new_label();
 
     r_temp = tcg_temp_new(TCG_TYPE_TL);
     tcg_gen_xor_tl(r_temp, src1, src2);
     tcg_gen_xor_tl(cpu_tmp0, src1, dst);
     tcg_gen_and_tl(r_temp, r_temp, cpu_tmp0);
     tcg_gen_andi_tl(r_temp, r_temp, (1 << 31));
-    tcg_gen_brcond_tl(TCG_COND_EQ, r_temp, tcg_const_tl(0), l1);
-    tcg_gen_ori_i32(cpu_psr, cpu_psr, PSR_OVF);
-    gen_set_label(l1);
+    tcg_gen_shri_tl(r_temp, r_temp, 31 - PSR_OVF_SHIFT);
+    tcg_gen_trunc_tl_i32(cpu_tmp32, r_temp);
+    tcg_gen_or_i32(cpu_psr, cpu_psr, cpu_tmp32);
 }
 
 #ifdef TARGET_SPARC64
 static inline void gen_cc_V_sub_xcc(TCGv dst, TCGv src1, TCGv src2)
 {
     TCGv r_temp;
-    int l1;
-
-    l1 = gen_new_label();
 
     r_temp = tcg_temp_new(TCG_TYPE_TL);
     tcg_gen_xor_tl(r_temp, src1, src2);
     tcg_gen_xor_tl(cpu_tmp0, src1, dst);
     tcg_gen_and_tl(r_temp, r_temp, cpu_tmp0);
     tcg_gen_andi_tl(r_temp, r_temp, (1ULL << 63));
-    tcg_gen_brcond_tl(TCG_COND_EQ, r_temp, tcg_const_tl(0), l1);
-    tcg_gen_ori_i32(cpu_xcc, cpu_xcc, PSR_OVF);
-    gen_set_label(l1);
+    tcg_gen_shri_tl(r_temp, r_temp, 63 - PSR_OVF_SHIFT);
+    tcg_gen_trunc_tl_i32(cpu_tmp32, r_temp);
+    tcg_gen_or_i32(cpu_xcc, cpu_xcc, cpu_tmp32);
 }
 #endif