diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-01-12 14:20:31 +0100 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-01-12 14:20:31 +0100 |
| commit | 81e91f965e7b1afbea8d1630015e75f11f0a3afd (patch) | |
| tree | 270a85299f33d783e33745c917796f080f7300e1 /cparser/pre_parser.mly | |
| parent | 3304820b870e4524c7d1f14fcd62506634f7922b (diff) | |
| parent | 06841a5bb7ca27bc436e87e7991d0d05dbf5267c (diff) | |
| download | compcert-81e91f965e7b1afbea8d1630015e75f11f0a3afd.tar.gz compcert-81e91f965e7b1afbea8d1630015e75f11f0a3afd.zip | |
Merge branch 'master' into dwarf
Conflicts:
powerpc/PrintAsm.ml
Diffstat (limited to 'cparser/pre_parser.mly')
| -rw-r--r-- | cparser/pre_parser.mly | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cparser/pre_parser.mly b/cparser/pre_parser.mly index 4755518b..ef356d3a 100644 --- a/cparser/pre_parser.mly +++ b/cparser/pre_parser.mly @@ -616,7 +616,7 @@ jump_statement: {} asm_statement: -| ASM LPAREN string_literals_list RPAREN SEMICOLON +| ASM VOLATILE? LPAREN string_literals_list RPAREN SEMICOLON {} translation_unit_file: |