From 366e433a76a8c6def7dbc6f572202728aebfa65f Mon Sep 17 00:00:00 2001 From: Xavier Leroy Date: Sat, 19 Dec 2015 18:57:46 +0100 Subject: clightgen: update to recent change -fstruct-return/-fstruct-passing --- exportclight/Clightgen.ml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'exportclight') diff --git a/exportclight/Clightgen.ml b/exportclight/Clightgen.ml index 5e8d77a7..a5d48a3f 100644 --- a/exportclight/Clightgen.ml +++ b/exportclight/Clightgen.ml @@ -106,7 +106,7 @@ let parse_c_file sourcename ifile = (* Simplification options *) let simplifs = "b" (* blocks: mandatory *) - ^ (if !option_fstruct_return then "s" else "") + ^ (if !option_fstruct_passing then "s" else "") ^ (if !option_fbitfields then "f" else "") ^ (if !option_fpacked_structs then "p" else "") in @@ -203,7 +203,9 @@ Preprocessing options: Language support options (use -fno- to turn off -f) : -fbitfields Emulate bit fields in structs [off] -flongdouble Treat 'long double' as 'double' [off] - -fstruct-return Emulate returning structs and unions by value [off] + -fstruct-passing Support passing structs and unions by value as function + results or function arguments [off] + -fstruct-return Like -fstruct-passing (deprecated) -fvararg-calls Emulate calls to variable-argument functions [on] -fpacked-structs Emulate packed structs [off] -fall Activate all language support options above @@ -221,7 +223,7 @@ let print_usage_and_exit _ = let language_support_options = [ option_fbitfields; option_flongdouble; - option_fstruct_return; option_fvararg_calls; option_funprototyped; + option_fstruct_passing; option_fvararg_calls; option_funprototyped; option_fpacked_structs; option_finline_asm ] @@ -260,7 +262,8 @@ let cmdline_actions = (* -f options: come in -f and -fno- variants *) (* Language support options *) @ f_opt "longdouble" option_flongdouble - @ f_opt "struct-return" option_fstruct_return + @ 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 -- cgit