From: Konstantin Demin rockdrilla@gmail.com
Signed-off-by: Konstantin Demin rockdrilla@gmail.com --- tools/winegcc/winegcc.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 7458fb08773..537054ddeaf 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -175,6 +175,7 @@ static bool is_win16_app; static bool is_arm64x; static bool use_msvcrt; static bool use_pic = true; +static int use_lto = -1; /* tristate */ static bool use_build_id; static bool nostdinc; static bool nostdlib; @@ -348,6 +349,12 @@ static enum file_type get_lib_type(struct strarray path, const char *library, ch return file_na; }
+/* un-inline append_lto_flags() */ +static void append_lto_flags_winegcc( struct strarray *args, int with_lto, int prefer_env ) +{ + append_lto_flags( args, with_lto, prefer_env ); +} + static const char *find_binary( const char *name ) { char *file_name, *args; @@ -498,6 +505,7 @@ static struct strarray get_link_args( const char *output_name ) char *version;
strarray_addall( &link_args, linker_args ); + append_lto_flags_winegcc( &link_args, use_lto, 1 /* prefer flags from env */ );
if (verbose > 1) strarray_add( &flags, "-v" );
@@ -889,6 +897,11 @@ static void compile( struct strarray files, const char *output_name, int compile
if (!is_pe) strarray_addall( &comp_args, get_compat_defines( gcc_defs ));
+ if ((processor == proc_cc) || (processor == proc_cxx)) + { + append_lto_flags_winegcc( &comp_args, use_lto, 1 /* prefer flags from env */ ); + } + strarray_add(&comp_args, "-D__WINE__");
/* options we handle explicitly */ @@ -973,6 +986,7 @@ static struct strarray get_winebuild_args( const char *target ) strarray_add( &spec_args, binary ); if (verbose) strarray_add( &spec_args, "-v" ); if (keep_generated) strarray_add( &spec_args, "--save-temps" ); + append_lto_flags_winegcc( &spec_args, use_lto, 0 /* generic LTO flags */ ); if (target) { strarray_add( &spec_args, "--target" ); @@ -1739,6 +1753,10 @@ int main(int argc, char **argv) use_pic = true; else if (!strcmp("-fno-PIC", args.str[i]) || !strcmp("-fno-pic", args.str[i])) use_pic = false; + else if (!strcmp( "-flto", args.str[i] )) + use_lto = 1; + else if (!strcmp( "-fno-lto", args.str[i] )) + use_lto = 0; break; case 'i': if (!strcmp( "-isysroot", args.str[i] )) isysroot = args.str[i + 1]; @@ -2024,6 +2042,7 @@ int main(int argc, char **argv) strarray_add( &file_args, args.str[i] ); } } + verbose = adjust_verbose_lto( use_lto, verbose );
if (target_alias && !parse_target( target_alias, &target )) error( "Invalid target specification '%s'\n", target_alias );