* Build-depend on linux-libc-dev [m68k] for gcc and gcc-snapshot builds.

    Closes: #796906.
  * Don't ignore anymore bootstrap comparison failures on sh4. Closes: #796939.
  * Fix stage1 cross build for KFreeBSD. Closes: #796901.


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

6 files changed, 29 insertions, 19 deletions

diff --git a/debian/changelog b/debian/changelog
index b6a5d76..b034bf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gcc-5 (5.2.1-17) UNRELEASED; urgency=medium
+
+  * Build-depend on linux-libc-dev [m68k] for gcc and gcc-snapshot builds.
+    Closes: #796906.
+  * Don't ignore anymore bootstrap comparison failures on sh4. Closes: #796939.
+  * Fix stage1 cross build for KFreeBSD. Closes: #796901.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 07 Sep 2015 21:51:27 +0200
+
 gcc-5 (5.2.1-16) unstable; urgency=medium
 
   * Update to SVN 20150903 (r227431, 5.2.1) from the gcc-5-branch.
diff --git a/debian/control b/debian/control
index 0a7807d..8dd8e7c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 5.0.62), dpkg-dev (>= 1.17.11), 
   g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32], g++-4.9 [arm64], 
   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-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 mipsn32 mipsn32el mips64 mips64el s390x sparc64 x32], libn32gcc1 [mips mipsel mips64 mips64el], lib64gcc1 [i386 mips mipsel mipsn32 mipsn32el powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel mipsn32 mipsn32el], libc6-dev-mipsn32 [mips mipsel mips64 mips64el], libc6-dev-mips32 [mipsn32 mipsn32el mips64 mips64el], libc6-dev-x32 [amd64 i386], libx32gcc1 [amd64 i386], libc6.1-dbg [alpha ia64] | libc0.3-dbg [hurd-i386] | libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64] | libc6-dbg, 
-  kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], 
+  kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], linux-libc-dev [m68k], 
   m4, libtool, autoconf2.64, 
   libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], 
   autogen, gawk, lzma, xz-utils, patchutils, 
diff --git a/debian/control.m4 b/debian/control.m4
index 251b37d..35da8ea 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -60,7 +60,7 @@ Standards-Version: 3.9.6
 ifdef(`TARGET',`dnl cross
 Build-Depends: debhelper (>= 5.0.62), DPKG_BUILD_DEP
   LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP
-  kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any],
+  kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], linux-libc-dev [m68k],
   LIBUNWIND_BUILD_DEP LIBATOMIC_OPS_BUILD_DEP AUTO_BUILD_DEP
   SOURCE_BUILD_DEP CROSS_BUILD_DEP
   ISL_BUILD_DEP MPC_BUILD_DEP MPFR_BUILD_DEP GMP_BUILD_DEP,
@@ -71,7 +71,7 @@ Build-Depends: debhelper (>= 5.0.62), DPKG_BUILD_DEP
 Build-Depends: debhelper (>= 5.0.62), DPKG_BUILD_DEP
   GCC_MULTILIB_BUILD_DEP
   LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP LIBC_DBG_DEP
-  kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any],
+  kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], linux-libc-dev [m68k],
   AUTO_BUILD_DEP BASE_BUILD_DEP
   libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64],
   autogen, gawk, lzma, xz-utils, patchutils,
diff --git a/debian/patches/gcc-sh-bootstrap-ignore.diff b/debian/patches/gcc-sh-bootstrap-ignore.diff
deleted file mode 100644
index 18d763e..0000000
--- a/debian/patches/gcc-sh-bootstrap-ignore.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-# DP: Ignore differences in gcc/real.o in the bootstrap build for
-# DP: sh*-*linux-gnu targets.  According to PR 67002, "A rare indeterminacy
-# DP: of the register choice.  Both codes are valid.  It seems very hard to
-# DP: find where has this indeterminacy come from".
-
---- a/src/configure.ac	2015-05-03 19:29:57.000000000 +0200
-+++ b/src/configure.ac	2015-07-29 15:05:55.367918725 +0200
-@@ -3553,6 +3553,7 @@
-   hppa*64*-*-hpux*) ;;
-   hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;;
-   powerpc*-ibm-aix*) compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/* | *libgomp*\$(objext)" ;;
-+  sh*-*linux-gnu) compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/* | gcc/real\$(objext)" ;;
- esac
- AC_SUBST(compare_exclusions)
- 
diff --git a/debian/patches/kfreebsd-unwind.diff b/debian/patches/kfreebsd-unwind.diff
index e3f39fe..0c94295 100644
--- a/debian/patches/kfreebsd-unwind.diff
+++ b/debian/patches/kfreebsd-unwind.diff
@@ -32,3 +32,20 @@ Index: b/src/libgcc/config.host
  	extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
  	tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm i386/t-crtstuff t-dfprules"
  	tm_file="${tm_file} i386/elf-lib.h"
+--- a/src/libgcc/config/i386/freebsd-unwind.h
++++ a/src/libgcc/config/i386/freebsd-unwind.h
+@@ -26,6 +26,8 @@
+ /* Do code reading to identify a signal frame, and set the frame
+    state data appropriately.  See unwind-dw2.c for the structs. */
+
++#ifndef inhibit_libc
++
+ #include <sys/types.h>
+ #include <signal.h>
+ #include <sys/ucontext.h>
+@@ -171,3 +171,5 @@
+   return _URC_NO_REASON;
+ }
+ #endif /* ifdef __x86_64__  */
++
++#endif /* ifndef inhibit_libc */
diff --git a/debian/rules.patch b/debian/rules.patch
index 347502a..092fcfc 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -88,7 +88,6 @@ debian_patches += \
 	go-escape-analysis6 \
 	gccgo-sendfile-fix \
 	pr66368 \
-	gcc-sh-bootstrap-ignore \
 	pr67280 \
 
 ifeq ($(libstdcxx_abi),new)