diff -u gcc-4.7-4.7.0/debian/rules2 gcc-4.7-4.7.0/debian/rules2
--- gcc-4.7-4.7.0/debian/rules2
+++ gcc-4.7-4.7.0/debian/rules2
@@ -356,15 +356,17 @@
     ifneq (,$(findstring gcj,$(PKGSOURCE)))
       CONFARGS += --with-arch=armv6
     else
-      CONFARGS += --with-arch=armv7-a
+      # RPI CONFARGS += --with-arch=armv7-a
+      CONFARGS += --with-arch=armv6
     endif
-    CONFARGS += --with-float=$(float_abi) --with-fpu=vfpv3-d16
+    # RPI CONFARGS += --with-float=$(float_abi) --with-fpu=vfpv3-d16
+    CONFARGS += --with-float=$(float_abi) --with-fpu=vfp
   else
     # Debian armel
     CONFARGS += --with-arch=armv4t --with-float=$(float_abi)
   endif
   ifeq ($(with_arm_thumb),yes)
-    CONFARGS += --with-mode=thumb
+    # RPI CONFARGS += --with-mode=thumb
   endif
 endif
 
diff -u gcc-4.7-4.7.0/debian/rules.defs gcc-4.7-4.7.0/debian/rules.defs
--- gcc-4.7-4.7.0/debian/rules.defs
+++ gcc-4.7-4.7.0/debian/rules.defs
@@ -608,7 +608,7 @@
 go_no_cross := no
 
 go_no_cpus := avr arm hppa m68k mips mipsel sh4 sparc sparc64
-ifeq (,$(filter $(distrelease),lenny etch squeeze sid dapper hardy jaunty karmic lucid maverick natty oneiric))
+ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy sid dapper hardy jaunty karmic lucid maverick natty oneiric))
   go_no_cpus := $(filter-out arm, $(go_no_cpus))
 endif
 ifneq ($(trunk_build),yes)
@@ -1040,7 +1040,7 @@
 # multilib
 biarch_map := i686=x86_64 powerpc=powerpc64 sparc=sparc64 s390=s390x s390x=s390 \
 		x86_64=i686 powerpc64=powerpc mips=mips64 mipsel=mips64el
-ifeq (,$(filter $(distrelease),lenny etch squeeze sid dapper hardy jaunty karmic lucid))
+ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy sid dapper hardy jaunty karmic lucid))
   biarch_map := $(subst i686=,i486=,$(biarch_map))
 endif
 ifeq ($(distribution),Ubuntu)
diff -u gcc-4.7-4.7.0/debian/changelog gcc-4.7-4.7.0/debian/changelog
--- gcc-4.7-4.7.0/debian/changelog
+++ gcc-4.7-4.7.0/debian/changelog
@@ -1,3 +1,10 @@
+gcc-4.7 (4.7.0-1.1+rpi) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Updated for Raspberry Pi Debian armhf build with ARMv6+VFP 
+
+ -- Mike Thompson <mpthompson@gmail.com>  Wed, 18 Apr 2012 11:47:19 -0700
+
 gcc-4.7 (4.7.0-1) unstable; urgency=low
 
   * GCC 4.7.0 release.