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-8+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.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Feb 2016 08:47:32 +0000
+
 gcc-5 (5.3.1-8) unstable; urgency=medium
 
   * Update to SVN 20160205 (r233179, 5.3.1) from the gcc-5-branch.
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
@@ -894,7 +894,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