[gcc-6] 376/401: * Fix target architecture for sparc non-multilib builds (Adrian Glaubitz). Closes: #855197.

[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 760228a36e4534e1918eabecc38d28bc74960ac1
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sat Feb 18 05:49:32 2017 +0000

      * Fix target architecture for sparc non-multilib builds (Adrian Glaubitz).
        Closes: #855197.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9301 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog | 2 ++
 debian/rules2    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index adec25c..0412cd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ gcc-6 (6.3.0-7) UNRELEASED; urgency=medium
       PR tree-optimization/79267, PR target/79495 (x86), PR c/79471,
       PR c++/79429, PR c/79431, PR c++/79377.
   * Update the Linaro support to the 6.3-2017.02 snapshot.
+  * Fix target architecture for sparc non-multilib builds (Adrian Glaubitz).
+    Closes: #855197.
 
  -- Matthias Klose <doko at debian.org>  Sat, 18 Feb 2017 06:18:49 +0100
 
diff --git a/debian/rules2 b/debian/rules2
index 1914d30..65dd4f6 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -544,9 +544,11 @@ ifeq ($(derivative),Ubuntu)
 endif
 
 ifneq (,$(findstring sparc-linux,$(DEB_TARGET_GNU_TYPE)))
-  CONFARGS += --with-cpu-32=ultrasparc
   ifeq ($(biarch64),yes)
     CONFARGS += --enable-targets=all
+    CONFARGS += --with-cpu-32=ultrasparc
+  else
+    CONFARGS += --with-cpu=ultrasparc
   endif
 endif
 

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