diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-02-19 16:24:28 +0100 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-02-19 16:24:28 +0100 |
| commit | e51ffb6c1d9411515facc5e97a4e8dba5d8b55ab (patch) | |
| tree | 80a7fc8212d28712365082e1a2a2d0fa28cedad3 /cparser/Parser.vy | |
| parent | c130f4936bad11fd6dab3a5d142b870d2a5f650c (diff) | |
| parent | b0eb1dfc9fd7b15c556c49101390d882b0f00f8a (diff) | |
| download | compcert-e51ffb6c1d9411515facc5e97a4e8dba5d8b55ab.tar.gz compcert-e51ffb6c1d9411515facc5e97a4e8dba5d8b55ab.zip | |
Merge branch 'master' into no-shell
Diffstat (limited to 'cparser/Parser.vy')
| -rw-r--r-- | cparser/Parser.vy | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cparser/Parser.vy b/cparser/Parser.vy index ce1beae0..a058a8d1 100644 --- a/cparser/Parser.vy +++ b/cparser/Parser.vy @@ -822,6 +822,8 @@ jump_statement: asm_statement: | loc = ASM LPAREN template = STRING_LITERAL RPAREN SEMICOLON { let '(wide, chars, _) := template in ASM wide chars loc } +| loc = ASM VOLATILE LPAREN template = STRING_LITERAL RPAREN SEMICOLON + { let '(wide, chars, _) := template in ASM wide chars loc } (* 6.9 *) translation_unit_file: |