[backport r177669 to fix PR50018 regression on M68K from r177218 <mikpe@it.uu.se>]

gcc/

2011-08-11  Richard Henderson  <rth@redhat.com>

	PR bootstrap/50018
	* expr.c (fixup_args_size_notes): Accept and ignore normal calls.

--- gcc-4.7-20110806/gcc/expr.c.~1~	2011-08-05 18:12:16.000000000 +0200
+++ gcc-4.7-20110806/gcc/expr.c	2011-08-27 12:51:43.000000000 +0200
@@ -3567,8 +3567,10 @@ fixup_args_size_notes (rtx prev, rtx las
       /* Look for a call_pop pattern.  */
       if (CALL_P (insn))
 	{
-	  /* We're not supposed to see non-pop call patterns here.  */
-	  gcc_assert (GET_CODE (pat) == PARALLEL);
+          /* We have to allow non-call_pop patterns for the case
+	     of emit_single_push_insn of a TLS address.  */
+	  if (GET_CODE (pat) != PARALLEL)
+	    continue;
 
 	  /* All call_pop have a stack pointer adjust in the parallel.
 	     The call itself is always first, and the stack adjust is
@@ -3583,7 +3585,8 @@ fixup_args_size_notes (rtx prev, rtx las
 		break;
 	    }
 	  /* We'd better have found the stack pointer adjust.  */
-	  gcc_assert (i > 0);
+	  if (i == 0)
+	    continue;
 	  /* Fall through to process the extracted SET and DEST
 	     as if it was a standalone insn.  */
 	}