diff -u gcc-5-5.3.1/debian/changelog gcc-5-5.3.1/debian/changelog
--- gcc-5-5.3.1/debian/changelog
+++ gcc-5-5.3.1/debian/changelog
@@ -1,3 +1,10 @@
+gcc-5 (5.3.1-4+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 5.1.1-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 15 May 2015 20:59:06 +0000]
+  * Build without D due to build failure in D stuff.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 26 Dec 2015 21:38:00 +0000
+
 gcc-5 (5.3.1-4) unstable; urgency=medium
 
   * Update to SVN 20151219 (r231847, 5.3.1) from the gcc-5-branch.
diff -u gcc-5-5.3.1/debian/control gcc-5-5.3.1/debian/control
--- gcc-5-5.3.1/debian/control
+++ gcc-5-5.3.1/debian/control
@@ -474,114 +474,6 @@
 Description: GCC OpenMP (GOMP) support library (x32 debug symbols)
  GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers
 
-Package: libitm1
-Section: libs
-Architecture: any
-Provides: libitm1-armel [armel], libitm1-armhf [armhf]
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: GNU Transactional Memory Library
- GNU Transactional Memory Library (libitm) provides transaction support for
- accesses to the memory of a process, enabling easy-to-use synchronization of
- accesses to shared memory by several threads.
-
-Package: libitm1-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), libitm1 (= ${gcc:Version}), ${misc:Depends}
-Provides: libitm1-dbg-armel [armel], libitm1-dbg-armhf [armhf]
-Multi-Arch: same
-Description: GNU Transactional Memory Library (debug symbols)
- GNU Transactional Memory Library (libitm) provides transaction support for
- accesses to the memory of a process, enabling easy-to-use synchronization of
- accesses to shared memory by several threads.
-
-Package: lib32itm1
-Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: ${confl:lib32}
-Description: GNU Transactional Memory Library (32bit)
- GNU Transactional Memory Library (libitm) provides transaction support for
- accesses to the memory of a process, enabling easy-to-use synchronization of
- accesses to shared memory by several threads.
-
-Package: lib32itm1-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), lib32itm1 (= ${gcc:Version}), ${misc:Depends}
-Description: GNU Transactional Memory Library (32 bit debug symbols)
- GNU Transactional Memory Library (libitm) provides transaction support for
- accesses to the memory of a process, enabling easy-to-use synchronization of
- accesses to shared memory by several threads.
-
-Package: lib64itm1
-Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: GNU Transactional Memory Library (64bit)
- GNU Transactional Memory Library (libitm) provides transaction support for
- accesses to the memory of a process, enabling easy-to-use synchronization of
- accesses to shared memory by several threads.
-
-Package: lib64itm1-dbg
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), lib64itm1 (= ${gcc:Version}), ${misc:Depends}
-Description: GNU Transactional Memory Library (64bit debug symbols)
- GNU Transactional Memory Library (libitm) provides transaction support for
- accesses to the memory of a process, enabling easy-to-use synchronization of
- accesses to shared memory by several threads.
-
-#Package: libn32itm`'ITM_SO`'LS
-#Section: ifdef(`TARGET',`devel',`libs')
-#Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchn32_archs')
-#Priority: ifdef(`TARGET',`extra',`PRI(optional)')
-#Depends: BASELDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-#BUILT_USING`'dnl
-#Description: GNU Transactional Memory Library (n32)
-# GNU Transactional Memory Library (libitm) provides transaction support for
-# accesses to the memory of a process, enabling easy-to-use synchronization of
-# accesses to shared memory by several threads.
-
-#Package: libn32itm`'ITM_SO-dbg`'LS
-#Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchn32_archs')
-#Section: debug
-#Priority: extra
-#Depends: BASELDEP, libdep(itm`'ITM_SO,n32,=), ${misc:Depends}
-#BUILT_USING`'dnl
-#Description: GNU Transactional Memory Library (n32 debug symbols)
-# GNU Transactional Memory Library (libitm) provides transaction support for
-# accesses to the memory of a process, enabling easy-to-use synchronization of
-# accesses to shared memory by several threads.
-
-Package: libx32itm1
-Section: libs
-Architecture: amd64 i386
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: GNU Transactional Memory Library (x32)
- This manual documents the usage and internals of libitm. It provides
- transaction support for accesses to the memory of a process, enabling
- easy-to-use synchronization of accesses to shared memory by several threads.
-
-Package: libx32itm1-dbg
-Architecture: amd64 i386
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), libx32itm1 (= ${gcc:Version}), ${misc:Depends}
-Description: GNU Transactional Memory Library (x32 debug symbols)
- This manual documents the usage and internals of libitm. It provides
- transaction support for accesses to the memory of a process, enabling
- easy-to-use synchronization of accesses to shared memory by several threads.
-
 Package: libatomic1
 Section: libs
 Architecture: any
@@ -776,127 +668,6 @@
  AddressSanitizer (ASan) is a fast memory error detector.  It finds
  use-after-free and {heap,stack,global}-buffer overflow bugs in C/C++ programs.
 
-Package: liblsan0
-Section: libs
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: LeakSanitizer -- a memory leak detector (runtime)
- LeakSanitizer (Lsan) is a memory leak detector which is integrated
- into AddressSanitizer.
-
-Package: liblsan0-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), liblsan0 (= ${gcc:Version}), ${misc:Depends}
-Multi-Arch: same
-Description: LeakSanitizer -- a memory leak detector (debug symbols)
- LeakSanitizer (Lsan) is a memory leak detector which is integrated
- into AddressSanitizer.
-
-Package: lib32lsan0
-Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: ${confl:lib32}
-Description: LeakSanitizer -- a memory leak detector (32bit)
- LeakSanitizer (Lsan) is a memory leak detector which is integrated
- into AddressSanitizer (empty package).
-
-Package: lib32lsan0-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), lib32lsan0 (= ${gcc:Version}), ${misc:Depends}
-Description: LeakSanitizer -- a memory leak detector (32 bit debug symbols)
- LeakSanitizer (Lsan) is a memory leak detector which is integrated
- into AddressSanitizer (empty package).
-
-#Package: lib64lsan`'LSAN_SO`'LS
-#Section: ifdef(`TARGET',`devel',`libs')
-#Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarch64_archs')
-#Priority: ifdef(`TARGET',`extra',`PRI(optional)')
-#Depends: BASELDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-#BUILT_USING`'dnl
-#Description: LeakSanitizer -- a memory leak detector (64bit)
-# LeakSanitizer (Lsan) is a memory leak detector which is integrated
-# into AddressSanitizer.
-
-#Package: lib64lsan`'LSAN_SO-dbg`'LS
-#Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarch64_archs')
-#Section: debug
-#Priority: extra
-#Depends: BASELDEP, libdep(lsan`'LSAN_SO,64,=), ${misc:Depends}
-#BUILT_USING`'dnl
-#Description: LeakSanitizer -- a memory leak detector (64bit debug symbols)
-# LeakSanitizer (Lsan) is a memory leak detector which is integrated
-# into AddressSanitizer.
-
-#Package: libn32lsan`'LSAN_SO`'LS
-#Section: ifdef(`TARGET',`devel',`libs')
-#Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchn32_archs')
-#Priority: ifdef(`TARGET',`extra',`PRI(optional)')
-#Depends: BASELDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-#BUILT_USING`'dnl
-#Description: LeakSanitizer -- a memory leak detector (n32)
-# LeakSanitizer (Lsan) is a memory leak detector which is integrated
-# into AddressSanitizer.
-
-#Package: libn32lsan`'LSAN_SO-dbg`'LS
-#Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchn32_archs')
-#Section: debug
-#Priority: extra
-#Depends: BASELDEP, libdep(lsan`'LSAN_SO,n32,=), ${misc:Depends}
-#BUILT_USING`'dnl
-#Description: LeakSanitizer -- a memory leak detector (n32 debug symbols)
-# LeakSanitizer (Lsan) is a memory leak detector which is integrated
-# into AddressSanitizer.
-
-Package: libx32lsan0
-Section: libs
-Architecture: amd64 i386
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: LeakSanitizer -- a memory leak detector (x32)
- LeakSanitizer (Lsan) is a memory leak detector which is integrated
- into AddressSanitizer (empty package).
-
-Package: libx32lsan0-dbg
-Architecture: amd64 i386
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), libx32lsan0 (= ${gcc:Version}), ${misc:Depends}
-Description: LeakSanitizer -- a memory leak detector (x32 debug symbols)
- LeakSanitizer (Lsan) is a memory leak detector which is integrated
- into AddressSanitizer (empty package).
-
-Package: libtsan0
-Section: libs
-Architecture: any
-Provides: libtsan0-armel [armel], libtsan0-armhf [armhf]
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: ThreadSanitizer -- a Valgrind-based detector of data races (runtime)
- ThreadSanitizer (Tsan) is a data race detector for C/C++ programs. 
- The Linux and Mac versions are based on Valgrind. 
-
-Package: libtsan0-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), libtsan0 (= ${gcc:Version}), ${misc:Depends}
-Provides: libtsan0-dbg-armel [armel], libtsan0-dbg-armhf [armhf]
-Multi-Arch: same
-Description: ThreadSanitizer -- a Valgrind-based detector of data races (debug symbols)
- ThreadSanitizer (Tsan) is a data race detector for C/C++ programs. 
- The Linux and Mac versions are based on Valgrind. 
-
 Package: libubsan0
 Section: libs
 Architecture: any
@@ -1005,257 +776,6 @@
  Various computations will be instrumented to detect undefined behavior
  at runtime. Available for C and C++.
 
-Package: libcilkrts5
-Section: libs
-Architecture: any
-Provides: libcilkrts5-armel [armel], libcilkrts5-armhf [armhf]
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Intel Cilk Plus language extensions (runtime)
- Intel Cilk Plus is an extension to the C and C++ languages to support
- data and task parallelism.
-
-Package: libcilkrts5-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), libcilkrts5 (= ${gcc:Version}), ${misc:Depends}
-Provides: libcilkrts5-dbg-armel [armel], libcilkrts5-dbg-armhf [armhf]
-Multi-Arch: same
-Description: Intel Cilk Plus language extensions (debug symbols)
- Intel Cilk Plus is an extension to the C and C++ languages to support
- data and task parallelism.
-
-Package: lib32cilkrts5
-Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: ${confl:lib32}
-Description: Intel Cilk Plus language extensions (32bit)
- Intel Cilk Plus is an extension to the C and C++ languages to support
- data and task parallelism.
-
-Package: lib32cilkrts5-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), lib32cilkrts5 (= ${gcc:Version}), ${misc:Depends}
-Description: Intel Cilk Plus language extensions (32 bit debug symbols)
- Intel Cilk Plus is an extension to the C and C++ languages to support
- data and task parallelism.
-
-Package: lib64cilkrts5
-Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: Intel Cilk Plus language extensions (64bit)
- Intel Cilk Plus is an extension to the C and C++ languages to support
- data and task parallelism.
-
-Package: lib64cilkrts5-dbg
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), lib64cilkrts5 (= ${gcc:Version}), ${misc:Depends}
-Description: Intel Cilk Plus language extensions (64bit debug symbols)
- Intel Cilk Plus is an extension to the C and C++ languages to support
- data and task parallelism.
-
-Package: libx32cilkrts5
-Section: libs
-Architecture: amd64 i386
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: Intel Cilk Plus language extensions (x32)
- Intel Cilk Plus is an extension to the C and C++ languages to support
- data and task parallelism.
-
-Package: libx32cilkrts5-dbg
-Architecture: amd64 i386
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), libx32cilkrts5 (= ${gcc:Version}), ${misc:Depends}
-Description: Intel Cilk Plus language extensions (x32 debug symbols)
- Intel Cilk Plus is an extension to the C and C++ languages to support
- data and task parallelism.
-
-Package: libmpx0
-Section: libs
-Architecture: any
-Provides: libmpx0-armel [armel], libmpx0-armhf [armhf]
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Intel memory protection extensions (runtime)
- Intel MPX is a set of processor features which, with compiler,
- runtime library and OS support, brings increased robustness to
- software by checking pointer references whose compile time normal
- intentions are usurped at runtime due to buffer overflow.
-
-Package: libmpx0-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), libmpx0 (= ${gcc:Version}), ${misc:Depends}
-Provides: libmpx0-dbg-armel [armel], libmpx0-dbg-armhf [armhf]
-Multi-Arch: same
-Description: Intel memory protection extensions (debug symbols)
- Intel MPX is a set of processor features which, with compiler,
- runtime library and OS support, brings increased robustness to
- software by checking pointer references whose compile time normal
- intentions are usurped at runtime due to buffer overflow.
-
-Package: lib32mpx0
-Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: ${confl:lib32}
-Description: Intel memory protection extensions (32bit)
- Intel MPX is a set of processor features which, with compiler,
- runtime library and OS support, brings increased robustness to
- software by checking pointer references whose compile time normal
- intentions are usurped at runtime due to buffer overflow.
-
-Package: lib32mpx0-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), lib32mpx0 (= ${gcc:Version}), ${misc:Depends}
-Description: Intel memory protection extensions (32 bit debug symbols)
- Intel MPX is a set of processor features which, with compiler,
- runtime library and OS support, brings increased robustness to
- software by checking pointer references whose compile time normal
- intentions are usurped at runtime due to buffer overflow.
-
-Package: lib64mpx0
-Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: Intel memory protection extensions (64bit)
- Intel MPX is a set of processor features which, with compiler,
- runtime library and OS support, brings increased robustness to
- software by checking pointer references whose compile time normal
- intentions are usurped at runtime due to buffer overflow.
-
-Package: lib64mpx0-dbg
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), lib64mpx0 (= ${gcc:Version}), ${misc:Depends}
-Description: Intel memory protection extensions (64bit debug symbols)
- Intel MPX is a set of processor features which, with compiler,
- runtime library and OS support, brings increased robustness to
- software by checking pointer references whose compile time normal
- intentions are usurped at runtime due to buffer overflow.
-
-Package: libquadmath0
-Section: libs
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: GCC Quad-Precision Math Library
- A library, which provides quad-precision mathematical functions on targets
- supporting the __float128 datatype. The library is used to provide on such
- targets the REAL(16) type in the GNU Fortran compiler.
-
-Package: libquadmath0-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), libquadmath0 (= ${gcc:Version}), ${misc:Depends}
-Multi-Arch: same
-Description: GCC Quad-Precision Math Library (debug symbols)
- A library, which provides quad-precision mathematical functions on targets
- supporting the __float128 datatype.
-
-Package: lib32quadmath0
-Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: ${confl:lib32}
-Description: GCC Quad-Precision Math Library (32bit)
- A library, which provides quad-precision mathematical functions on targets
- supporting the __float128 datatype. The library is used to provide on such
- targets the REAL(16) type in the GNU Fortran compiler.
-
-Package: lib32quadmath0-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), lib32quadmath0 (= ${gcc:Version}), ${misc:Depends}
-Description: GCC Quad-Precision Math Library (32 bit debug symbols)
- A library, which provides quad-precision mathematical functions on targets
- supporting the __float128 datatype.
-
-Package: lib64quadmath0
-Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: GCC Quad-Precision Math Library  (64bit)
- A library, which provides quad-precision mathematical functions on targets
- supporting the __float128 datatype. The library is used to provide on such
- targets the REAL(16) type in the GNU Fortran compiler.
-
-Package: lib64quadmath0-dbg
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), lib64quadmath0 (= ${gcc:Version}), ${misc:Depends}
-Description: GCC Quad-Precision Math Library  (64bit debug symbols)
- A library, which provides quad-precision mathematical functions on targets
- supporting the __float128 datatype.
-
-#Package: libn32quadmath`'QMATH_SO`'LS
-#Section: ifdef(`TARGET',`devel',`libs')
-#Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchn32_archs')
-#Priority: ifdef(`TARGET',`extra',`PRI(optional)')
-#Depends: BASELDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-#BUILT_USING`'dnl
-#Description: GCC Quad-Precision Math Library (n32)
-# A library, which provides quad-precision mathematical functions on targets
-# supporting the __float128 datatype. The library is used to provide on such
-# targets the REAL(16) type in the GNU Fortran compiler.
-
-#Package: libn32quadmath`'QMATH_SO-dbg`'LS
-#Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchn32_archs')
-#Section: debug
-#Priority: extra
-#Depends: BASELDEP, libdep(quadmath`'QMATH_SO,n32,=), ${misc:Depends}
-#BUILT_USING`'dnl
-#Description: GCC Quad-Precision Math Library (n32 debug symbols)
-# A library, which provides quad-precision mathematical functions on targets
-# supporting the __float128 datatype.
-
-Package: libx32quadmath0
-Section: libs
-Architecture: amd64 i386
-Priority: optional
-Depends: gcc-5-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: GCC Quad-Precision Math Library (x32)
- A library, which provides quad-precision mathematical functions on targets
- supporting the __float128 datatype. The library is used to provide on such
- targets the REAL(16) type in the GNU Fortran compiler.
-
-Package: libx32quadmath0-dbg
-Architecture: amd64 i386
-Section: debug
-Priority: extra
-Depends: gcc-5-base (= ${gcc:Version}), libx32quadmath0 (= ${gcc:Version}), ${misc:Depends}
-Description: GCC Quad-Precision Math Library (x32 debug symbols)
- A library, which provides quad-precision mathematical functions on targets
- supporting the __float128 datatype.
-
 Package: libcc1-0
 Section: libs
 Architecture: any
diff -u gcc-5-5.3.1/debian/rules.defs gcc-5-5.3.1/debian/rules.defs
--- gcc-5-5.3.1/debian/rules.defs
+++ gcc-5-5.3.1/debian/rules.defs
@@ -891,7 +891,7 @@
 # D ---------------------------
 d_no_cross := yes
 d_no_snap := yes
-d_no_cpus := s390
+d_no_cpus := s390 arm
 
 ifneq ($(single_package),yes)
   with_separate_gdc := yes
diff -u gcc-5-5.3.1/debian/rules.parameters gcc-5-5.3.1/debian/rules.parameters
--- gcc-5-5.3.1/debian/rules.parameters
+++ gcc-5-5.3.1/debian/rules.parameters
@@ -2,14 +2,14 @@
 GCC_VERSION	:= 5.3.1
 NEXT_GCC_VERSION	:= 5.3.2
 BASE_VERSION	:= 5
-SOURCE_VERSION	:= 5.3.1-4
-DEB_VERSION	:= 5.3.1-4
-DEB_EVERSION	:= 1:5.3.1-4
-DEB_GDC_VERSION	:= 5.3.1-4
+SOURCE_VERSION	:= 5.3.1-4+rpi1
+DEB_VERSION	:= 5.3.1-4+rpi1
+DEB_EVERSION	:= 1:5.3.1-4+rpi1
+DEB_GDC_VERSION	:= 5.3.1-4+rpi1
 DEB_SOVERSION	:= 5
 DEB_SOEVERSION	:= 1:5
 DEB_LIBGCC_SOVERSION	:= 
-DEB_LIBGCC_VERSION	:= 1:5.3.1-4
+DEB_LIBGCC_VERSION	:= 1:5.3.1-4+rpi1
 DEB_STDCXX_SOVERSION	:= 5
 DEB_GCJ_SOVERSION	:= 5
 PKG_GCJ_EXT	:= 16