* Drop the g++-multilib build dependency, use the built compiler to

    check which multilib variants can be run.


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

8 files changed, 58 insertions, 91 deletions

diff --git a/debian/changelog b/debian/changelog
index 5b5a99a..2f6f6f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gcc-4.7 (4.7.2-14) UNRELEASED; urgency=low
+
+  * Drop the g++-multilib build dependency, use the built compiler to
+    check which multilib variants can be run.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 09 Dec 2012 09:01:04 +0100
+
 gcc-4.7 (4.7.2-13) experimental; urgency=low
 
   * Update to SVN 20121208 (r194323) from the gcc-4_7-branch.
diff --git a/debian/control b/debian/control
index eb67431..98cfc01 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
 Uploaders: Matthias Klose <doko@debian.org>
 Standards-Version: 3.9.3
-Build-Depends: dpkg-dev (>= 1.16.0~ubuntu4), debhelper (>= 5.0.62), g++-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc x32], libc6.1-dev (>= 2.13-5) [alpha ia64] | libc0.3-dev (>= 2.13-5) [hurd-i386] | libc0.1-dev (>= 2.13-5) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-5), libc6-dev (>= 2.13-31) [armel armhf], 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], lib64gcc1 [i386 powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel], libc6-dev-x32 [amd64 i386], libx32gcc1 [amd64 i386], m4, libtool, autoconf2.64, automake (>= 1:1.11), automake (<< 1:1.12), libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, binutils (>= 2.22) | binutils-multiarch (>= 2.22), binutils-hppa64 (>= 2.22) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), locales, procps, sharutils, netbase, binutils-spu (>= 2.22) [powerpc ppc64], newlib-spu (>= 1.16.0) [powerpc ppc64], libcloog-ppl-dev (>= 0.15.9-2~), libmpc-dev, libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), libelfg0-dev (>= 0.8.12) | libelf-dev, dejagnu [!m68k !hurd-i386 !hurd-alpha], autogen, realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt
+Build-Depends: dpkg-dev (>= 1.16.0~ubuntu4), debhelper (>= 5.0.62), libc6.1-dev (>= 2.13-5) [alpha ia64] | libc0.3-dev (>= 2.13-5) [hurd-i386] | libc0.1-dev (>= 2.13-5) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-5), libc6-dev (>= 2.13-31) [armel armhf], 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], lib64gcc1 [i386 powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel], libc6-dev-x32 [amd64 i386], libx32gcc1 [amd64 i386], m4, libtool, autoconf2.64, automake (>= 1:1.11), automake (<< 1:1.12), libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, binutils (>= 2.22) | binutils-multiarch (>= 2.22), binutils-hppa64 (>= 2.22) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), locales, procps, sharutils, netbase, binutils-spu (>= 2.22) [powerpc ppc64], newlib-spu (>= 1.16.0) [powerpc ppc64], libcloog-ppl-dev (>= 0.15.9-2~), libmpc-dev, libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), libelfg0-dev (>= 0.8.12) | libelf-dev, dejagnu [!m68k !hurd-i386 !hurd-alpha], autogen, realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt
 Build-Depends-Indep: doxygen (>= 1.7.2), graphviz (>= 2.2), ghostscript, texlive-latex-base, xsltproc, libxml2-utils, docbook-xsl-ns, 
 Build-Conflicts: binutils-gold
 Homepage: http://gcc.gnu.org/
diff --git a/debian/control.m4 b/debian/control.m4
index eaf8ad1..9ecede0 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -46,7 +46,7 @@ Standards-Version: 3.9.3
 ifdef(`TARGET',`dnl cross
 Build-Depends: DPKG_BUILD_DEP debhelper (>= 5.0.62), LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP LIBUNWIND_BUILD_DEP LIBATOMIC_OPS_BUILD_DEP AUTOGEN_BUILD_DEP AUTO_BUILD_DEP SOURCE_BUILD_DEP CROSS_BUILD_DEP CLOOG_BUILD_DEP MPC_BUILD_DEP MPFR_BUILD_DEP GMP_BUILD_DEP ELF_BUILD_DEP, zlib1g-dev, gawk, lzma, xz-utils, patchutils, BINUTILS_BUILD_DEP, bison (>= 1:2.3), flex, realpath (>= 1.9.12), lsb-release, make (>= 3.81), quilt
 ',`dnl native
-Build-Depends: DPKG_BUILD_DEP debhelper (>= 5.0.62), GCC_MULTILIB_BUILD_DEP LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP AUTO_BUILD_DEP AUTOGEN_BUILD_DEP libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, BINUTILS_BUILD_DEP, binutils-hppa64 (>= BINUTILSV) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), FORTRAN_BUILD_DEP locales, procps, sharutils, JAVA_BUILD_DEP GNAT_BUILD_DEP GO_BUILD_DEP GDC_BUILD_DEP SPU_BUILD_DEP CLOOG_BUILD_DEP MPC_BUILD_DEP MPFR_BUILD_DEP GMP_BUILD_DEP ELF_BUILD_DEP CHECK_BUILD_DEP realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt
+Build-Depends: DPKG_BUILD_DEP debhelper (>= 5.0.62), LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP AUTO_BUILD_DEP AUTOGEN_BUILD_DEP libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, BINUTILS_BUILD_DEP, binutils-hppa64 (>= BINUTILSV) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), FORTRAN_BUILD_DEP locales, procps, sharutils, JAVA_BUILD_DEP GNAT_BUILD_DEP GO_BUILD_DEP GDC_BUILD_DEP SPU_BUILD_DEP CLOOG_BUILD_DEP MPC_BUILD_DEP MPFR_BUILD_DEP GMP_BUILD_DEP ELF_BUILD_DEP CHECK_BUILD_DEP realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt
 Build-Depends-Indep: LIBSTDCXX_BUILD_INDEP JAVA_BUILD_INDEP
 ')dnl
 Build-Conflicts: binutils-gold
diff --git a/debian/rules.conf b/debian/rules.conf
index 44669c2..42ec0e1 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -285,8 +285,6 @@ else
   endif
 endif
 
-GCC_MULTILIB_BUILD_DEP = g++-multilib [$(multilib_archs)],
-
 LIBUNWIND_DEV_DEP := libunwind7-dev$(LS) (>= 0.98.5-6)
 LIBUNWIND_BUILD_DEP := $(LIBUNWIND_DEV_DEP) [ia64],
 LIBATOMIC_OPS_BUILD_DEP := libatomic-ops-dev$(LS) [ia64],
@@ -635,7 +633,6 @@ ctrl_flags += \
 	-DDPKG_BUILD_DEP="$(DPKG_BUILD_DEP)" \
 	-DSOURCE_BUILD_DEP="$(SOURCE_BUILD_DEP)" \
 	-DCROSS_BUILD_DEP="$(CROSS_BUILD_DEP)" \
-	-DGCC_MULTILIB_BUILD_DEP='$(GCC_MULTILIB_BUILD_DEP)' \
 	-DMULTILIB_ARCHS="$(multilib_archs)" \
 	-DNEON_ARCHS="$(neon_archs)" \
 	-DTP=$(TP) \
diff --git a/debian/rules.d/binary-java.mk b/debian/rules.d/binary-java.mk
index aff1c14..4ddb0c1 100644
--- a/debian/rules.d/binary-java.mk
+++ b/debian/rules.d/binary-java.mk
@@ -188,30 +188,7 @@ ifeq ($(with_standalone_gcj),yes)
 	$(gcc_lexec_dir)/{collect2,lto1,lto-wrapper} \
 	$(gcc_lexec_dir)/liblto_plugin.so{,.0,.0.0.0} \
 	$(gcc_lib_dir)/{libgcc*,libgcov.a,*.o} \
-	$(gcc_lib_dir)/include/std*.h \
-	$(shell for h in \
-		    README features.h arm_neon.h loongson.h \
-		    {cpuid,decfloat,float,iso646,limits,mm3dnow,mm_malloc}.h \
-		    {ppu_intrinsics,paired,spu2vmx,vec_types,si2vmx}.h \
-		    {,a,b,e,i,n,p,s,t,w,x}mmintrin.h mmintrin-common.h \
-		    {abm,avx,avx2,bmi,bmi2,f16c,fma,fma4,ia32,}intrin.h \
-		    {lwp,lzcnt,popcnt,tbm,x86,xop,}intrin.h \
-		    {cross-stdarg,syslimits,unwind,unwind-arm-common,varargs}.h; \
-		do \
-		  test -e $(d)/$(gcc_lib_dir)/include/$$h \
-		    && echo $(gcc_lib_dir)/include/$$h; \
-		  test -e $(d)/$(gcc_lib_dir)/include-fixed/$$h \
-		    && echo $(gcc_lib_dir)/include-fixed/$$h; \
-		done) \
-	$(shell for d in \
-		  asm bits gnu linux $(TARGET_ALIAS) \
-		  $(subst $(DEB_TARGET_GNU_CPU),$(biarch_cpu),$(TARGET_ALIAS)); \
-		do \
-		  test -e $(d)/$(gcc_lib_dir)/include/$$d \
-		    && echo $(gcc_lib_dir)/include/$$d; \
-		  test -e $(d)/$(gcc_lib_dir)/include-fixed/$$d \
-		    && echo $(gcc_lib_dir)/include-fixed/$$d; \
-		done) \
+	$(header_files) \
 	$(shell test -e $(d)/$(gcc_lib_dir)/SYSCALLS.c.X \
 		&& echo $(gcc_lib_dir)/SYSCALLS.c.X)
 
diff --git a/debian/rules.defs b/debian/rules.defs
index 3d9aaf4..31f28fb 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1344,51 +1344,6 @@ biarchsubdirs := \
   $(if $(filter yes,$(biarchsf)),$(biarchsfsubdir),)
 biarchsubdirs := {$(strip $(shell echo $(biarchsubdirs) | tr " " ","))}
 
-DEJAGNU_RUNS =
-ifneq ($(trunk_build),yes)
-ifeq ($(with_ssp),yes)
-  ifneq ($(single_package),yes)
-    DEJAGNU_RUNS += $(if $(filter yes,$(with_ssp_default)),-fno-stack-protector,-fstack-protector)
-  endif
-  # FIXME Ubuntu armel buildd hangs
-  ifneq (,$(findstring arm, $(DEB_TARGET_GNU_CPU)))
-    DEJAGNU_RUNS =
-  endif
-  ifeq ($(distribution),Ubuntu)
-    # the buildds are just slow ... don't check the non-default
-    ifneq (,$(findstring $(DEB_TARGET_GNU_CPU),ia64 powerpc sparc))
-      DEJAGNU_RUNS =
-    endif
-  endif
-endif
-endif
-
-ifeq ($(distribution),Ubuntu)
-  ifneq (,$(findstring arm, $(DEB_TARGET_GNU_CPU)))
-    ifeq ($(with_arm_thumb),yes)
-      #DEJAGNU_RUNS += -marm
-    else
-      DEJAGNU_RUNS += -mthumb
-    endif
-  endif
-endif
-
-abi_run_check = $(strip $(if $(wildcard build/runcheck$(1).out), \
-				$(shell cat build/runcheck$(1).out), \
-				$(shell CC="gcc $(1)" bash debian/runcheck.sh)))
-ifeq ($(biarch32),yes)
-  DEJAGNU_RUNS += $(call abi_run_check,-m32)
-endif
-ifeq ($(biarch64),yes)
-  DEJAGNU_RUNS += $(call abi_run_check,$(if $(filter $(DEB_TARGET_ARCH_CPU),mips mipsel),-mabi=64,-m64))
-endif
-ifeq ($(biarchn32),yes)
-  DEJAGNU_RUNS += $(call abi_run_check,-mabi=n32)
-endif
-ifeq ($(biarchx32),yes)
-  DEJAGNU_RUNS += $(call abi_run_check,-mx32)
-endif
-
 # GNU locales
 force_gnu_locales := yes
 locale_no_cpus :=
diff --git a/debian/rules2 b/debian/rules2
index 56aa302..ec3835b 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -575,6 +575,52 @@ else ifeq ($(distribution),Ubuntu)
   endif
 endif
 
+DEJAGNU_RUNS =
+ifneq ($(trunk_build),yes)
+ifeq ($(with_ssp),yes)
+  ifneq ($(single_package),yes)
+    DEJAGNU_RUNS += $(if $(filter yes,$(with_ssp_default)),-fno-stack-protector,-fstack-protector)
+  endif
+  # FIXME Ubuntu armel buildd hangs
+  ifneq (,$(findstring arm, $(DEB_TARGET_GNU_CPU)))
+    DEJAGNU_RUNS =
+  endif
+  ifeq ($(distribution),Ubuntu)
+    # the buildds are just slow ... don't check the non-default
+    ifneq (,$(findstring $(DEB_TARGET_GNU_CPU),ia64 powerpc sparc))
+      DEJAGNU_RUNS =
+    endif
+  endif
+endif
+endif
+
+ifeq ($(distribution),Ubuntu)
+  ifneq (,$(findstring arm, $(DEB_TARGET_GNU_CPU)))
+    ifeq ($(with_arm_thumb),yes)
+      #DEJAGNU_RUNS += -marm
+    else
+      DEJAGNU_RUNS += -mthumb
+    endif
+  endif
+endif
+
+# no b-d on g++-multilib, this is run by the built compiler
+abi_run_check = $(strip $(if $(wildcard build/runcheck$(1).out), \
+				$(shell cat build/runcheck$(1).out), \
+				$(shell CC="$(builddir)/gcc/xgcc -static-libgcc $(1)" bash debian/runcheck.sh)))
+ifeq ($(biarch32),yes)
+  DEJAGNU_RUNS += $(call abi_run_check,-m32)
+endif
+ifeq ($(biarch64),yes)
+  DEJAGNU_RUNS += $(call abi_run_check,$(if $(filter $(DEB_TARGET_ARCH_CPU),mips mipsel),-mabi=64,-m64))
+endif
+ifeq ($(biarchn32),yes)
+  DEJAGNU_RUNS += $(call abi_run_check,-mabi=n32)
+endif
+ifeq ($(biarchx32),yes)
+  DEJAGNU_RUNS += $(call abi_run_check,-mx32)
+endif
+
 # gdc is not multilib'd
 ifneq (,$(findstring gdc, $(PKGSOURCE)))
   DEJAGNU_RUNS =
@@ -852,22 +898,6 @@ else
 endif
 ifeq ($(with_check),yes)
 	@echo "Will run the testsuite."
-  ifeq ($(biarch64),yes)
-    ifneq (,$(filter $(DEB_TARGET_ARCH_CPU),mips mipsel))
-	@echo 'Will run the testsuite with -mabi=64: $(with_64bit_check)'
-    else
-	@echo 'Will run the testsuite with -m64: $(with_64bit_check)'
-    endif
-  endif
-  ifeq ($(biarch32),yes)
-	@echo 'Will run the testsuite with -m32: $(with_32bit_check)'
-  endif
-  ifeq ($(biarchn32),yes)
-	@echo 'Will run the testsuite with -mabi=n32: $(with_n32bit_check)'
-  endif
-  ifeq ($(biarchx32),yes)
-	@echo "Will run the testsuite with -mx32: $(with_x32bit_check)"
-  endif
 else
 	@echo "Will not run the testsuite: $(with_check)"
 endif
@@ -1308,6 +1338,7 @@ endif
 check: $(check_stamp) # $(if $(filter yes, $(with_java)),stamps/05-build-mauve-stamp) #$(check_inst_stamp)
 $(check_stamp): $(build_stamp) $(build_locale_stamp)
 	rm -f test-protocol
+	rm -f $(builddir)/runcheck*
 
 	-chmod 755 $(srcdir)/contrib/test_summary
 ifneq ($(with_common_libs),yes)
diff --git a/debian/runcheck.sh b/debian/runcheck.sh
index 49ca911..68e9f44 100644
--- a/debian/runcheck.sh
+++ b/debian/runcheck.sh
@@ -2,7 +2,7 @@
 
 mkdir -p build
 
-abi=${CC#* }
+abi=${CC##* }
 base=build/runcheck$abi
 
 cat >$base.c <<EOF