aboutsummaryrefslogtreecommitdiffstats
path: root/driver/Driver.ml
diff options
context:
space:
mode:
authorBernhard Schommer <bernhardschommer@gmail.com>2015-09-01 09:57:01 +0200
committerBernhard Schommer <bernhardschommer@gmail.com>2015-09-01 09:57:01 +0200
commit951963b380f1ff1e0b55f8303e4ae098cedb3cb5 (patch)
tree6cc793efe8fc8d2950d7b313bfde79b2ecf40d24 /driver/Driver.ml
parent7cfaf10b604372044f53cb65b03df33c23f8b26d (diff)
parent3324ece265091490d5380caf753d76aeee059d3f (diff)
downloadcompcert-951963b380f1ff1e0b55f8303e4ae098cedb3cb5.tar.gz
compcert-951963b380f1ff1e0b55f8303e4ae098cedb3cb5.zip
Merge branch 'new-builtins'
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