| Message ID | 1421753079-27665-3-git-send-email-richard.genoud@gmail.com |
|---|---|
| State | Accepted |
| Commit | ffc55c714c1733f9fe57e8377b4ca3d7544273d5 |
| Headers | show |
On 20/01/15 12:24, Richard Genoud wrote: > Qt has some assembly that doesn't exist in thumb1 mode. > So, force arm mode for Qt > > Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> It fails when the patch is not applied even on the most minimal config. It succeeds with the patch applied. Regards, Arnout > --- > package/qt/qt.mk | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/package/qt/qt.mk b/package/qt/qt.mk > index 255d6d2ab0e4..80605ca514d5 100644 > --- a/package/qt/qt.mk > +++ b/package/qt/qt.mk > @@ -52,6 +52,14 @@ endif > > endif > > +# Qt has some assembly function that are not present in thumb1 mode: > +# Error: selected processor does not support Thumb mode `swp r3,r7,[r4]' > +# so, we desactivate thumb mode > +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > +QT_CFLAGS += -marm > +QT_CXXFLAGS += -marm > +endif > + > ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y) > QT_CONFIGURE_OPTS += -qt3support > else
>>>>> "Richard" == Richard Genoud <richard.genoud@gmail.com> writes: > Qt has some assembly that doesn't exist in thumb1 mode. > So, force arm mode for Qt > Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Committed, thanks.
diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 255d6d2ab0e4..80605ca514d5 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -52,6 +52,14 @@ endif endif +# Qt has some assembly function that are not present in thumb1 mode: +# Error: selected processor does not support Thumb mode `swp r3,r7,[r4]' +# so, we desactivate thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +QT_CFLAGS += -marm +QT_CXXFLAGS += -marm +endif + ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y) QT_CONFIGURE_OPTS += -qt3support else
Qt has some assembly that doesn't exist in thumb1 mode. So, force arm mode for Qt Signed-off-by: Richard Genoud <richard.genoud@gmail.com> --- package/qt/qt.mk | 8 ++++++++ 1 file changed, 8 insertions(+)