diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 82639d835065031d7982e3535b22dd842d635b0b..b8dcf2a8426a71b6740232a68c65bea17b973336 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* score-dis.c (print_insn_score48, print_insn_score32): Move default
+	case label to proper lexical block.
+	* score7-dis.c (print_insn_score32): Likewise.
+
 2009-06-19  Martin Schwidefsky  <sschwidefsky@de.ibm.com>
 
 	* s390-opc.c (INSTR_RR_0R_OPT, INSTR_RX_0RRD_OPT, MASK_RR_0R_OPT,
diff --git a/opcodes/score-dis.c b/opcodes/score-dis.c
index 02405e44bf0b1b4f262719ee102018ee3a1216b1..900c1c131fa0a4d3053f8cd75fdf47a590e917c2 100644
--- a/opcodes/score-dis.c
+++ b/opcodes/score-dis.c
@@ -646,10 +646,9 @@ print_insn_score48 (struct disassemble_info *info, bfd_vma given)
                             abort ();
                           }
                         break;
-
-                    default:
-                        abort ();
                       }
+                    default:
+		      abort ();
                     }
                 }
               else
@@ -854,10 +853,9 @@ print_insn_score32 (bfd_vma pc, struct disassemble_info *info, long given)
                             abort ();
                           }
                         break;
-
-                    default:
-                        abort ();
                       }
+                    default:
+		      abort ();
                     }
                 }
               else
diff --git a/opcodes/score7-dis.c b/opcodes/score7-dis.c
index 70ff637d62c4c4bbc539d7bbf914ebb2ed0d7db4..b48d1786b772e45807208fe1e943d49a8c7eef63 100644
--- a/opcodes/score7-dis.c
+++ b/opcodes/score7-dis.c
@@ -678,10 +678,9 @@ print_insn_score32 (bfd_vma pc, struct disassemble_info *info, long given)
                             abort ();
                           }
                         break;
-
-                    default:
-                        abort ();
                       }
+                    default:
+		      abort ();
                     }
                 }
               else