diff -u gcc-4.8-4.8.1/debian/changelog gcc-4.8-4.8.1/debian/changelog
--- gcc-4.8-4.8.1/debian/changelog
+++ gcc-4.8-4.8.1/debian/changelog
@@ -1,3 +1,10 @@
+gcc-4.8 (4.8.1-10+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.1-10) unstable; urgency=low
 
   * Update to SVN 20130904 (r202243) from the gcc-4_8-branch.
diff -u gcc-4.8-4.8.1/debian/control gcc-4.8-4.8.1/debian/control
--- gcc-4.8-4.8.1/debian/control
+++ gcc-4.8-4.8.1/debian/control
@@ -10,11 +10,11 @@
   m4, libtool, autoconf2.64, 
   libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], 
   zlib1g-dev, gawk, lzma, xz-utils, patchutils, 
-  binutils (>= 2.23.52) | binutils-multiarch (>= 2.23.52), binutils-hppa64 (>= 2.23.52) [hppa], 
+  binutils (>= 2.22) | binutils-multiarch (>= 2.22), binutils-hppa64 (>= 2.22) [hppa], 
   gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, 
   texinfo (>= 4.3), locales, sharutils, 
   procps, zlib1g-dev, libantlr-java, python, libffi-dev, fastjar, libmagic-dev, libecj-java (>= 3.3.0-2), zip, libasound2-dev [ !hurd-any !kfreebsd-any], libxtst-dev, libxt-dev, libgtk2.0-dev (>= 2.4.4-2), libart-2.0-dev, libcairo2-dev, g++-4.8 [armel armhf], netbase, 
-  libcloog-isl-dev (>= 0.18), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), 
+  libcloog-isl-dev (>= 0.18), libmpc-dev, libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), 
   dejagnu [!m68k !hurd-amd64 !hurd-i386 !hurd-alpha], autogen, realpath (>= 1.9.12), chrpath, lsb-release, quilt
 Build-Depends-Indep: doxygen (>= 1.7.2), graphviz (>= 2.2), ghostscript, texlive-latex-base, xsltproc, libxml2-utils, docbook-xsl-ns, 
 Homepage: http://gcc.gnu.org/
@@ -235,7 +235,7 @@
   binutils (>= ${binutils:Version}), 
   libgcc-4.8-dev (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
 Recommends: ${dep:libcdev}
-Suggests: ${gcc:multilib}, libmudflap0-4.8-dev (= ${gcc:Version}), gcc-4.8-doc (>= ${gcc:SoftVersion}), gcc-4.8-locales (>= ${gcc:SoftVersion}), libgcc1-dbg (>= ${libgcc:Version}), libgomp1-dbg (>= ${gcc:Version}), libitm1-dbg (>= ${gcc:Version}), libatomic1-dbg (>= ${gcc:Version}), libasan0-dbg (>= ${gcc:Version}), libtsan0-dbg (>= ${gcc:Version}), libbacktrace1-dbg (>= ${gcc:Version}), libquadmath0-dbg (>= ${gcc:Version}), libmudflap0-dbg (>= ${gcc:Version}), ${dep:libcloog}, ${dep:gold}
+Suggests: ${gcc:multilib}, libmudflap0-4.8-dev (= ${gcc:Version}), gcc-4.8-doc (>= ${gcc:SoftVersion}), gcc-4.8-locales (>= ${gcc:SoftVersion}), libgcc1-dbg (>= ${libgcc:Version}), libgomp1-dbg (>= ${gcc:Version}), libitm1-dbg (>= ${gcc:Version}), libatomic1-dbg (>= ${gcc:Version}), libasan0-dbg (>= ${gcc:Version}), libtsan0-dbg (>= ${gcc:Version}), libbacktrace1-dbg (>= ${gcc:Version}), libquadmath-dbg (>= ${gcc:Version}), libmudflap0-dbg (>= ${gcc:Version}), ${dep:libcloog}, ${dep:gold}
 Provides: c-compiler
 Description: GNU C compiler
  This is the GNU C compiler, a fairly portable optimizing compiler for C.
@@ -1795,28 +1795,6 @@
  .
  This compiler supports D language version 2.
 
-Package: libphobos-4.8-dev
-Architecture: amd64 i386 x32 kfreebsd-amd64 kfreebsd-i386
-Section: libdevel
-Priority: optional
-Depends: gcc-4.8-base (= ${gcc:Version}), zlib1g-dev, ${shlibs:Depends}, ${misc:Depends}
-Provides: libphobos-dev
-Description: Phobos D standard library
- This is the Phobos standard library that comes with the D2 compiler.
- .
- For more information check http://www.dlang.org/phobos/
-
-Package: libphobos-4.8-dbg
-Section: debug
-Architecture: amd64 i386 x32 kfreebsd-amd64 kfreebsd-i386
-Priority: extra
-Depends: gcc-4.8-base (= ${gcc:Version}), libphobos-4.8-dev (= ${gdc:Version}), ${misc:Depends}
-Provides: libphobos-dbg
-Description: The Phobos D standard library (debug symbols)
- This is the Phobos standard library that comes with the D2 compiler.
- .
- For more information check http://www.dlang.org/phobos/
-
 Package: gcc-4.8-soft-float
 Architecture: arm armel armhf
 Priority: optional
diff -u gcc-4.8-4.8.1/debian/rules.defs gcc-4.8-4.8.1/debian/rules.defs
--- gcc-4.8-4.8.1/debian/rules.defs
+++ gcc-4.8-4.8.1/debian/rules.defs
@@ -1158,7 +1158,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
diff -u gcc-4.8-4.8.1/debian/rules2 gcc-4.8-4.8.1/debian/rules2
--- gcc-4.8-4.8.1/debian/rules2
+++ gcc-4.8-4.8.1/debian/rules2
@@ -399,9 +399,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)
@@ -413,9 +413,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
@@ -426,7 +426,7 @@
   endif
   CONFARGS += --with-float=$(float_abi)
   ifeq ($(with_arm_thumb),yes)
-    CONFARGS += --with-mode=thumb
+    # CONFARGS += --with-mode=thumb
   endif
 endif