diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-02 11:02:03 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-02 10:41:15 +0000 |
| commit | 67daf98a0d688a7827d7e46053411d61b68e3999 (patch) | |
| tree | fa0457bf90c49961f6cd783dd1f3dbcafb9a60ca | |
| parent | 67aba37ab361fc117366e283365920013b8d8464 (diff) | |
Fix JavaScript on ARMv7 in ARM-mode
The gold linker does something wrong with the symbol looks that is
used to generate assembler trampolines. Using the classic linker instead
solves the issue.
Task-number: QTBUG-44700
Change-Id: Ie3c1a903fb7facb31eeb9e0f75b70089dce27081
Reviewed-by: Julien Brianceau <jbriance@cisco.com>
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index 06f10dec5..ce97df429 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -97,6 +97,9 @@ contains(QT_CONFIG, c++11): CONFIG += c++11 # Limit the creation of thin archives to Linux, since only GNU's ar supports it. !debug_and_release:linux: CONFIG += gnu_thin_archives +# The Gold linker breaks transition between JIT and LLInt due to thumb-state mismatch. +gcc:isEqual(QT_ARCH, "arm"): CONFIG -= use_gold_linker + # Pick up Qt's defaults for debug/release/debug_and_release if(win32|mac):!macx-xcode { contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release |