From 0c42b33a0b13a701615b1157e1849339441360ab Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 8 Dec 2017 11:55:30 +0100 Subject: [PATCH] winebuild: Add support for -mfloat-abi option. Signed-off-by: Alexandre Julliard --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 6 ++++++ tools/winebuild/winebuild.man.in | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index d365b565e23..90e8e34e44f 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -362,6 +362,7 @@ extern struct strarray ld_command; extern struct strarray nm_command; extern char *cpu_option; extern char *arch_option; +extern const char *float_abi_option; extern int thumb_mode; extern int needs_get_pc_thunk; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 09ebb348bb2..f4656f90515 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -89,6 +89,11 @@ struct strarray ld_command = { 0 }; struct strarray nm_command = { 0 }; char *cpu_option = NULL; char *arch_option = NULL; +#ifdef __SOFTFP__ +const char *float_abi_option = "soft"; +#else +const char *float_abi_option = "softfp"; +#endif #ifdef __thumb__ int thumb_mode = 1; @@ -408,6 +413,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_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 ); break; case 'M': diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 564f3128a6e..89865acab4a 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 +.BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option ,\ \-mfloat-abi= option Set code generation options for the assembler. .TP .BI \-M,\ --main-module= module