[FFmpeg-cvslog] configure: improve tms470 compiler usage with glibc

Mans Rullgard git at videolan.org
Sun Oct 14 15:14:56 CEST 2012


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Sat Oct 13 02:28:41 2012 +0100| [5ab432fa3500c190184263b80c6ad04547770545] | committer: Mans Rullgard

configure: improve tms470 compiler usage with glibc

Apply flags to work around glibc quirks only if glibc is detected,
and add a few more such flags.

Do not mess with as/ld settings in probe_cc.  This is not the
proper place.

Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ab432fa3500c190184263b80c6ad04547770545
---

 configure |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 3dbacd3..3e29909 100755
--- a/configure
+++ b/configure
@@ -2289,11 +2289,8 @@ probe_cc(){
         _type=tms470
         _ident=$($_cc -version | head -n1 | tr -s ' ')
         _flags='--gcc --abi=eabi -me'
-        _cflags='-D__gnuc_va_list=va_list -D__USER_LABEL_PREFIX__='
         _cc_e='-ppl -fe=$@'
         _cc_o='-fe=$@'
-        as_default="${cross_prefix}gcc"
-        ld_default="${cross_prefix}gcc"
         _depflags='-ppa -ppd=$(@:.o=.d)'
         _cflags_speed='-O3 -mf=5'
         _cflags_size='-O3 -mf=2'
@@ -2911,6 +2908,15 @@ fi
 
 test -n "$libc_type" && enable $libc_type
 
+# hacks for compiler/libc/os combinations
+
+if enabled_all tms470 glibc; then
+    add_cppflags -D__USER_LABEL_PREFIX__=
+    add_cppflags -D__builtin_memset=memset
+    add_cppflags -D__gnuc_va_list=va_list -D_VA_LIST_DEFINED
+    add_cflags   -pds=48    # incompatible redefinition of macro
+fi
+
 esc(){
     echo "$*" | sed 's/%/%25/g;s/:/%3a/g'
 }



More information about the ffmpeg-cvslog mailing list