qtscript,qtwebking: disable thumb

* qemuarm builds fail when thumb is enabled

(From meta-qt5 rev: 932b32c1c9e9a3ac833c82ff9273683345056ec7)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/meta-qt5/recipes-qt/qt5/qtscript.inc b/meta-qt5/recipes-qt/qt5/qtscript.inc
index e7b5d74..5a534f0 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qtscript.inc
+++ b/meta-qt5/recipes-qt/qt5/qtscript.inc
@@ -1,5 +1,17 @@
 require qt5.inc
 
+# qemuarm build fails with:
+# /OE/build/oe-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qtscript/5.4.1+gitAUTOINC+822df36f25-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/assembler/AssemblerBuffer.h: In member function 'void QTJSC::AssemblerBuffer::putInt64Unchecked(int64_t)':
+#/OE/build/oe-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qtscript/5.4.1+gitAUTOINC+822df36f25-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/assembler/AssemblerBuffer.h:106:58: warning: cast from 'char*' to 'int64_t* {aka long long int*}' increases required alignment of target type [-Wcast-align]
+#             *reinterpret_cast<int64_t*>(&m_buffer[m_size]) = value;
+#                                                          ^
+#{standard input}: Assembler messages:
+#{standard input}:22: Error: selected processor does not support Thumb mode `stmdb sp!,{r1-r3}'
+#{standard input}:23: Error: selected processor does not support Thumb mode `stmdb sp!,{r4-r8,lr}'
+#{standard input}:30: Error: lo register required -- `ldmia sp!,{r4-r8,lr}'
+#{standard input}:43: Error: lo register required -- `ldmia sp!,{r4-r8,lr}'
+ARM_INSTRUCTION_SET = "arm"
+
 # There are no LGPLv3-only licensed files in this component.
 # Note that some files are LGPL-2.1 only without Digia-Qt-LGPL-Exception-1.1.
 DEPENDS += "qtbase"

diff --git a/meta-qt5/recipes-qt/qt5/qtwebkit.inc b/meta-qt5/recipes-qt/qt5/qtwebkit.inc
index 88df4c8..1027b4c 100644 (file)
--- a/meta-qt5/recipes-qt/qt5/qtwebkit.inc
+++ b/meta-qt5/recipes-qt/qt5/qtwebkit.inc
@@ -8,6 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \
 
 DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt leveldb"
 
+# qemuarm build fails with:
+# | {standard input}: Assembler messages:
+# | {standard input}:106: Error: invalid immediate: 983040 is out of range
+# | {standard input}:106: Error: value of 983040 too large for field of 2 bytes at 146
+ARM_INSTRUCTION_SET = "arm"
+
 SRC_URI += "\
     file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
     file://0002-Remove-TEXTREL-tag-in-x86.patch \