diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-22 15:33:01 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-29 19:14:51 +0200 |
| commit | ba57f73f349ecb6c03f6281b5a9422e32f29b3fb (patch) | |
| tree | a5381ee199628966b1ea85beb7cc7c46ff2e3ecd | |
| parent | 08cbf2cdfc0d2dcb49463a76477c11af4c2fc681 (diff) | |
qtscript,qtwebking: disable thumb
* qemuarm builds fail when thumb is enabled
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtscript.inc | 12 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebkit.inc | 6 |
2 files changed, 18 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtscript.inc b/recipes-qt/qt5/qtscript.inc index e7b5d745..5a534f0d 100644 --- a/recipes-qt/qt5/qtscript.inc +++ b/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/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 88df4c81..1027b4c9 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/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 \ |