aboutsummaryrefslogtreecommitdiffstats
path: root/driver/Driver.ml
diff options
context:
space:
mode:
authorBernhard Schommer <bernhardschommer@gmail.com>2015-09-06 19:38:53 +0200
committerBernhard Schommer <bernhardschommer@gmail.com>2015-09-06 19:38:53 +0200
commitdba05a9f6259c82a350987b511bf1a71f113d0ba (patch)
tree6e7fee8d65b6a180447267da9a95a93827443caf /driver/Driver.ml
parent108db39b8b7c1d42cbc38c5aabf885ef5440f189 (diff)
parent47d0e5256ab79b402faae14260fa2fabc1d24dcb (diff)
downloadcompcert-dba05a9f6259c82a350987b511bf1a71f113d0ba.tar.gz
compcert-dba05a9f6259c82a350987b511bf1a71f113d0ba.zip
X
Merge branch 'master' into debug_locations
Diffstat (limited to 'driver/Driver.ml')
-rw-r--r--driver/Driver.ml6
1 files changed, 4 insertions, 2 deletions
diff --git a/driver/Driver.ml b/driver/Driver.ml
index b646dc83..f53de821 100644
--- a/driver/Driver.ml
+++ b/driver/Driver.ml
@@ -179,9 +179,11 @@ let compile_c_ast sourcename csyntax ofile debug =
set_dest PrintMach.destination option_dmach ".mach";
(* Convert to Asm *)
let asm =
- match Compiler.transf_c_program csyntax with
+ match Compiler.apply_partial
+ (Compiler.transf_c_program csyntax)
+ Asmexpand.expand_program with
| Errors.OK asm ->
- Asmexpand.expand_program asm
+ asm
| Errors.Error msg ->
eprintf "%s: %a" sourcename print_error msg;
exit 2 in