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-10-23 13:53:23.000000000 +0000 +++ openjdk-7-7u71-2.5.3/debian/changelog 2014-11-07 00:13:28.000000000 +0000 @@ -1,3 +1,9 @@ +openjdk-7 (7u71-2.5.3-1+rpi1) jessie-staging; urgency=medium + + * Tag assembler as armv6 to avoid setting off armv7 contamination checker. + + -- Peter Michael Green Fri, 07 Nov 2014 00:13:12 +0000 + openjdk-7 (7u71-2.5.3-1) unstable; urgency=high * IcedTea7 2.5.1 release (based on OpenJDK 7u65). 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-07 00:10:09.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-10-22 23:21:05.000000000 +0000 +++ openjdk-7-7u71-2.5.3/debian/rules 2014-11-07 00:12: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 += \