diff -Nru openjdk-7-7u65-2.5.1/debian/changelog openjdk-7-7u65-2.5.1/debian/changelog
--- openjdk-7-7u65-2.5.1/debian/changelog	2014-07-25 18:49:03.000000000 +0000
+++ openjdk-7-7u65-2.5.1/debian/changelog	2014-07-27 22:51:14.000000000 +0000
@@ -1,3 +1,9 @@
+openjdk-7 (7u65-2.5.1-4+rpi1) jessie-staging; urgency=medium
+
+  * Tag assembler as armv6 to avoid setting off armv7 contamination checker.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 27 Jul 2014 22:47:56 +0000
+
 openjdk-7 (7u65-2.5.1-4) unstable; urgency=medium
 
   * Let the file system check for the libpcsclite library succeed again,
diff -Nru openjdk-7-7u65-2.5.1/debian/openjdk-7-jre-zero/usr/share/lintian/overrides/openjdk-7-jre-zero openjdk-7-7u65-2.5.1/debian/openjdk-7-jre-zero/usr/share/lintian/overrides/openjdk-7-jre-zero
--- openjdk-7-7u65-2.5.1/debian/openjdk-7-jre-zero/usr/share/lintian/overrides/openjdk-7-jre-zero	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-7-7u65-2.5.1/debian/openjdk-7-jre-zero/usr/share/lintian/overrides/openjdk-7-jre-zero	2014-07-27 22:51:14.000000000 +0000
@@ -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
diff -Nru openjdk-7-7u65-2.5.1/debian/patches/tag-asm-as-armv6.diff openjdk-7-7u65-2.5.1/debian/patches/tag-asm-as-armv6.diff
--- openjdk-7-7u65-2.5.1/debian/patches/tag-asm-as-armv6.diff	1970-01-01 00:00:00.000000000 +0000
+++ openjdk-7-7u65-2.5.1/debian/patches/tag-asm-as-armv6.diff	2014-07-27 22:51:14.000000000 +0000
@@ -0,0 +1,21 @@
+diff -ur openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S openjdk.new/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+--- openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	2014-07-15 21:55:15.000000000 +0000
++++ openjdk.new/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	2014-07-27 22:22:50.000000000 +0000
+@@ -625,7 +625,7 @@
+ 	.arch armv4
+ 
+ #else
+-	.arch armv7-a
++	.arch armv6
+ #endif
+ 
+ #ifdef HW_FP
+@@ -5029,7 +5029,7 @@
+ 
+ 	SUB_DISPATCH_TABLES
+ 
+-	.arch	armv7-a
++	.arch	armv6
+ 
+ 	ALIGN_CODE
+ 	.global	Thumb2_stubs
diff -Nru openjdk-7-7u65-2.5.1/debian/rules openjdk-7-7u65-2.5.1/debian/rules
--- openjdk-7-7u65-2.5.1/debian/rules	2014-07-25 15:28:05.000000000 +0000
+++ openjdk-7-7u65-2.5.1/debian/rules	2014-07-27 22:51:14.000000000 +0000
@@ -419,7 +419,8 @@
 	debian/patches/default-jvm-cfg-$(hotspot_version).diff \
 	debian/patches/nonreparenting-wm.diff \
 	debian/patches/accessible-toolkit.patch \
-	debian/patches/fix_extra_flags-$(hotspot_version).diff
+	debian/patches/fix_extra_flags-$(hotspot_version).diff \
+	debian/patches/tag-asm-as-armv6.diff
 
 ifeq ($(with_bridge),atk)
     DISTRIBUTION_PATCHES += \