[gcc-6] 150/401: * Detect hard float for non-linux or non-glibc arm-*-*eabihf builds (Helmut Grohne). Closes: #823894.

[Ximin Luo]

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

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 1a9dc77c0ac3f3c80c76782bd1f390f6f9926a86
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed May 25 12:48:28 2016 +0000

      * Detect hard float for non-linux or non-glibc arm-*-*eabihf builds (Helmut
        Grohne). Closes: #823894.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8858 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  | 2 ++
 debian/rules.defs | 2 +-
 debian/rules2     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 24d7bc8..bbef41e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ gcc-6 (6.1.1-5) UNRELEASED; urgency=medium
 
   * Fix cross building libgnatprj on i386 targeting 64bit archs (YunQiang Su).
     Closes: #823126.
+  * Detect hard float for non-linux or non-glibc arm-*-*eabihf builds (Helmut
+    Grohne). Closes: #823894.
 
  -- Matthias Klose <doko at debian.org>  Wed, 25 May 2016 14:43:34 +0200
 
diff --git a/debian/rules.defs b/debian/rules.defs
index 161a4cb..dd5e368 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -391,7 +391,7 @@ ifeq ($(distribution),Ubuntu)
 endif
 
 # check if we're building for armel or armhf
-ifeq ($(DEB_TARGET_ARCH),armhf)
+ifneq (,$(filter %eabihf,$(DEB_TARGET_GNU_SYSTEM)))
   float_abi := hard
 else ifneq (,$(filter $(distribution)-$(DEB_TARGET_ARCH), Ubuntu-armel))
   ifneq (,$(filter $(distrelease),lucid maverick natty oneiric precise))
diff --git a/debian/rules2 b/debian/rules2
index 3961aac..abe987b 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -485,7 +485,7 @@ ifneq (,$(findstring arm, $(DEB_TARGET_GNU_CPU)))
   CONFARGS += --disable-sjlj-exceptions
   # FIXME: libjava is not ported for thumb, this hack only works for
   # separate gcj builds
-  ifneq (,$(filter armhf,$(DEB_TARGET_ARCH)))
+  ifneq (,$(filter %armhf,$(DEB_TARGET_ARCH)))
     ifeq ($(distribution),Raspbian)
       with_arm_arch = armv6
       with_arm_fpu = vfp

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