[gcc-7] 277/354: * Restore configuring with on armhf. Closes: #873584.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit 0721f1b3c1a23a59f2cd14dc1ef01a52c567988c
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Aug 30 05:06:37 2017 +0000

      * Restore configuring with  on armhf. Closes: #873584.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9644 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  |  3 ++-
 debian/rules.defs | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4087ff5..3b9a726 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ gcc-7 (7.2.0-2) UNRELEASED; urgency=medium
     - Fix PR target/72804 (PPC), PR target/80210 (PPC), PR target/81910 (AVR),
       PR target/79883 (AVR), PR fortran/81296, PR fortran/80164.
   * Update the Linaro support to the 7-2017.08 snapshot.
+  * Restore configuring with  on armhf. Closes: #873584.
 
- -- Matthias Klose <doko at debian.org>  Thu, 24 Aug 2017 17:30:16 +0200
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Aug 2017 07:02:51 +0200
 
 gcc-7 (7.2.0-1) unstable; urgency=medium
 
diff --git a/debian/rules.defs b/debian/rules.defs
index 9390ce3..f587fec 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -376,6 +376,20 @@ envfilt	= $(strip $(or $(call lfilt,$(1),$(2)),$(call nlfilt,$(1),$(3)),$(call w
 # -------------------------------------------------------------------
 # architecture specific config
 
+ifeq ($(DEB_TARGET_ARCH),armhf)
+  ifeq ($(distribution),Raspbian)
+    with_arm_thumb := no
+  else
+    with_arm_thumb := yes
+  endif
+else
+  ifeq ($(derivative)-$(DEB_TARGET_ARCH),Ubuntu-armel)
+    ifneq (,$(filter $(distrelease),lucid maverick natty oneiric precise))
+      with_arm_thumb := yes
+    endif
+  endif
+endif
+
 # build using fsf or linaro
 ifeq ($(distribution),Ubuntu)
   ifneq (,$(findstring $(DEB_TARGET_ARCH),arm64 armel armhf))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git