summarylogtreecommitdiffstats
path: root/0001-Always-define-arm_thumb.patch
diff options
context:
space:
mode:
authorDonald Carr2016-06-03 18:25:37 -0700
committerDonald Carr2016-06-03 18:25:37 -0700
commit22159b028538b09dde6fd5ab9a073640a2a1e7a6 (patch)
tree8ddecaf783eba8afc77c27be8e0c106b13ef03d3 /0001-Always-define-arm_thumb.patch
parent88f71609cf79c11fcbce99ac0a3c585a2409881d (diff)
parentb603e59d12e3c07647a5d64f7b642adbe8a638c3 (diff)
downloadaur-22159b028538b09dde6fd5ab9a073640a2a1e7a6.tar.gz
Merge remote-tracking branch 'pi2/master'
Change-Id: Ie8597806e1d212e9462b10d8dec16627c834e5cf
Diffstat (limited to '0001-Always-define-arm_thumb.patch')
-rw-r--r--0001-Always-define-arm_thumb.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/0001-Always-define-arm_thumb.patch b/0001-Always-define-arm_thumb.patch
new file mode 100644
index 00000000000..c0a7874d07d
--- /dev/null
+++ b/0001-Always-define-arm_thumb.patch
@@ -0,0 +1,25 @@
+From 0311a69dcec83d90fc29c37527e4d59e9b3d57a8 Mon Sep 17 00:00:00 2001
+From: Donald Carr <sirspudd@gmail.com>
+Date: Tue, 15 Mar 2016 19:20:28 -0700
+Subject: [PATCH] Always define arm_thumb
+
+Change-Id: Ia453970c597e4c634df91fd1279c67e76e08f34e
+---
+ src/core/gyp_run.pro | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
+index 8aa4ad2..57745ab 100644
+--- a/src/core/gyp_run.pro
++++ b/src/core/gyp_run.pro
+@@ -81,6 +81,7 @@ contains(QT_ARCH, "arm") {
+ }
+
+ contains(QMAKE_CFLAGS, "-mthumb"): GYP_CONFIG += arm_thumb=1
++ else: GYP_CONFIG += arm_thumb=0
+ }
+
+ contains(QT_ARCH, "x86_64"): GYP_CONFIG += target_arch=x64
+--
+2.7.3
+