ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winebuild: Pass the -mfpu option to the compiler/assembler. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-11-05 20:20:25 +01:00
parent 03fd289bed
commit 0fd533836b
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/winebuild/build.h
View File

@ -361,6 +361,7 @@ extern struct strarray cc_command;
extern struct strarray ld_command; extern struct strarray ld_command;
extern struct strarray nm_command; extern struct strarray nm_command;
extern char *cpu_option; extern char *cpu_option;
extern char *fpu_option;
extern char *arch_option; extern char *arch_option;
extern const char *float_abi_option; extern const char *float_abi_option;
extern int thumb_mode; extern int thumb_mode;

2
tools/winebuild/main.c
View File

@ -88,6 +88,7 @@ struct strarray cc_command = { 0 };
struct strarray ld_command = { 0 }; struct strarray ld_command = { 0 };
struct strarray nm_command = { 0 }; struct strarray nm_command = { 0 };
char *cpu_option = NULL; char *cpu_option = NULL;
char *fpu_option = NULL;
char *arch_option = NULL; char *arch_option = NULL;
#ifdef __SOFTFP__ #ifdef __SOFTFP__
const char *float_abi_option = "soft"; const char *float_abi_option = "soft";
@ -412,6 +413,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec )
else if (!strcmp( optarg, "arm" )) thumb_mode = 0; else if (!strcmp( optarg, "arm" )) thumb_mode = 0;
else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strcmp( optarg, "thumb" )) thumb_mode = 1;
else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 );
else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 );
else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 );
else if (!strncmp( optarg, "float-abi=", 10 )) float_abi_option = xstrdup( optarg + 10 ); else if (!strncmp( optarg, "float-abi=", 10 )) float_abi_option = xstrdup( optarg + 10 );
else fatal_error( "Unknown -m option '%s'\n", optarg ); else fatal_error( "Unknown -m option '%s'\n", optarg );

2
tools/winebuild/utils.c
View File

@ -386,6 +386,7 @@ struct strarray get_as_command(void)
if (force_pointer_size) if (force_pointer_size)
strarray_add_one( &args, (force_pointer_size == 8) ? "-m64" : "-m32" ); strarray_add_one( &args, (force_pointer_size == 8) ? "-m64" : "-m32" );
if (cpu_option) strarray_add_one( &args, strmake("-mcpu=%s", cpu_option) ); if (cpu_option) strarray_add_one( &args, strmake("-mcpu=%s", cpu_option) );
if (fpu_option) strarray_add_one( &args, strmake("-mfpu=%s", fpu_option) );
if (arch_option) strarray_add_one( &args, strmake("-march=%s", arch_option) ); if (arch_option) strarray_add_one( &args, strmake("-march=%s", arch_option) );
return args; return args;
} }
@ -420,6 +421,7 @@ struct strarray get_as_command(void)
} }
if (cpu_option) strarray_add_one( &args, strmake("-mcpu=%s", cpu_option) ); if (cpu_option) strarray_add_one( &args, strmake("-mcpu=%s", cpu_option) );
if (fpu_option) strarray_add_one( &args, strmake("-mfpu=%s", fpu_option) );
return args; return args;
} }

2
tools/winebuild/winebuild.man.in
View File

@ -156,7 +156,7 @@ option.
.B \-m16, -m32, -m64 .B \-m16, -m32, -m64
Generate respectively 16-bit, 32-bit or 64-bit code. Generate respectively 16-bit, 32-bit or 64-bit code.
.TP .TP
.BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option ,\ \-mfloat-abi= option .BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option ,\ \-mfpu= option ,\ \-mfloat-abi= option
Set code generation options for the assembler. Set code generation options for the assembler.
.TP .TP
.BI \-M,\ --main-module= module .BI \-M,\ --main-module= module