From efc88fe317ca34b01b48955252be1f10ae2c08bb Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 15 Sep 2010 12:45:04 -0500 Subject: [PATCH] winebuild: Don't add extra CPU flags to stubs if they have some already. --- tools/winebuild/parser.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index bc483c9922..755084ee80 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; } -- 2.32.0.93.g670b81a890