diff -u openjdk-7-7u25-2.3.10/debian/rules openjdk-7-7u25-2.3.10/debian/rules --- openjdk-7-7u25-2.3.10/debian/rules +++ openjdk-7-7u25-2.3.10/debian/rules @@ -27,7 +27,7 @@ distribution := $(shell lsb_release --id --short) distrel := $(shell lsb_release --codename --short) ifeq ($(distrel),n/a) - distrel := sid + distrel := wheezy endif multiarch_dir = /$(DEB_HOST_MULTIARCH) @@ -488,7 +488,7 @@ endif endif endif - + DISTRIBUTION_PATCHES += debian/patches/armhf_armv6_asmfix.diff export DISTRIBUTION_PATCHES DISTRIBUTION_BOOT_PATCHES ifeq ($(STAGE1_JAVA),gcj) diff -u openjdk-7-7u25-2.3.10/debian/changelog openjdk-7-7u25-2.3.10/debian/changelog --- openjdk-7-7u25-2.3.10/debian/changelog +++ openjdk-7-7u25-2.3.10/debian/changelog @@ -1,3 +1,11 @@ +openjdk-7 (7u25-2.3.10-1~deb7u1+rpi1) wheezy-staging; urgency=low + + * Alter arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S for armv6 + * If the distro version can't be detected (it doesn't seem to be in my + wheezy-staging dev chroot) then asusme wheezy not sid. + + -- Peter Michael Green Sat, 19 Oct 2013 13:17:01 +0000 + openjdk-7 (7u25-2.3.10-1~deb7u1) stable-security; urgency=low * Build for stable only in patch2: unchanged: --- openjdk-7-7u25-2.3.10.orig/debian/openjdk-7-jre-zero/usr/share/lintian/overrides/openjdk-7-jre-zero +++ openjdk-7-7u25-2.3.10/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-7u25-2.3.10.orig/debian/patches/armhf_armv6_asmfix.diff +++ openjdk-7-7u25-2.3.10/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