From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Fri, 27 Feb 2009 19:05:29 +0000 (+0100)
Subject: qt4[e|x11].bbclass: set ARM_INSTRUCTION_SET to arm
X-Git-Tag: Release-2010-05/1~3911^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19d7f35751b114882725ab88c9316dcecb497a93;p=openembedded.git

qt4[e|x11].bbclass: set ARM_INSTRUCTION_SET to arm
---

diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass
index 3fac2bda9b..3f89fa9da3 100644
--- a/classes/qt4e.bbclass
+++ b/classes/qt4e.bbclass
@@ -3,7 +3,7 @@ inherit qmake2
 
 QT_DIR_NAME = "qtopia"
 #
-# override variables set by qmake-base to compile QtopiaCore apps
+# override variables set by qmake-base to compile Qt/Embedded apps
 #
 export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia"
 export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
@@ -11,3 +11,7 @@ export OE_QMAKE_LIBS_QT = "qt"
 export OE_QMAKE_LIBS_X11 = ""
 export OE_QMAKE_EXTRA_MODULES = "network"
 EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=E "
+
+# Qt4 uses atomic instructions not supported in thumb mode
+ARM_INSTRUCTION_SET = "arm"
+
diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass
index 76a45c33cb..923717f8af 100644
--- a/classes/qt4x11.bbclass
+++ b/classes/qt4x11.bbclass
@@ -1,3 +1,6 @@
 DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-x11-free')]}"
 
 inherit qmake2
+
+# Qt4 uses atomic instructions not supported in thumb mode
+ARM_INSTRUCTION_SET = "arm"