system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

winebuild: Remove ARM code generation option.

Browse source 
They are not needed for PE builds.
This commit is contained in:
Alexandre Julliard 2024-02-23 12:02:17 +01:00
parent 0c0d181551
commit af64a8bb5c
3 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/winebuild/build.h
View file

@ -392,8 +392,6 @@ extern struct strarray nm_command;
extern char *cpu_option; extern char *cpu_option;
extern char *fpu_option; extern char *fpu_option;
extern char *arch_option; extern char *arch_option;
extern const char *float_abi_option;
extern int thumb_mode;
extern int needs_get_pc_thunk; extern int needs_get_pc_thunk;
#endif /* __WINE_BUILD_H */ #endif /* __WINE_BUILD_H */

15
tools/winebuild/main.c
View file

@ -69,17 +69,6 @@ struct strarray nm_command = { 0 };
char *cpu_option = NULL; char *cpu_option = NULL;
char *fpu_option = NULL; char *fpu_option = NULL;
char *arch_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;
#else
int thumb_mode = 0;
#endif
static struct strarray res_files; static struct strarray res_files;
@ -164,7 +153,6 @@ static void set_target( const char *name )
target_alias = xstrdup( name ); target_alias = xstrdup( name );
if (!parse_target( name, &target )) fatal_error( "Unrecognized target '%s'\n", name ); if (!parse_target( name, &target )) fatal_error( "Unrecognized target '%s'\n", name );
thumb_mode = target.cpu == CPU_ARM && is_pe();
if (is_pe()) unwind_tables = 1; if (is_pe()) unwind_tables = 1;
} }
@ -396,14 +384,11 @@ static void option_callback( int optc, char *optarg )
if (!strcmp( optarg, "16" )) main_spec->type = SPEC_WIN16; if (!strcmp( optarg, "16" )) main_spec->type = SPEC_WIN16;
else if (!strcmp( optarg, "32" )) force_pointer_size = 4; else if (!strcmp( optarg, "32" )) force_pointer_size = 4;
else if (!strcmp( optarg, "64" )) force_pointer_size = 8; else if (!strcmp( optarg, "64" )) force_pointer_size = 8;
else if (!strcmp( optarg, "arm" )) thumb_mode = 0;
else if (!strcmp( optarg, "thumb" )) thumb_mode = 1;
else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1;
else if (!strcmp( optarg, "unicode" )) main_spec->unicode_app = 1; else if (!strcmp( optarg, "unicode" )) main_spec->unicode_app = 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, "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 fatal_error( "Unknown -m option '%s'\n", optarg ); else fatal_error( "Unknown -m option '%s'\n", optarg );
break; break;
case 'M': case 'M':

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

@ -179,7 +179,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 ,\ \-mfpu= option ,\ \-mfloat-abi= option .BI \-march= option ,\ \-mcpu= option ,\ \-mfpu= option
Set code generation options for the assembler. Set code generation options for the assembler.
.TP .TP
.B \-mno-cygwin .B \-mno-cygwin