diff --git a/gas/ChangeLog b/gas/ChangeLog
index e018505c43..ce56b30fc6 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-09  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* config/tc-mips.c (macro)
+	<M_MSGSND, M_MSGLD, M_MSGLD_T, M_MSGWAIT, M_MSGWAIT_T>: Remove
+	dedicated return points.
+
 2010-12-09  Maciej W. Rozycki  <macro@codesourcery.com>
 
 	* config/tc-mips.c (macro) <M_DEXT, M_DINS>: Correct types used
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 045cf87de6..0473b10d44 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -6144,37 +6144,32 @@ macro (struct mips_cl_insn *ip)
 	unsigned long temp = (treg << 16) | (0x01);
 	macro_build (NULL, "c2", "C", temp);
       }
-      /* AT is not used, just return */
-      return;
+      break;
 
     case M_MSGLD:
       {
 	unsigned long temp = (0x02);
 	macro_build (NULL, "c2", "C", temp);
       }
-      /* AT is not used, just return */
-      return;
+      break;
 
     case M_MSGLD_T:
       {
 	unsigned long temp = (treg << 16) | (0x02);
 	macro_build (NULL, "c2", "C", temp);
       }
-      /* AT is not used, just return */
-      return;
+      break;
 
     case M_MSGWAIT:
       macro_build (NULL, "c2", "C", 3);
-      /* AT is not used, just return */
-      return;
+      break;
 
     case M_MSGWAIT_T:
       {
 	unsigned long temp = (treg << 16) | 0x03;
 	macro_build (NULL, "c2", "C", temp);
       }
-      /* AT is not used, just return */
-      return;
+      break;
 
     case M_J_A:
       /* The j instruction may not be used in PIC code, since it