[binutils-gdb] gas: adjust impossible/bogus M68K/MRI special case when scrubbing

[Jan Beulich]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=fd05d6b739fd06bbd993e6a673841977d33dd763

commit fd05d6b739fd06bbd993e6a673841977d33dd763
Author: Jan Beulich <jbeulich@suse.com>
Date:   Fri Jul 19 11:54:45 2024 +0200

    gas: adjust impossible/bogus M68K/MRI special case when scrubbing
    
    State 1 is uniformly handled further up. And it is highly questionable
    that in state 10 (i.e. after having seen not only a possible label, but
    also an opcode), which is about to go away anyway, a line comment char
    could still be meant to take effect. With the state checking dropped,
    the immediately preceding logic can then also be simplified.

Diff:
---
 gas/app.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/gas/app.c b/gas/app.c
index e580e0f8e58..6a3efb1f687 100644
--- a/gas/app.c
+++ b/gas/app.c
@@ -1368,14 +1368,10 @@ do_scrub_chars (size_t (*get) (char *, size_t), char *tostart, size_t tolen,
 	     start of a line.  If this is also a normal comment
 	     character, fall through.  Otherwise treat it as a default
 	     character.  */
-	  if (strchr (tc_comment_chars, ch) == NULL
-	      && (! scrub_m68k_mri
-		  || (ch != '!' && ch != '*')))
+	  if (strchr (tc_comment_chars, ch) == NULL)
 	    goto de_fault;
 	  if (scrub_m68k_mri
-	      && (ch == '!' || ch == '*' || ch == '#')
-	      && state != 1
-	      && state != 10)
+	      && (ch == '!' || ch == '*' || ch == '#'))
 	    goto de_fault;
 	  /* Fall through.  */
 	case LEX_IS_COMMENT_START: