diff options
Diffstat (limited to 'gcc/d')
| -rw-r--r-- | gcc/d/dmd/MERGE | 2 | ||||
| -rw-r--r-- | gcc/d/dmd/iasmgcc.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE index feb6592..a3b2db7 100644 --- a/gcc/d/dmd/MERGE +++ b/gcc/d/dmd/MERGE @@ -1,4 +1,4 @@ -6d5b853d30908638d49210ebe600917296b8ab9b +cd2034cd7b157dd8f3e94c684061bb1aa630b2b6 The first line of this file holds the git revision number of the last merge done from the dlang/dmd repository. diff --git a/gcc/d/dmd/iasmgcc.c b/gcc/d/dmd/iasmgcc.c index 3c0494d..cecbdef 100644 --- a/gcc/d/dmd/iasmgcc.c +++ b/gcc/d/dmd/iasmgcc.c @@ -224,7 +224,7 @@ Lerror: static GccAsmStatement *parseGccAsm(Parser *p, GccAsmStatement *s) { s->insn = p->parseExpression(); - if (p->token.value == TOKsemicolon) + if (p->token.value == TOKsemicolon || p->token.value == TOKeof) goto Ldone; // No semicolon followed after instruction template, treat as extended asm. @@ -254,7 +254,7 @@ static GccAsmStatement *parseGccAsm(Parser *p, GccAsmStatement *s) assert(0); } - if (p->token.value == TOKsemicolon) + if (p->token.value == TOKsemicolon || p->token.value == TOKeof) goto Ldone; } Ldone: @@ -288,6 +288,7 @@ Statement *gccAsmSemantic(GccAsmStatement *s, Scope *sc) *ptoklist = NULL; } p.token = *toklist; + p.scanloc = s->loc; // Parse the gcc asm statement. s = parseGccAsm(&p, s); |