diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d9470a2645..a92ac23344 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-14  Thiemo Seufer  <ths@mips.com>
+
+	* elfxx-mips.c (mips_elf_merge_obj_attributes): Prevent
+	unwanted fallthroughs in case statement.
+
 2007-11-13  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR binutils/5307
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 217cd9207b..73959f167e 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -11073,6 +11073,7 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd)
 		_bfd_error_handler
 		  (_("Warning: %B uses -msingle-float, %B uses -mdouble-float"),
 		   obfd, ibfd);
+		break;
 
 	      case 3:
 		_bfd_error_handler
@@ -11092,6 +11093,7 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd)
 		_bfd_error_handler
 		  (_("Warning: %B uses -msingle-float, %B uses -mdouble-float"),
 		   ibfd, obfd);
+		break;
 
 	      case 3:
 		_bfd_error_handler