diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-02-09 10:25:08 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-02-10 04:38:15 +0000 |
| commit | 705a2780743a01cb9a1032fca8c1f942b50e5a0a (patch) | |
| tree | d574f1164e9bce637e63468a02132309a95af2e3 /src/3rdparty | |
| parent | 48da4da700983b62e7a0e660f2a6b2cec0ab9bb2 (diff) | |
Prospective fix for native ARMv7 and ARM64 builds
Don't try to instantiate the presumed "cross-assembler" twice, and also
exclude the Yarr JIT from the devtools build. It requires a loadPtr
enabled assembler (disabled in V4_BOOTSTRAP builds) and we don't need
the regexp engine.
Change-Id: I3f36b32decdbf51133b8fef641f5630c5f5102b1
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/masm.pri | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri index 248be6e18c..6c301fea38 100644 --- a/src/3rdparty/masm/masm.pri +++ b/src/3rdparty/masm/masm.pri @@ -77,6 +77,7 @@ SOURCES += $$PWD/disassembler/ARM64Disassembler.cpp SOURCES += $$PWD/disassembler/ARM64/A64DOpcode.cpp HEADERS += $$PWD/disassembler/ARM64/A64DOpcode.h +!qmldevtools_build { SOURCES += $$PWD/yarr/YarrCanonicalizeUCS2.cpp \ $$PWD/yarr/YarrInterpreter.cpp \ $$PWD/yarr/YarrJIT.cpp \ @@ -90,6 +91,8 @@ HEADERS += $$PWD/yarr/Yarr.h \ $$PWD/yarr/YarrParser.h \ $$PWD/yarr/YarrPattern.h \ $$PWD/yarr/YarrSyntaxChecker.h +} + # # Generate RegExpJitTables.h # |