diff -u gcc-4.8-4.8.0/debian/changelog gcc-4.8-4.8.0/debian/changelog
--- gcc-4.8-4.8.0/debian/changelog
+++ gcc-4.8-4.8.0/debian/changelog
@@ -1,3 +1,10 @@
+gcc-4.8 (4.8.0-7+rpi1) jessie-staging; urgency=low
+
+  * Set defaults for raspbian (ARMv6+VFP)
+  * Disable testsuite
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 19 Jan 2013 08:07:17 +0000
+
 gcc-4.8 (4.8.0-7) unstable; urgency=medium
 
   * Update to SVN 20130512 (r198804) from the gcc-4_8-branch.
diff -u gcc-4.8-4.8.0/debian/rules2 gcc-4.8-4.8.0/debian/rules2
--- gcc-4.8-4.8.0/debian/rules2
+++ gcc-4.8-4.8.0/debian/rules2
@@ -370,9 +370,9 @@
     ifneq (,$(findstring gcj,$(PKGSOURCE)))
       with_arm_arch = armv6
     else
-      with_arm_arch = armv7-a
+      with_arm_arch = armv6
     endif
-    with_arm_fpu = vfpv3-d16
+    with_arm_fpu = vfp
   else
     # armel
     ifeq ($(distribution),Debian)
@@ -384,9 +384,9 @@
       ifneq (,$(findstring gcj,$(PKGSOURCE)))
         with_arm_arch = armv6
       else
-        with_arm_arch = armv7-a
+        with_arm_arch = armv6
       endif
-      with_arm_fpu = vfpv3-d16
+      with_arm_fpu = vfp
     else
       with_arm_arch = armv5t  # starting with quantal
     endif
@@ -397,7 +397,7 @@
   endif
   CONFARGS += --with-float=$(float_abi)
   ifeq ($(with_arm_thumb),yes)
-    CONFARGS += --with-mode=thumb
+    # CONFARGS += --with-mode=thumb
   endif
 endif
 
diff -u gcc-4.8-4.8.0/debian/rules.defs gcc-4.8-4.8.0/debian/rules.defs
--- gcc-4.8-4.8.0/debian/rules.defs
+++ gcc-4.8-4.8.0/debian/rules.defs
@@ -1133,7 +1133,7 @@
 # run testsuite ---------------
 with_check := yes
 # if you don't want to run the gcc testsuite, uncomment the next line
-#with_check := disabled by hand
+with_check := disabled by plugwash
 ifeq ($(with_base_only),yes)
   with_check := no
 endif