diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-07-19 18:59:44 +0200 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-07-19 18:59:44 +0200 |
| commit | 4c379d48b35e7c8156f3953fede31d5e47faf8ca (patch) | |
| tree | fa19eb30178fcf74b0768d9f5df4017ab6afc770 /driver/Driver.ml | |
| parent | 3b79923a6c9fa8c76916df1eecfdecd7ae2124a5 (diff) | |
| download | compcert-kvx-4c379d48b35e7c8156f3953fede31d5e47faf8ca.tar.gz compcert-kvx-4c379d48b35e7c8156f3953fede31d5e47faf8ca.zip | |
helpers broke compilation
Diffstat (limited to 'driver/Driver.ml')
| -rw-r--r-- | driver/Driver.ml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/driver/Driver.ml b/driver/Driver.ml index 05d51402..288bb436 100644 --- a/driver/Driver.ml +++ b/driver/Driver.ml @@ -258,11 +258,7 @@ let dump_mnemonics destfile = let optimization_options = [ option_ftailcalls; option_fifconversion; option_fconstprop; option_fcse; -<<<<<<< HEAD option_fpostpass; option_fredundancy; option_finline_functions_called_once; -======= - option_fredundancy; option_finline; option_finline_functions_called_once; ->>>>>>> 91381b65f5aa76e5195caae9ef331b3f5f95afaf ] let set_all opts () = List.iter (fun r -> r := true) opts |