diff -u gcj-4.7-4.7.2/debian/changelog gcj-4.7-4.7.2/debian/changelog
--- gcj-4.7-4.7.2/debian/changelog
+++ gcj-4.7-4.7.2/debian/changelog
@@ -1,3 +1,10 @@
+gcj-4.7 (4.7.2-2+rpi1) wheezy-staging; urgency=low
+
+  * Set compiler defaults for raspberry Pi.
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@p10link.net>  Mon, 26 Nov 2012 23:23:24 +0000
+
 gcj-4.7 (4.7.2-2) unstable; urgency=low
 
   * Merge the packaging and updates with gcc-4.7 4.7.2-4.
diff -u gcj-4.7-4.7.2/debian/rules.defs gcj-4.7-4.7.2/debian/rules.defs
--- gcj-4.7-4.7.2/debian/rules.defs
+++ gcj-4.7-4.7.2/debian/rules.defs
@@ -1021,7 +1021,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 gcj-4.7-4.7.2/debian/rules2 gcj-4.7-4.7.2/debian/rules2
--- gcj-4.7-4.7.2/debian/rules2
+++ gcj-4.7-4.7.2/debian/rules2
@@ -350,9 +350,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)
@@ -377,7 +377,7 @@
   endif
   CONFARGS += --with-float=$(float_abi)
   ifeq ($(with_arm_thumb),yes)
-    CONFARGS += --with-mode=thumb
+    #CONFARGS += --with-mode=thumb
   endif
 endif