diff -u gcc-5-5.2.1/debian/changelog gcc-5-5.2.1/debian/changelog
--- gcc-5-5.2.1/debian/changelog
+++ gcc-5-5.2.1/debian/changelog
@@ -1,3 +1,10 @@
+gcc-5 (5.2.1-22+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>  Fri, 16 Oct 2015 06:10:01 +0000
+
 gcc-5 (5.2.1-22) unstable; urgency=medium
 
   * Update to SVN 20151010 (r228681, 5.2.1) from the gcc-5-branch.
diff -u gcc-5-5.2.1/debian/rules.defs gcc-5-5.2.1/debian/rules.defs
--- gcc-5-5.2.1/debian/rules.defs
+++ gcc-5-5.2.1/debian/rules.defs
@@ -871,7 +871,7 @@
 # D ---------------------------
 d_no_cross := yes
 d_no_snap := yes
-d_no_cpus := s390 sh4
+d_no_cpus := s390 sh4 arm
 
 ifneq ($(single_package),yes)
   with_separate_gdc := yes