Fix the assembler's new .nop directive so that the input line pointer is preserved.

	* read.c (s_nop): Preserve the input_line_pointer around the call
	to md_assemble.
	* config/tc-s12z.c (md_assemble): Revert previous delta.

1 files changed, 3 insertions, 6 deletions

diff --git a/gas/config/tc-s12z.c b/gas/config/tc-s12z.c
index c79d2f43f16..d89fb0c21ff 100644
--- a/gas/config/tc-s12z.c
+++ b/gas/config/tc-s12z.c
@@ -3807,7 +3807,6 @@ md_assemble (char *str)
       return;
     }
 
-  char * saved_ilp = input_line_pointer;
   input_line_pointer = skip_whites (op_end);
 
   size_t i;
@@ -3817,17 +3816,15 @@ md_assemble (char *str)
       if (0 == strcmp (name, opc->name))
 	{
 	  if (opc->parse_operands (opc))
-	    {
-	      input_line_pointer = saved_ilp;
-	      return;
-	    }
+	    return;
 	  continue;
 	}
     }
 
   as_bad (_("Invalid instruction: \"%s\""), str);
   as_bad (_("First invalid token: \"%s\""), fail_line_pointer);
-  input_line_pointer = saved_ilp;
+  while (*input_line_pointer++)
+    ;
 }