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

[Francois Gouget]

---

I missed some architectures last time, and also that one can specify a 
comma-separated list of them.

 tools/winapi/winapi.pm |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm
index ae843a9..96e8641 100644
--- a/tools/winapi/winapi.pm
+++ b/tools/winapi/winapi.pm
@@ -289,9 +289,10 @@ sub parse_spec_file($$) {
 	}
 
 	my $ordinal;
+	my $ARCHES="alpha|i386|powerpc|sparc|x86_64";
 	if(/^(\d+|@)\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 $flags = $3;
@@ -405,7 +406,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;
 
 	    my $flags = $2;
-- 
1.5.6.5