diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-05-09 01:47:24 -0300 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-05 12:12:47 +0000 |
| commit | 7dd6becaa24272fff11d124660adb2506bac34c6 (patch) | |
| tree | 7514cd46c45542eb9a14878596ed06f3d7624173 /testing/qt-creator/qtcreator-arm.patch | |
| parent | 07a73b8cb34aea6e5e274cff3874928186c4688f (diff) | |
| download | aports-7dd6becaa24272fff11d124660adb2506bac34c6.tar.bz2 aports-7dd6becaa24272fff11d124660adb2506bac34c6.tar.xz | |
testing/qt-creator: upgrade to 4.9.0
Diffstat (limited to 'testing/qt-creator/qtcreator-arm.patch')
| -rw-r--r-- | testing/qt-creator/qtcreator-arm.patch | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/testing/qt-creator/qtcreator-arm.patch b/testing/qt-creator/qtcreator-arm.patch deleted file mode 100644 index ee6ad5326c..0000000000 --- a/testing/qt-creator/qtcreator-arm.patch +++ /dev/null @@ -1,78 +0,0 @@ -https://bugreports.qt.io/browse/QTCREATORBUG-8107 - -diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp -index 917c385..4364a2e 100644 ---- a/src/libs/3rdparty/botan/botan.cpp -+++ b/src/libs/3rdparty/botan/botan.cpp -@@ -1101,6 +1101,8 @@ class Montgomery_Exponentiator : public Modular_Exponentiator - - #if (BOTAN_MP_WORD_BITS != 32) - #error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32 -+#elif !defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) -+typedef Botan::u64bit dword; - #endif - - #ifdef Q_OS_UNIX -@@ -1118,6 +1120,7 @@ extern "C" { - */ - inline word word_madd2(word a, word b, word* c) - { -+#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) - asm( - ASM("mull %[b]") - ASM("addl %[c],%[a]") -@@ -1127,6 +1130,11 @@ inline word word_madd2(word a, word b, word* c) - : "0"(a), "1"(b), [c]"g"(*c) : "cc"); - - return a; -+#else -+ dword z = (dword)a * b + *c; -+ *c = (word)(z >> BOTAN_MP_WORD_BITS); -+ return (word)z; -+#endif - } - - /* -@@ -1134,6 +1142,7 @@ inline word word_madd2(word a, word b, word* c) - */ - inline word word_madd3(word a, word b, word c, word* d) - { -+#if defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) - asm( - ASM("mull %[b]") - -@@ -1147,6 +1156,11 @@ inline word word_madd3(word a, word b, word c, word* d) - : "0"(a), "1"(b), [c]"g"(c), [d]"g"(*d) : "cc"); - - return a; -+#else -+ dword z = (dword)a * b + c + *d; -+ *d = (word)(z >> BOTAN_MP_WORD_BITS); -+ return (word)z; -+#endif - } - - } -@@ -2315,7 +2329,7 @@ namespace Botan { - - extern "C" { - --#ifdef Q_OS_UNIX -+#if defined(Q_OS_UNIX) && defined(BOTAN_TARGET_CPU_IS_X86_FAMILY) - /* - * Helper Macros for x86 Assembly - */ -diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h -index 6a9cbe0..8afec9e 100644 ---- a/src/libs/3rdparty/botan/botan.h -+++ b/src/libs/3rdparty/botan/botan.h -@@ -81,7 +81,9 @@ - #endif - - #define BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN -+#if !defined(__arm__) - #define BOTAN_TARGET_CPU_IS_X86_FAMILY -+#endif - #define BOTAN_TARGET_UNALIGNED_MEMORY_ACCESS_OK 1 - - #if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) || \ |