diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2021-09-30 13:23:42 +0200 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2021-09-30 13:23:42 +0200 |
| commit | ef508dae3e880bdd30e9d57ca2a8b3e257b1203b (patch) | |
| tree | 0cb08c27aeef48ca154525378419f5b129793b2b /driver | |
| parent | dbada6c41e51a03848b14260576ba825c3102313 (diff) | |
| parent | 539b81a1a8823fb4aac64a9493bf0bafea2f2560 (diff) | |
| download | compcert-kvx-ef508dae3e880bdd30e9d57ca2a8b3e257b1203b.tar.gz compcert-kvx-ef508dae3e880bdd30e9d57ca2a8b3e257b1203b.zip | |
Merge branch 'towards_2.10' of ../towards_3.10 into kvx-work
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/Clflags.ml | 1 | ||||
| -rw-r--r-- | driver/CommonOptions.ml | 8 | ||||
| -rw-r--r-- | driver/Frontend.ml | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/driver/Clflags.ml b/driver/Clflags.ml index 25bd2c78..6511087b 100644 --- a/driver/Clflags.ml +++ b/driver/Clflags.ml @@ -17,7 +17,6 @@ let linker_options = ref ([]: string list) let assembler_options = ref ([]: string list) let option_flongdouble = ref (Configuration.arch = "kvx") let option_fstruct_passing = ref false -let option_fbitfields = ref false let option_fvararg_calls = ref true let option_funprototyped = ref true let option_fpacked_structs = ref false diff --git a/driver/CommonOptions.ml b/driver/CommonOptions.ml index a816dd41..9da1e533 100644 --- a/driver/CommonOptions.ml +++ b/driver/CommonOptions.ml @@ -32,7 +32,7 @@ let version_options tool_name = (* Language support options *) let all_language_support_options = [ - option_fbitfields; option_flongdouble; + option_flongdouble; option_fstruct_passing; option_fvararg_calls; option_funprototyped; option_fpacked_structs; option_finline_asm ] @@ -44,11 +44,11 @@ let unset_all opts () = List.iter (fun r -> r := false) opts let language_support_options = [ Exact "-fall", Unit (set_all all_language_support_options); - Exact "-fnone", Unit (unset_all all_language_support_options);] + Exact "-fnone", Unit (unset_all all_language_support_options); + Exact "-fbitfields", Unit (fun () -> ()); ] @ f_opt "longdouble" option_flongdouble @ f_opt "struct-return" option_fstruct_passing @ f_opt "struct-passing" option_fstruct_passing - @ f_opt "bitfields" option_fbitfields @ f_opt "vararg-calls" option_fvararg_calls @ f_opt "unprototyped" option_funprototyped @ f_opt "packed-structs" option_fpacked_structs @@ -56,7 +56,6 @@ let language_support_options = let language_support_help = {|Language support options (use -fno-<opt> to turn off -f<opt>) : - -fbitfields Emulate bit fields in structs [off] -flongdouble Treat 'long double' as 'double' [off] -fstruct-passing Support passing structs and unions by value as function results or function arguments [off] @@ -67,6 +66,7 @@ let language_support_help = -finline-asm Support inline 'asm' statements [off] -fall Activate all language support options above -fnone Turn off all language support options above + -fbitfields Ignored (bit fields are now implemented natively) |} (* General options *) diff --git a/driver/Frontend.ml b/driver/Frontend.ml index 480932df..ecf3d6a5 100644 --- a/driver/Frontend.ml +++ b/driver/Frontend.ml @@ -80,7 +80,6 @@ let parse_c_file sourcename ifile = let simplifs = "b" (* blocks: mandatory *) ^ (if !option_fstruct_passing then "s" else "") - ^ (if !option_fbitfields then "f" else "") ^ (if !option_fpacked_structs then "p" else "") in (* Parsing and production of a simplified C AST *) |