From 4749a3ec61859e324f14add3008c41f92e6c2793 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 19 Feb 2019 08:38:07 +0100 Subject: Android: Use -marm instead of -mthumb for armv7 to avoid a crash Since the Android toolchain has problems with using -mthumb for QtScript then we switch it to using -marm instead in order to prevent problems from occurring as a result. Since this is only a problem for the armv7 architecture then we only do this for that architecture. Change-Id: Ia621f066b8336bb12a2ec1aa99e3a9f9afca186d Done-with: Markus Maier Fixes: QTBUG-67936 Reviewed-by: Markus Maier Reviewed-by: BogDan Vatra --- src/script/script.pro | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/script/script.pro b/src/script/script.pro index 228f486..c5d56c2 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -63,3 +63,14 @@ load(qt_module) # Override the module default, as it breaks compilation with libc++>=5.0: # auto_ptr is no longer part of the c++1z standard. CONFIG -= c++1z + +android-clang:equals(ANDROID_TARGET_ARCH, armeabi-v7a) { + QMAKE_CFLAGS_RELEASE -= -mthumb + QMAKE_CFLAGS_RELEASE *= -marm + QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO -= -mthumb + QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO *= -marm + QMAKE_CXXFLAGS_RELEASE -= -mthumb + QMAKE_CXXFLAGS_RELEASE *= -marm + QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO -= -mthumb + QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO *= -marm +} -- cgit v1.2.1 From a122caecff790a82f707894fa9db72afe91fcb7e Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Mon, 4 Mar 2019 09:54:55 +0100 Subject: Rename VERSION to VERSION.TXT On case-insensitive file systems, this causes an issue with recent versions of the Android NDK, because, since Android NDK r19, the libc++ header "cstddef" contains #include which will resolve to this file instead of the intended header due to the ordering of the search paths. The simplest solution is just to give this a suffix so that it can be differentiated from the headers. Task-number: QTQAINFRA-2568 Change-Id: Ic1502e65de3dba912ed079d406a65ebf9b935694 Reviewed-by: BogDan Vatra --- src/3rdparty/javascriptcore/VERSION | 11 ----------- src/3rdparty/javascriptcore/VERSION.TXT | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 src/3rdparty/javascriptcore/VERSION create mode 100644 src/3rdparty/javascriptcore/VERSION.TXT diff --git a/src/3rdparty/javascriptcore/VERSION b/src/3rdparty/javascriptcore/VERSION deleted file mode 100644 index 13943b2..0000000 --- a/src/3rdparty/javascriptcore/VERSION +++ /dev/null @@ -1,11 +0,0 @@ -This is a snapshot of JavaScriptCore from - - git://gitorious.org/qtwebkit/qtwebkit.git - -The commit imported was from the - - javascriptcore-snapshot-27012011 branch/tag - -and has the sha1 checksum - - 3ab0f621048fbeb480b687a28ed31d92d8506150 diff --git a/src/3rdparty/javascriptcore/VERSION.TXT b/src/3rdparty/javascriptcore/VERSION.TXT new file mode 100644 index 0000000..13943b2 --- /dev/null +++ b/src/3rdparty/javascriptcore/VERSION.TXT @@ -0,0 +1,11 @@ +This is a snapshot of JavaScriptCore from + + git://gitorious.org/qtwebkit/qtwebkit.git + +The commit imported was from the + + javascriptcore-snapshot-27012011 branch/tag + +and has the sha1 checksum + + 3ab0f621048fbeb480b687a28ed31d92d8506150 -- cgit v1.2.1