Skip to content

W
wine-winehq
Commit 5e3e05e0 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

winapi_check: Extend support for '-arch=xxx' in spec files.

parent cf7c8a24
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
tools/winapi/winapi.pm
View file @ 5e3e05e0
...@@ -279,9 +279,10 @@ sub parse_spec_file($$) { ...@@ -279,9 +279,10 @@ sub parse_spec_file($$) {
} }
my $ordinal; my $ordinal;
my $ARCHES="alpha|i386|powerpc|sparc|x86_64";
if(/^(\d+|@)\s+ if(/^(\d+|@)\s+
(pascal|stdcall|cdecl|varargs)\s+ (pascal|stdcall|cdecl|varargs)\s+
((?:(?:-arch=(?:i386|x86_64)|-noname|-norelay|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*\(\s*(.*?)\s*\)\s*(\S*)$/x) ((?:(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*\(\s*(.*?)\s*\)\s*(\S*)$/x)
{ {
my $calling_convention = $2; my $calling_convention = $2;
my $flags = $3; my $flags = $3;
...@@ -396,7 +397,7 @@ sub parse_spec_file($$) { ...@@ -396,7 +397,7 @@ sub parse_spec_file($$) {
} }
} }
} }
} elsif(/^(\d+|@)\s+stub(?:\s+(-noname|-norelay|-i386|-ret16|-ret64|-private))?\s+(\S+)$/) { } elsif(/^(\d+|@)\s+stub(?:\s+(-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-i386|-ret16|-ret64|-private))?\s+(\S+)$/) {
$ordinal = $1; $ordinal = $1;
my $flags = $2; my $flags = $2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment