From 5e7bc5f267c0a0378dfc25867b34f1a662ddbb06 Mon Sep 17 00:00:00 2001 From: Pierre Ynard Date: Fri, 20 Nov 2009 20:21:21 +0100 Subject: [PATCH] contrib: fix libmpeg2 patch Disable the ARM pld instruction only on architecture versions that don't support it. Thanks to Kirill A. Shutemov! --- extras/contrib/src/Makefile | 2 -- .../contrib/src/Patches/libmpeg2-arm-pld.patch | 17 ++++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index d859ee63d4..a080fd4991 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -565,9 +565,7 @@ libmpeg2-$(LIBMPEG2_VERSION).tar.gz: libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz $(EXTRACT_GZ) -ifdef HAVE_WINCE patch -p0 < Patches/libmpeg2-arm-pld.patch -endif cd libmpeg2 && patch -p0 < ../Patches/libmpeg2-mc-neon.patch cd libmpeg2 && ./bootstrap diff --git a/extras/contrib/src/Patches/libmpeg2-arm-pld.patch b/extras/contrib/src/Patches/libmpeg2-arm-pld.patch index 6a89fe6674..bd9561e0c4 100644 --- a/extras/contrib/src/Patches/libmpeg2-arm-pld.patch +++ b/extras/contrib/src/Patches/libmpeg2-arm-pld.patch @@ -1,13 +1,20 @@ diff -urNp libmpeg2.orig/libmpeg2/motion_comp_arm_s.S libmpeg2/libmpeg2/motion_comp_arm_s.S --- libmpeg2.orig/libmpeg2/motion_comp_arm_s.S 2008-07-09 21:16:05.000000000 +0200 -+++ libmpeg2/libmpeg2/motion_comp_arm_s.S 2009-11-13 23:09:46.000000000 +0100 -@@ -21,6 +21,9 @@ ++++ libmpeg2/libmpeg2/motion_comp_arm_s.S 2009-11-20 19:55:22.000000000 +0100 +@@ -19,6 +19,16 @@ + @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - .text ++@ Data preload is supported only by ARM V5TE and above ++ ++#if (defined (__ARM_ARCH_2__) || defined (__ARM_ARCH_3__) \ ++ || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \ ++ || defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_5__) \ ++ || defined (__ARM_ARCH_5T__)) +.macro pld reg +.endm ++#endif + + .text + @ ---------------------------------------------------------------- - .align - .global MC_put_o_16_arm