[gcc-6] 173/401: * On sparc64, configure with --with-cpu-32=ultrasparc, drop the sparc-force-cpu patch. Closes: #809509.

[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 92971f1f364acf4b8ace50ea20bd676a81aab1b1
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue Jul 5 09:27:47 2016 +0000

      * On sparc64, configure with --with-cpu-32=ultrasparc, drop the
        sparc-force-cpu patch. Closes: #809509.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8914 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                    |  4 +++-
 debian/patches/sparc-force-cpu.diff | 27 ---------------------------
 debian/rules.patch                  |  1 -
 debian/rules2                       |  3 +--
 4 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cceabc0..b199d12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 gcc-6 (6.1.1-9) UNRELEASED; urgency=medium
 
   * Mark cross compilers as M-A: foreign. Addresses: #827136.
+  * On sparc64, configure with --with-cpu-32=ultrasparc, drop the
+    sparc-force-cpu patch. Closes: #809509.
 
- -- Matthias Klose <doko at debian.org>  Fri, 01 Jul 2016 18:02:36 +0200
+ -- Matthias Klose <doko at debian.org>  Tue, 05 Jul 2016 11:19:50 +0200
 
 gcc-6 (6.1.1-8) unstable; urgency=medium
 
diff --git a/debian/patches/sparc-force-cpu.diff b/debian/patches/sparc-force-cpu.diff
deleted file mode 100644
index fde4b11..0000000
--- a/debian/patches/sparc-force-cpu.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-# DP: On sparc default to ultrasparc (v9a) in 32bit mode
-
-Index: b/src/gcc/config.gcc
-===================================================================
---- a/src/gcc/config.gcc
-+++ b/src/gcc/config.gcc
-@@ -4543,6 +4543,20 @@ do
- 			;;
- 		esac
- 
-+		# setting this directly fails to build a biarch defaulting to 32bit
-+		case "$target" in
-+		    sparc-*-linux*)
-+			if test "$option" = cpu; then
-+				val=ultrasparc
-+			fi
-+			;;
-+		    DISABLEDsparc64-*-linux*)
-+			if test "$option" = cpu_32; then
-+				val=ultrasparc
-+			fi
-+			;;
-+		esac
-+
- 		if test "x$t" = x
- 		then
- 			t="{ \"$option\", \"$val\" }"
diff --git a/debian/rules.patch b/debian/rules.patch
index 1a6046e..4cc38d5 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -65,7 +65,6 @@ debian_patches += \
 	boehm-gc-getnprocs \
 	note-gnu-stack \
 	libgomp-omp_h-multilib \
-	sparc-force-cpu \
 	gccgo-version \
 	pr47818 \
 	gcc-base-version \
diff --git a/debian/rules2 b/debian/rules2
index 4753af2..e8d0339 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -542,8 +542,7 @@ endif
 ifneq (,$(findstring sparc64-linux,$(DEB_TARGET_GNU_TYPE)))
   ifeq ($(biarch32),yes)
     CONFARGS += --enable-targets=all
-    # this doesn't work
-    #CONFARGS += --with-cpu-32=ultrasparc
+    CONFARGS += --with-cpu-32=ultrasparc
   endif
 endif
 

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