summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Preud'homme <robotux@celest.fr>2018-03-15 23:07:28 +0000
committerThomas Preud'homme <robotux@celest.fr>2018-03-15 23:07:29 +0000
commitddf0253fe600e0550c7f9493d34962800547df38 (patch)
treef2a131c5f5972ac4b1eebd72b722fa18a7a2983f
parentae729ae4c7e0a63ec1cf5135f9cc2a2f8111f349 (diff)
parentc13c5e1441cc9ead8d8a9835843c16a70fc7ae9b (diff)
merge patched into master
-rwxr-xr-xconfigure2
-rw-r--r--debian/.git-dpm4
-rw-r--r--debian/patches/0006-Select-VFP-if-triplet-is-arm-linux-gnueabihf.patch31
-rw-r--r--debian/patches/series1
4 files changed, 35 insertions, 3 deletions
diff --git a/configure b/configure
index 1ee3acb..63881a2 100755
--- a/configure
+++ b/configure
@@ -335,7 +335,7 @@ if test -z "$cross_prefix" ; then
if test "$cpu" = "arm" ; then
if test "${triplet%eabihf}" != "$triplet" ; then
- confvars="$confvars arm_eabihf"
+ confvars="$confvars arm_eabihf arm_vfp"
elif test "${triplet%eabi}" != "$triplet" ; then
confvars="$confvars arm_eabi"
fi
diff --git a/debian/.git-dpm b/debian/.git-dpm
index f87d9dc..f402d82 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-55cae8e439664b764d4bd11306c754c97f0df15d
-55cae8e439664b764d4bd11306c754c97f0df15d
+c13c5e1441cc9ead8d8a9835843c16a70fc7ae9b
+c13c5e1441cc9ead8d8a9835843c16a70fc7ae9b
e2ccf3981d78dfeb390d22c74625b60310100abb
e2ccf3981d78dfeb390d22c74625b60310100abb
tcc_0.9.27.orig.tar.bz2
diff --git a/debian/patches/0006-Select-VFP-if-triplet-is-arm-linux-gnueabihf.patch b/debian/patches/0006-Select-VFP-if-triplet-is-arm-linux-gnueabihf.patch
new file mode 100644
index 0000000..732da6c
--- /dev/null
+++ b/debian/patches/0006-Select-VFP-if-triplet-is-arm-linux-gnueabihf.patch
@@ -0,0 +1,31 @@
+From c13c5e1441cc9ead8d8a9835843c16a70fc7ae9b Mon Sep 17 00:00:00 2001
+From: Thomas Preud'homme <robotux@celest.fr>
+Date: Thu, 15 Mar 2018 23:02:56 +0000
+Subject: Select VFP if triplet is arm-linux-gnueabihf
+
+A target triplet of arm-linux-gnueabihf indicates that the compiler
+should use the VFP variant of the calling convention which as its name
+implies requires VFP. This commit enables VFP when triplet is
+arm-linux-gnueabihf.
+
+Origin: http://repo.or.cz/tinycc.git/commit/c41caac02d53373b296ccb179b730ada62137cc0
+Forwarded: http://repo.or.cz/tinycc.git/commit/c41caac02d53373b296ccb179b730ada62137cc0
+Last-Updated: 2018-03-15
+Applied-Upstream: commit:c41caac02d53373b296ccb179b730ada62137cc0
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 1ee3acb8..63881a29 100755
+--- a/configure
++++ b/configure
+@@ -335,7 +335,7 @@ if test -z "$cross_prefix" ; then
+
+ if test "$cpu" = "arm" ; then
+ if test "${triplet%eabihf}" != "$triplet" ; then
+- confvars="$confvars arm_eabihf"
++ confvars="$confvars arm_eabihf arm_vfp"
+ elif test "${triplet%eabi}" != "$triplet" ; then
+ confvars="$confvars arm_eabi"
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index 59f1f22..b4a0492 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
0003-Prevent-dead-code-on-x86-in-prepare_dynamic_rel.patch
0004-Fix-pthread-option-handling.patch
0005-Remove-asm-c-connect-sep-in-tests-clean-target.patch
+0006-Select-VFP-if-triplet-is-arm-linux-gnueabihf.patch