From: Konstantin Demin rockdrilla@gmail.com
Signed-off-by: Konstantin Demin rockdrilla@gmail.com --- tools/winebuild/build.h | 1 + tools/winebuild/import.c | 47 +++++++++++++++++++++++++++++++++++++--- tools/winebuild/main.c | 6 ++++- tools/winebuild/utils.c | 33 ++++++++++++++++++++++++++-- 4 files changed, 81 insertions(+), 6 deletions(-)
diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index e35bcc6ddb0..a059691e1bb 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -362,6 +362,7 @@ extern void put_pword( unsigned int val );
extern int current_line; extern int UsePIC; +extern int UseLTO; extern int nb_errors; extern int display_warnings; extern int kill_at; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index d4389a89cab..c5a9f4b3e63 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1237,11 +1237,31 @@ static const char *get_target_machine(void) /* build a library from the current asm files and any additional object files in argv */ void output_static_lib( const char *output_name, struct strarray files, int create ) { - struct strarray args; + struct strarray args = empty_strarray;
if (!create || target.platform != PLATFORM_WINDOWS) { - args = find_tool( "ar", NULL ); + static int _init_ar = 0; + static const char * _env_ar = NULL; + + if (!_init_ar) + { + if ((_env_ar = getenv( "WINE_AR" ))) + { + /* duplicate string if non-empty; otherwise set to NULL */ + _env_ar = (_env_ar[0]) ? xstrdup( _env_ar ) : NULL; + } + _init_ar = 1; + } + if (_env_ar) + { + const char * _cmd[2] = { _env_ar, NULL }; + args = find_tool( "ar", _cmd ); + } + if (!args.count) + { + args = find_tool( "ar", NULL ); + } strarray_add( &args, create ? "rc" : "r" ); strarray_add( &args, output_name ); } @@ -1259,7 +1279,28 @@ void output_static_lib( const char *output_name, struct strarray files, int crea
if (target.platform != PLATFORM_WINDOWS) { - struct strarray ranlib = find_tool( "ranlib", NULL ); + static int _init_ranlib = 0; + static const char * _env_ranlib = NULL; + struct strarray ranlib = empty_strarray; + + if (!_init_ranlib) + { + if ((_env_ranlib = getenv( "WINE_RANLIB" ))) + { + /* duplicate string if non-empty; otherwise set to NULL */ + _env_ranlib = (_env_ranlib[0]) ? xstrdup( _env_ranlib ) : NULL; + } + _init_ranlib = 1; + } + if (_env_ranlib) + { + const char * _cmd[2] = { _env_ranlib, NULL }; + ranlib = find_tool( "ranlib", _cmd ); + } + if (!ranlib.count) + { + ranlib = find_tool( "ranlib", NULL ); + } strarray_add( &ranlib, output_name ); spawn( ranlib ); } diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 33d871383ae..94dd10dea3a 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -34,6 +34,7 @@ #include "build.h"
int UsePIC = 0; +int UseLTO = -1; int nb_errors = 0; int display_warnings = 0; int native_arch = -1; @@ -187,7 +188,7 @@ static const char usage_str[] = " -e, --entry=FUNC Set the DLL entry point function (default: DllMain)\n" " -E, --export=FILE Export the symbols defined in the .spec or .def file\n" " --external-symbols Allow linking to external symbols\n" -" -f FLAGS Compiler flags (-fPIC and -fasynchronous-unwind-tables are supported)\n" +" -f FLAGS Compiler flags (-fPIC, -fasynchronous-unwind-tables and -flto are supported)\n" " -F, --filename=DLLFILE Set the DLL filename (default: from input file name)\n" " --fake-module Create a fake binary module\n" " -h, --help Display this help message\n" @@ -412,6 +413,8 @@ static void option_callback( int optc, char *optarg ) if (!strcmp( optarg, "PIC") || !strcmp( optarg, "pic")) UsePIC = 1; else if (!strcmp( optarg, "asynchronous-unwind-tables")) unwind_tables = 1; else if (!strcmp( optarg, "no-asynchronous-unwind-tables")) unwind_tables = 0; + else if (!strcmp( optarg, "lto" )) UseLTO = 1; + else if (!strcmp( optarg, "no-lto" )) UseLTO = 0; /* ignore all other flags */ break; case 'h': @@ -583,6 +586,7 @@ int main(int argc, char **argv) if (is_pe()) unwind_tables = 1;
files = parse_options( argc, argv, short_options, long_options, 0, option_callback ); + verbose = adjust_verbose_lto( UseLTO, verbose );
atexit( cleanup ); /* make sure we remove the output file on exit */
diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 5dde2825fd5..5d91f3a9a51 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -120,6 +120,12 @@ int output( const char *format, ... ) return ret; }
+/* un-inline append_lto_flags() */ +static void append_lto_flags_winebuild( struct strarray *args, int with_lto, int prefer_env ) +{ + return append_lto_flags( args, with_lto, prefer_env); +} + static struct strarray get_tools_path(void) { static int done; @@ -302,6 +308,8 @@ struct strarray get_as_command(void)
if (using_cc) { + /* disable LTO for assembly */ + append_lto_flags_winebuild( &args, (UseLTO >= 0) ? 0 : -1, 1 /* prefer flags from env */ ); strarray_add( &args, "-xassembler" ); strarray_add( &args, "-c" ); if (force_pointer_size) @@ -343,6 +351,7 @@ struct strarray get_ld_command(void) }
strarray_addall( &args, ld_command ); + append_lto_flags_winebuild( &args, UseLTO, 1 /* prefer flags from env */ );
if (force_pointer_size) { @@ -374,8 +383,28 @@ const char *get_nm_command(void) { if (!nm_command.count) { - static const char * const commands[] = { "nm", "gnm", NULL }; - nm_command = find_tool( "nm", commands ); + static int _init_nm = 0; + static const char * _env_nm = NULL; + + if (!_init_nm) + { + if ((_env_nm = getenv( "WINE_NM" ))) + { + /* duplicate string if non-empty; otherwise set to NULL */ + _env_nm = (_env_nm[0]) ? xstrdup( _env_nm ) : NULL; + } + _init_nm = 1; + } + if (_env_nm) + { + const char * _cmd[2] = { _env_nm, NULL }; + nm_command = find_tool( "nm", _cmd ); + } + if (!nm_command.count) + { + static const char * const commands[] = { "nm", "gnm", NULL }; + nm_command = find_tool( "nm", commands ); + } } if (nm_command.count > 1) fatal_error( "multiple arguments in nm command not supported yet\n" );