package/qt5base: fix compile for aarch64_be
PATCH 1/1 package/qt5base: fix compile for aarch64_be
Add patch to fix availability check for storeRGB32FromARGB32PM_neon(), only available for arm little-endian.
Fixes:
- http://autobuild.buildroot.net/results/ab623253a6d988f4ee03d292ee85f3455de2ea25
.obj/qimage_conversions.o: In function `convert_generic(QImageData*, QImageData const*, QFlags<Qt::ImageConversionFlag>)':
qimage_conversions.cpp:(.text+0x2598): undefined reference to storeRGB32FromARGB32PM_neon(unsigned char*, unsigned int const*, int, int, QVector<unsigned int> const*, QDitherInfo*)' qimage_conversions.cpp:(.text+0x259c): undefined reference to storeRGB32FromARGB32PM_neon(unsigned char*, unsigned int const*, int, int, QVector<unsigned int> const*, QDitherInfo*)' .obj/qimage_conversions.o: In function `convert_generic_inplace(QImageData*, QImage::Format, QFlags<Qt::ImageConversionFlag>)':
qimage_conversions.cpp:(.text+0x28fc): undefined reference to storeRGB32FromARGB32PM_neon(unsigned char*, unsigned int const*, int, int, QVector<unsigned int> const*, QDitherInfo*)' qimage_conversions.cpp:(.text+0x2900): undefined reference to storeRGB32FromARGB32PM_neon(unsigned char*, unsigned int const*, int, int, QVector<unsigned int> const*, QDitherInfo*)'
--- ...ns-arm-neon-draw-helper-only-availab.patch | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 package/qt5/qt5base/0007-qimage_conversions-arm-neon-draw-helper-only-availab.patch
package/qt5/qt5base/0007-qimage_conversions-arm-neon-draw-helper-only-availab.patch new file +58 -0
@@ -0,0 +1,58 @@ +From 78d94321149f8e10e5270516082cb37a5b91e327 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Sun, 10 May 2020 22:26:43 +0200 +Subject: [PATCH] qimage_conversions: arm neon draw helper only available for + little endian + +Fixes: + + qimage_conversions.cpp:(.text+0x2598): undefined reference to `storeRGB32FromARGB32PM_neon(unsigned char*, unsigned int const*, int, int, QVector<unsigned int> const*, QDitherInfo*)' + +Signed-off-by: Peter Seiderer <[email protected]> +--- + src/gui/image/qimage_conversions.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp +index 97a5f89e..5fc5aba1 100644 +--- a/src/gui/image/qimage_conversions.cpp ++++ b/src/gui/image/qimage_conversions.cpp +@@ -119,7 +119,7 @@ void qGamma_correct_back_to_linear_cs(QImage *image) + *****************************************************************************/ + + // The drawhelper conversions from/to RGB32 are passthroughs which is not always correct for general image conversion +-#if !defined(__ARM_NEON__) ++#if !defined(__ARM_NEON__) || !(Q_BYTE_ORDER == Q_LITTLE_ENDIAN) + static void QT_FASTCALL storeRGB32FromARGB32PM(uchar *dest, const uint *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *) + { +@@ -149,7 +149,7 @@ static const uint *QT_FASTCALL fetchRGB32ToARGB32PM(uint *buffer, const uchar *s + #ifdef QT_COMPILER_SUPPORTS_SSE4_1 + extern void QT_FASTCALL storeRGB32FromARGB32PM_sse4(uchar *dest, const uint *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *); +-#elif defined(__ARM_NEON__) ++#elif defined(__ARM_NEON__) && (Q_BYTE_ORDER == Q_LITTLE_ENDIAN) + extern void QT_FASTCALL storeRGB32FromARGB32PM_neon(uchar *dest, const uint *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *); + #endif +@@ -181,7 +181,7 @@ void convert_generic(QImageData *dest, const QImageData *src, Qt::ImageConversio + store = storeRGB32FromARGB32PM_sse4; + else + store = storeRGB32FromARGB32PM; +-#elif defined(__ARM_NEON__) ++#elif defined(__ARM_NEON__) && (Q_BYTE_ORDER == Q_LITTLE_ENDIAN) + store = storeRGB32FromARGB32PM_neon; + #else + store = storeRGB32FromARGB32PM; +@@ -289,7 +289,7 @@ bool convert_generic_inplace(QImageData *data, QImage::Format dst_format, Qt::Im + store = storeRGB32FromARGB32PM_sse4; + else + store = storeRGB32FromARGB32PM; +-#elif defined(__ARM_NEON__) ++#elif defined(__ARM_NEON__) && (Q_BYTE_ORDER == Q_LITTLE_ENDIAN) + store = storeRGB32FromARGB32PM_neon; + #else + store = storeRGB32FromARGB32PM; +-- +2.26.2 +
Signature · 1 line
2.26.2
PATCH 1/1 package/qt5base: fix compile for aarch64_be
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Seiderer <[email protected]> writes:
Add patch to fix availability check for
storeRGB32FromARGB32PM_neon(), only available for arm little-endian.Fixes:
- http://autobuild.buildroot.net/results/ab623253a6d988f4ee03d292ee85f3455de2ea25
Quoted 8 lines
.obj/qimage_conversions.o: In function `convert_generic(QImageData*, QImageData const*, QFlags<Qt::ImageConversionFlag>)':
qimage_conversions.cpp:(.text+0x2598): undefined reference tostoreRGB32FromARGB32PM_neon(unsigned char*, unsigned int const*, int, int, QVector<unsigned int> const*, QDitherInfo*)' qimage_conversions.cpp:(.text+0x259c): undefined reference tostoreRGB32FromARGB32PM_neon(unsigned char*, unsigned int const*, int, int, QVector<unsigned int> const*, QDitherInfo*)'.obj/qimage_conversions.o: In function `convert_generic_inplace(QImageData*,QImage::Format, QFlags<Qt::ImageConversionFlag>)':
qimage_conversions.cpp:(.text+0x28fc): undefined reference tostoreRGB32FromARGB32PM_neon(unsigned char*, unsigned int const*, int, int, QVector<unsigned int> const*, QDitherInfo*)' qimage_conversions.cpp:(.text+0x2900): undefined reference tostoreRGB32FromARGB32PM_neon(unsigned char*, unsigned int const*, int, int, QVector<unsigned int> const*, QDitherInfo*)'Signed-off-by Peter Seiderer <[email protected]>
Committed, thanks.
Don't forget to submit the patch upstream.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/qt5base: fix compile for aarch64_be
Hello Peter,
Quoted 16 lines · Peter Korsgaard
Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Seiderer <[email protected]> writes:
Add patch to fix availability check for
storeRGB32FromARGB32PM_neon(), only available for arm little-endian.Fixes:
- http://autobuild.buildroot.net/results/ab623253a6d988f4ee03d292ee85f3455de2ea25
.obj/qimage_conversions.o: In function `convert_generic(QImageData*, QImageData const*, QFlags<Qt::ImageConversionFlag>)':
qimage_conversions.cpp:(.text+0x2598): undefined reference tostoreRGB32FromARGB32PM_neon(unsigned char*, unsigned int const*, int, int, QVector<unsigned int> const*, QDitherInfo*)' qimage_conversions.cpp:(.text+0x259c): undefined reference tostoreRGB32FromARGB32PM_neon(unsigned char*, unsigned int const*, int, int, QVector<unsigned int> const*, QDitherInfo*)'.obj/qimage_conversions.o: In function `convert_generic_inplace(QImageData*,QImage::Format, QFlags<Qt::ImageConversionFlag>)':
qimage_conversions.cpp:(.text+0x28fc): undefined reference tostoreRGB32FromARGB32PM_neon(unsigned char*, unsigned int const*, int, int, QVector<unsigned int> const*, QDitherInfo*)' qimage_conversions.cpp:(.text+0x2900): undefined reference tostoreRGB32FromARGB32PM_neon(unsigned char*, unsigned int const*, int, int, QVector<unsigned int> const*, QDitherInfo*)'
Quoted 6 lines
Quoted 1 line
Signed-off-by Peter Seiderer <[email protected]>Committed, thanks.
Don't forget to submit the patch upstream.
Yup, done, see [1]...
Regards,
Peter