diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-02-07 16:20:56 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-02-09 10:39:28 +0100 |
| commit | d57bc1cf06965faf9e545048e6c996e8059c9d10 (patch) | |
| tree | 2c1b99dd76ac8e0d5b38c0774a2028399d462daf | |
| parent | 1404a36f104e3a862d8eb969313a720867e37243 (diff) | |
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>
| -rw-r--r-- | src/3rdparty/masm/masm-defs.pri | 4 | ||||
| -rw-r--r-- | src/3rdparty/masm/masm.pri | 16 | ||||
| -rw-r--r-- | src/v4/qv4isel_masm.cpp | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri index 5744905f93..f8055d0ff4 100644 --- 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 f172762089..87f08e482f 100644 --- 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 bde199d9be..4fdee3fddd 100644 --- 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 |