(rescan): Expand `#if foo && #bar' without a bogus complaint about preprocessor direc...

(rescan): Expand `#if foo && #bar' without a bogus complaint about preprocessor
directives within macro args.
Expand `foo' in `foo#bar' without requiring a space before `#'.

From-SVN: r10412

diff --git a/gcc/cccp.c b/gcc/cccp.c
index 9ae8fd0ab0b7a94c0cbc86211821bdd246c35aa6..64f5f757b40b0660174cb789eb1be1f62b99706d 100644 (file)
--- a/gcc/cccp.c
+++ b/gcc/cccp.c
@@ -2770,6 +2770,8 @@ do { ip = &instack[indepth];              \
 
     case '#':
       if (assertions_flag) {
+       if (ident_length)
+         goto specialchar;
        /* Copy #foo (bar lose) without macro expansion.  */
        obp[-1] = '#';  /* In case it was '%'. */
        SKIP_WHITE_SPACE (ibp);
@@ -2783,6 +2785,7 @@ do { ip = &instack[indepth];              \
          obp += ip->bufp - ibp;
          ibp = ip->bufp;
        }
+       break;
       }
 
       /* If this is expanding a macro definition, don't recognize