diff -u openjdk-7-7~u3-2.1.1/debian/rules openjdk-7-7~u3-2.1.1/debian/rules
--- openjdk-7-7~u3-2.1.1/debian/rules
+++ openjdk-7-7~u3-2.1.1/debian/rules
@@ -140,7 +140,7 @@
   # TODO kfreebsd porting for cacao vm
 endif
 ifeq (,$(filter $(distrel),squeeze lenny maverick lucid karmic hardy dapper))
-  jamvm_archs = amd64 armel armhf i386 lpia mips mipsel powerpc kfreebsd-i386 kfreebsd-amd64
+  jamvm_archs = amd64 armel i386 lpia mips mipsel powerpc kfreebsd-i386 kfreebsd-amd64
 endif
 ifeq (,$(filter $(distrel),wheezy sid squeeze lenny maverick natty maverick lucid karmic hardy dapper))
   jamvm_defaults =
@@ -465,7 +465,7 @@
     endif
   endif    
 endif
-
+  DISTRIBUTION_PATCHES += debian/patches/armhf_armv6_asmfix.diff
 export DISTRIBUTION_PATCHES DISTRIBUTION_ECJ_PATCHES
 
 ifeq ($(STAGE1_JAVA),gcj)
diff -u openjdk-7-7~u3-2.1.1/debian/changelog openjdk-7-7~u3-2.1.1/debian/changelog
--- openjdk-7-7~u3-2.1.1/debian/changelog
+++ openjdk-7-7~u3-2.1.1/debian/changelog
@@ -1,3 +1,10 @@
+openjdk-7 (7~u3-2.1.1-1+rpi1) wheezy; urgency=low
+
+  * Alter arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S for armv6
+  * Disable building of jamvm package as it comes out armv7 dirty
+
+ -- Peter Michael Green <plugwash@p10link.net>  Mon, 30 Jul 2012 12:46:55 +0000
+
 openjdk-7 (7~u3-2.1.1-1) unstable; urgency=medium
 
   * New upstream release with security fixes (Closes: #677486):
only in patch2:
unchanged:
--- openjdk-7-7~u3-2.1.1.orig/debian/openjdk-7-jre-zero/usr/share/lintian/overrides/openjdk-7-jre-zero
+++ openjdk-7-7~u3-2.1.1/debian/openjdk-7-jre-zero/usr/share/lintian/overrides/openjdk-7-jre-zero
@@ -0,0 +1,2 @@
+# Strip libjvm.so with --strip-debug instead of --strip-unneeded. LP: #574997.
+openjdk-7-jre-zero binary: unstripped-binary-or-object
only in patch2:
unchanged:
--- openjdk-7-7~u3-2.1.1.orig/debian/patches/armhf_armv6_asmfix.diff
+++ openjdk-7-7~u3-2.1.1/debian/patches/armhf_armv6_asmfix.diff
@@ -0,0 +1,27 @@
+--- openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
++++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+@@ -583,13 +583,13 @@
+ 	.arch armv4
+ 
+ #else
+-	.arch armv7-a
++	.arch armv6
+ #endif
+ 
+ #ifdef HW_FP
+ 
+ #ifdef __ARM_PCS_VFP
+- 	.fpu vfpv3-d16
++ 	.fpu vfpv2
+ 	.eabi_attribute Tag_ABI_HardFP_use, 3
+ 	.eabi_attribute Tag_ABI_VFP_args, 1
+ #else // __ARM_PCS_VFP
+@@ -5046,7 +5046,7 @@
+ 
+ 	SUB_DISPATCH_TABLES
+ 
+-	.arch	armv7-a
++	.arch	armv6
+ 
+ 	ALIGN_CODE
+ 	.global	Thumb2_stubs