contrib: turn off Thumb ISA for libavcodec and libmad

Conflicts:

	extras/contrib/src/Makefile
(cherry picked from commit 8bba45f8)

Conflicts:

	extras/contrib/src/Makefile

extras/contrib/bootstrap

@@ -264,6 +264,7 @@ case $HOST in
             EXTRA_CFLAGS=" -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a"
             EXTRA_CLFAGS="$EXTRA_CFLAGS -mfpu=vfp"
             EXTRA_CFLAGS="$EXTRA_CFLAGS -mthumb -mthumb-interwork"
+            echo 'HAVE_ISA_THUMB = 1' >> config.mak
         fi
     ;;
     *86_64*linux*)

extras/contrib/src/Makefile

@@ -171,6 +171,10 @@ endif
 X264CONF += --enable-pic
 endif
 
+ifdef HAVE_ISA_THUMB
+NOTHUMB ?= -mno-thumb
+endif
+
 DATE=`date +%Y-%m-%d`
 
 # ***************************************************************************
@@ -677,7 +681,7 @@ ifdef HAVE_DARWIN_OS
 endif
 
 .mad: libmad
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3 $(NOTHUMB)" && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -1026,6 +1030,9 @@ ffmpeg:
 ifeq ($(HOST),i586-pc-beos)
 	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
+ifdef HAVE_ISA_THUMB
+	patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
+endif
 ifdef HAVE_WINCE
 	patch -p1 < Patches/ffmpeg-svn-wince.patch
 endif
@@ -1084,6 +1091,9 @@ ifdef HAVE_UCLIBC
 else
 .ffmpeg: ffmpeg .lame .gsm
 endif
+endif
+ifdef HAVE_ISA_THUMB
+	patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
 endif
 	(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS)" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
 	touch $@

extras/contrib/src/Patches/ffmpeg-avcodec-no-thumb.patch

+Index: ffmpeg/libavcodec/Makefile
+===================================================================
+--- ffmpeg/libavcodec/Makefile	(révision 19635)
++++ ffmpeg/libavcodec/Makefile	(copie de travail)
+@@ -1,4 +1,5 @@
+ include $(SUBDIR)../config.mak
++CFLAGS+=-mno-thumb
+ 
+ NAME = avcodec
+ FFLIBS = avutil