diff -Nru openjdk-7-7u71-2.5.3/debian/changelog openjdk-7-7u71-2.5.3/debian/changelog --- openjdk-7-7u71-2.5.3/debian/changelog 2014-11-13 10:10:36.000000000 +0000 +++ openjdk-7-7u71-2.5.3/debian/changelog 2014-11-26 23:37:53.000000000 +0000 @@ -1,3 +1,9 @@ +openjdk-7 (7u71-2.5.3-2+rpi1) jessie-staging; urgency=medium + + * Tag assembler as armv6 to avoid setting off armv7 contamination checker. + + -- Peter Michael Green Wed, 26 Nov 2014 23:37:32 +0000 + openjdk-7 (7u71-2.5.3-2) unstable; urgency=medium * Regenerate the .orig.tar to omit a third hotspot tarball. diff -Nru openjdk-7-7u71-2.5.3/debian/patches/tag-asm-as-armv6.diff openjdk-7-7u71-2.5.3/debian/patches/tag-asm-as-armv6.diff --- openjdk-7-7u71-2.5.3/debian/patches/tag-asm-as-armv6.diff 1970-01-01 00:00:00.000000000 +0000 +++ openjdk-7-7u71-2.5.3/debian/patches/tag-asm-as-armv6.diff 2014-11-26 23:37:53.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-7u71-2.5.3/debian/rules openjdk-7-7u71-2.5.3/debian/rules --- openjdk-7-7u71-2.5.3/debian/rules 2014-11-13 09:48:37.000000000 +0000 +++ openjdk-7-7u71-2.5.3/debian/rules 2014-11-26 23:37:53.000000000 +0000 @@ -419,6 +419,7 @@ debian/patches/nonreparenting-wm.diff \ debian/patches/accessible-toolkit.patch \ debian/patches/fix_extra_flags-$(hotspot_version).diff \ + debian/patches/tag-asm-as-armv6.diff ifeq ($(with_bridge),atk) DISTRIBUTION_PATCHES += \