Commit 8bba45f8 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

contrib: turn off Thumb ISA for libavcodec and libmad

Conflicts:

	extras/contrib/src/Makefile
parent 3c6c622c
...@@ -242,6 +242,7 @@ case $HOST in ...@@ -242,6 +242,7 @@ case $HOST in
EXTRA_CFLAGS=" -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a" EXTRA_CFLAGS=" -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a"
EXTRA_CLFAGS="$EXTRA_CFLAGS -mfpu=vfp" EXTRA_CLFAGS="$EXTRA_CFLAGS -mfpu=vfp"
EXTRA_CFLAGS="$EXTRA_CFLAGS -mthumb -mthumb-interwork" EXTRA_CFLAGS="$EXTRA_CFLAGS -mthumb -mthumb-interwork"
echo 'HAVE_ISA_THUMB = 1' >> config.mak
fi fi
;; ;;
*86_64*linux*) *86_64*linux*)
......
...@@ -170,6 +170,10 @@ endif ...@@ -170,6 +170,10 @@ endif
X264CONF += --enable-pic X264CONF += --enable-pic
endif endif
ifdef HAVE_ISA_THUMB
NOTHUMB ?= -mno-thumb
endif
DATE=`date +%Y-%m-%d` DATE=`date +%Y-%m-%d`
# *************************************************************************** # ***************************************************************************
...@@ -631,7 +635,7 @@ ifdef HAVE_DARWIN_OS ...@@ -631,7 +635,7 @@ ifdef HAVE_DARWIN_OS
endif endif
.mad: libmad .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) $(INSTALL_NAME)
touch $@ touch $@
...@@ -984,6 +988,9 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2 ...@@ -984,6 +988,9 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
ifdef SVN ifdef SVN
ffmpeg: ffmpeg:
$(SVN) co $(FFMPEG_SVN) ffmpeg $(SVN) co $(FFMPEG_SVN) ffmpeg
ifdef HAVE_ISA_THUMB
patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
endif
ifdef HAVE_WINCE ifdef HAVE_WINCE
patch -p1 < Patches/ffmpeg-svn-wince.patch patch -p1 < Patches/ffmpeg-svn-wince.patch
endif endif
...@@ -1039,6 +1046,9 @@ ifdef HAVE_UCLIBC ...@@ -1039,6 +1046,9 @@ ifdef HAVE_UCLIBC
else else
.ffmpeg: ffmpeg .lame .gsm .ffmpeg: ffmpeg .lame .gsm
endif endif
endif
ifdef HAVE_ISA_THUMB
patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
endif 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) (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 $@ touch $@
......
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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment