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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5e3e05e04302cb57a48cf4408689bfeddeec3930
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5e3e05e04302cb57a48cf44086...

Author: Francois Gouget 
Date:   Wed Dec 17 10:28:29 2008 +0100

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

---

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 87339ac..f5279e1 100644
--- a/tools/winapi/winapi.pm
+++ b/tools/winapi/winapi.pm
@@ -279,9 +279,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;
@@ -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;

my $flags = $2;