Make it possible to omit the udis86 assembler from compilation

Disable it on Windows and enable it generally only on x86 and amd64
architectures.

Change-Id: If8f366a3095608b9afcd30dee6dc636d442d4107
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri
index 5744905..f8055d0 100644 (file)
--- a/src/3rdparty/masm/masm-defs.pri
+++ b/src/3rdparty/masm/masm-defs.pri
@@ -19,7 +19,9 @@ INCLUDEPATH += $$PWD/stubs
 INCLUDEPATH += $$PWD/stubs/wtf
 INCLUDEPATH += $$PWD
 
-DEFINES += WTF_USE_UDIS86=1
+if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")):!win*: DEFINES += WTF_USE_UDIS86=1
+else: DEFINES += WTF_USE_UDIS86=0
+
 INCLUDEPATH += $$PWD/disassembler
 INCLUDEPATH += $$PWD/disassembler/udis86
 INCLUDEPATH += $$_OUT_PWD

diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
index f172762..87f08e4 100644 (file)
--- a/src/3rdparty/masm/masm.pri
+++ b/src/3rdparty/masm/masm.pri
@@ -32,13 +32,15 @@ HEADERS += $$PWD/stubs/WTFStubs.h
 
 SOURCES += $$PWD/disassembler/Disassembler.cpp
 SOURCES += $$PWD/disassembler/UDis86Disassembler.cpp
-SOURCES += $$PWD/disassembler/udis86/udis86.c
-SOURCES += $$PWD/disassembler/udis86/udis86_decode.c
-SOURCES += $$PWD/disassembler/udis86/udis86_input.c
-SOURCES += $$PWD/disassembler/udis86/udis86_itab_holder.c
-SOURCES += $$PWD/disassembler/udis86/udis86_syn-att.c
-SOURCES += $$PWD/disassembler/udis86/udis86_syn.c
-SOURCES += $$PWD/disassembler/udis86/udis86_syn-intel.c
+contains(DEFINES, WTF_USE_UDIS86=1) {
+    SOURCES += $$PWD/disassembler/udis86/udis86.c
+    SOURCES += $$PWD/disassembler/udis86/udis86_decode.c
+    SOURCES += $$PWD/disassembler/udis86/udis86_input.c
+    SOURCES += $$PWD/disassembler/udis86/udis86_itab_holder.c
+    SOURCES += $$PWD/disassembler/udis86/udis86_syn-att.c
+    SOURCES += $$PWD/disassembler/udis86/udis86_syn.c
+    SOURCES += $$PWD/disassembler/udis86/udis86_syn-intel.c
+}
 
 SOURCES += \
     $$PWD/yarr/YarrCanonicalizeUCS2.cpp \

diff --git a/src/v4/qv4isel_masm.cpp b/src/v4/qv4isel_masm.cpp
index bde199d..4fdee3f 100644 (file)
--- a/src/v4/qv4isel_masm.cpp
+++ b/src/v4/qv4isel_masm.cpp
@@ -52,7 +52,7 @@
 #include <iostream>
 #include <cassert>
 
-#ifndef NO_UDIS86
+#if USE(UDIS86)
 #  include <udis86.h>
 #endif