Alexandre Julliard : winebuild: Don' t add extra CPU flags to stubs if they have some already.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Sep 15 12:45:04 2010 -0500

winebuild: Don't add extra CPU flags to stubs if they have some already.

---

 tools/winebuild/parser.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c
index bc483c9..755084e 100644
--- a/tools/winebuild/parser.c
+++ b/tools/winebuild/parser.c
@@ -385,7 +385,11 @@ static int parse_spec_stub( ORDDEF *odp, DLLSPEC *spec )
 {
     odp->u.func.nb_args = 0;
     odp->link_name = xstrdup("");
-    odp->flags |= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64); /* don't bother generating stubs for Winelib */
+    /* don't bother generating stubs for Winelib */
+    if (odp->flags & FLAG_CPU_MASK)
+        odp->flags &= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64);
+    else
+        odp->flags |= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64);
     return 1;
 }