* Add 32-bit biarch packages on sparc64.

git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@6893 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

4 files changed, 9 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 18f6b0a..d21a675 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ gcc-4.7 (4.7.3-6) UNRELEASED; urgency=low
 
   [ Aurelien Jarno ]
   * Don't pass --with-mips-plt on mips/mipsel.
+  * Add 32-bit biarch packages on sparc64.
 
  -- Matthias Klose <doko@debian.org>  Mon, 17 Jun 2013 18:23:31 +0200
 
diff --git a/debian/rules.conf b/debian/rules.conf
index 8cee5e7..63d881e 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -247,7 +247,7 @@ biarch_deb_map := \
 	i386=amd64 amd64=i386 \
 	mips=mips64 mipsel=mips64 \
 	powerpc=ppc64 ppc64=powerpc \
-	sparc=sparc64 \
+	sparc=sparc64 sparc64=sparc\
 	s390=s390x s390x=s390 \
 	kfreebsd-amd64=i386 \
 	armel=armhf \
@@ -298,7 +298,7 @@ ifneq ($(DEB_CROSS),yes)
   ifeq (,$(filter $(distrelease),lenny etch squeeze dapper hardy jaunty karmic lucid maverick natty oneiric))
     LIBC_BUILD_DEP += , libc6-dev (>= 2.13-31) [armel armhf]
   endif
-  LIBC_BIARCH_BUILD_DEP = libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 s390x x32], libn32gcc1 [mips mipsel], lib64gcc1 [i386 mips mipsel powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel],
+  LIBC_BIARCH_BUILD_DEP = libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32], libn32gcc1 [mips mipsel], lib64gcc1 [i386 mips mipsel powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel],
 ifneq (,$(findstring amd64,$(biarchx32archs)))
   LIBC_BIARCH_BUILD_DEP += libc6-dev-x32 [amd64 i386], libx32gcc1 [amd64 i386],
 endif
diff --git a/debian/rules.defs b/debian/rules.defs
index 0ab3034..b805086 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -952,7 +952,7 @@ with_itm := $(call envfilt, itm, , , $(with_itm))
 
 # gold --------------------
 # armel with binutils 2.20.51 only
-gold_archs = amd64 armel armhf i386 lpia powerpc ppc64 sparc
+gold_archs = amd64 armel armhf i386 lpia powerpc ppc64 sparc sparc64
 ifneq (,$(filter $(DEB_TARGET_ARCH),$(gold_archs)))
   with_gold := yes
 endif
@@ -1158,7 +1158,7 @@ debian_extra_langs := $(subst obj-c++,objcp,$(debian_extra_langs))
 export debian_extra_langs
 
 # multilib
-biarch_map := i686=x86_64 powerpc=powerpc64 sparc=sparc64 s390=s390x s390x=s390 \
+biarch_map := i686=x86_64 powerpc=powerpc64 sparc=sparc64 sparc64=sparc s390=s390x s390x=s390 \
 		x86_64=i686 powerpc64=powerpc mips=mips64 mipsel=mips64el
 ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy sid dapper hardy jaunty karmic lucid))
   biarch_map := $(subst i686=,i486=,$(biarch_map))
@@ -1267,7 +1267,7 @@ define gen_biarch
     export TARGET64_MACHINE
   endif
 endef
-biarch32archs := /amd64/ppc64/kfreebsd-amd64/s390x/x32/
+biarch32archs := /amd64/ppc64/kfreebsd-amd64/s390x/sparc64/x32/
 biarch64archs := /i386/powerpc/sparc/s390/mips/mipsel/x32/
 biarchn32archs := /mips/mipsel/
 ifeq ($(distribution),Ubuntu)
diff --git a/debian/rules2 b/debian/rules2
index b3e41f3..6414194 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -425,9 +425,9 @@ ifneq (,$(findstring sparc-linux,$(DEB_TARGET_GNU_TYPE)))
 endif
 
 ifneq (,$(findstring sparc64-linux,$(DEB_TARGET_GNU_TYPE)))
-    ifneq ($(biarch32),yes)
-      CONFARGS += --disable-multilib
-    endif
+  ifeq ($(biarch32),yes)
+    CONFARGS += --enable-targets=all
+  endif
 endif
 
 ifneq (,$(findstring ia64-linux,$(DEB_TARGET_GNU_TYPE)))