Module: wine Branch: master Commit: 0fd533836b8cdea8b9a6af667bb3c1ffd053b3f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fd533836b8cdea8b9a6af667...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Nov 5 20:20:25 2018 +0100
winebuild: Pass the -mfpu option to the compiler/assembler.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
tools/winebuild/build.h | 1 + tools/winebuild/main.c | 2 ++ tools/winebuild/utils.c | 2 ++ tools/winebuild/winebuild.man.in | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 90e8e34..fbc2cd9 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -361,6 +361,7 @@ extern struct strarray cc_command; extern struct strarray ld_command; extern struct strarray nm_command; extern char *cpu_option; +extern char *fpu_option; extern char *arch_option; extern const char *float_abi_option; extern int thumb_mode; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index f4656f9..70f381c 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -88,6 +88,7 @@ struct strarray cc_command = { 0 }; struct strarray ld_command = { 0 }; struct strarray nm_command = { 0 }; char *cpu_option = NULL; +char *fpu_option = NULL; char *arch_option = NULL; #ifdef __SOFTFP__ 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, "thumb" )) thumb_mode = 1; 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, "float-abi=", 10 )) float_abi_option = xstrdup( optarg + 10 ); else fatal_error( "Unknown -m option '%s'\n", optarg ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 6e01f1a..95da175 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -386,6 +386,7 @@ struct strarray get_as_command(void) if (force_pointer_size) strarray_add_one( &args, (force_pointer_size == 8) ? "-m64" : "-m32" ); 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) ); 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 (fpu_option) strarray_add_one( &args, strmake("-mfpu=%s", fpu_option) ); return args; }
diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 89865ac..51ad544 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -156,7 +156,7 @@ option. .B -m16, -m32, -m64 Generate respectively 16-bit, 32-bit or 64-bit code. .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. .TP .BI -M,\ --main-module= module